diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/AbstractClassWriter.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/AbstractClassWriter.java index ad38095ad0fe..3224cbdf8f59 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/AbstractClassWriter.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/AbstractClassWriter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassFileHelper.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassFileHelper.java index 3582f2959fb4..b9dbddf60ff1 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassFileHelper.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassFileHelper.java @@ -1,14 +1,9 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations; -import java.io.File; -import java.io.IOException; -import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Locale; import java.util.regex.Matcher; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassGeneratorProcessor.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassGeneratorProcessor.java index a6d9dbc1bd19..a9335499b86c 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassGeneratorProcessor.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ClassGeneratorProcessor.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ConcreteClassWriter.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ConcreteClassWriter.java index 5358a7c22e72..552a953a78ba 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ConcreteClassWriter.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/ConcreteClassWriter.java @@ -1,14 +1,11 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations; import java.io.IOException; import java.io.Writer; -import java.lang.reflect.Method; import javax.annotation.processing.Filer; import javax.annotation.processing.ProcessingEnvironment; import javax.tools.JavaFileObject; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationDescriptor.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationDescriptor.java index f55dc441d76b..70ea10f293f7 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationDescriptor.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationDescriptor.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationType.java index ed0d4e0653c7..7c469014f6ae 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AnnotationType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ArrayType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ArrayType.java index d92e81286a80..0fbd4dc91d56 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ArrayType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ArrayType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AttributeDescriptor.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AttributeDescriptor.java index 546b36f0a69c..c46b971e6d5b 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AttributeDescriptor.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/AttributeDescriptor.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/BooleanType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/BooleanType.java index 8771d86c5691..dd9977ccd19c 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/BooleanType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/BooleanType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/DeclaredType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/DeclaredType.java index a86b17eb9e99..12a5c3d0bbad 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/DeclaredType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/DeclaredType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/EnumType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/EnumType.java index e9443d943d7f..aabe606c677d 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/EnumType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/EnumType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/IntType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/IntType.java index c872d741b5af..2862a0aabd96 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/IntType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/IntType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/LongType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/LongType.java index 4aaa7b46f910..99f42e257e5c 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/LongType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/LongType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ShortType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ShortType.java index 8d47e7a40cde..5b2d730a06d4 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ShortType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/ShortType.java @@ -1,12 +1,9 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; -import javax.lang.model.element.AnnotationValue; /** * @author Steve Ebersole diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/StringType.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/StringType.java index a49b9240fc62..a7b0b198f2b9 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/StringType.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/StringType.java @@ -1,12 +1,9 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; -import javax.lang.model.element.AnnotationValue; /** * Type implementation Strings diff --git a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/Type.java b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/Type.java index 7d900ce402c3..8049539b9cd2 100644 --- a/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/Type.java +++ b/annotation-descriptor-generator/src/main/java/org/hibernate/orm/build/annotations/structure/Type.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.orm.build.annotations.structure; diff --git a/build.gradle b/build.gradle index c102845f2ab7..600efa278984 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ plugins { id 'org.hibernate.orm.database-service' apply false id 'biz.aQute.bnd' version '7.0.0' apply false + id 'com.diffplug.spotless' version '6.25.0' id 'org.checkerframework' version '0.6.40' id 'org.hibernate.orm.build.jdks' diff --git a/ci/build.sh b/ci/build.sh index 5e5175c5ca55..b4eb8753b2e2 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -79,9 +79,9 @@ fi # Only run checkstyle in the H2 build, # so that CI jobs give a more complete report # and developers can fix code style and non-H2 DB tests in parallel. -if [ -n "$goal" ]; then - goal="$goal -x checkstyleMain -DPOPULATE_REMOTE=true" -fi +#if [ -n "$goal" ]; then +# goal="$goal -x checkstyleMain -DPOPULATE_REMOTE=true" +#fi function logAndExec() { echo 1>&2 "Executing:" "${@}" diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index a346e6fdbb3f..97fd927f9955 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -33,6 +33,7 @@ apply plugin: 'org.hibernate.orm.build.java-module' apply plugin: 'org.checkerframework' apply plugin: 'de.thetaphi.forbiddenapis' +apply plugin: 'com.diffplug.spotless' apply plugin: "jacoco" apply plugin: 'checkstyle' @@ -194,6 +195,7 @@ tasks.withType( JavaCompile ) { ] } +tasks.compileJava.dependsOn spotlessApply task compile(dependsOn: [compileJava, processResources, compileTestJava, processTestResources] ) @@ -466,6 +468,19 @@ task nonFatalCheckstyle(type:Checkstyle) { configFile = rootProject.file( 'shared/config/checkstyle/checkstyle-non-fatal.xml' ) } +spotless { + //Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically. + enforceCheck false + java { + licenseHeaderFile rootProject.file('spotless.license.java') + removeUnusedImports() + indentWithTabs(4) + trimTrailingWhitespace() + endWithNewline() + } +} + + class CompilerStubsArgumentProvider implements CommandLineArgumentProvider { @InputDirectory diff --git a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java index a96e42277c28..0fd403b12b00 100644 --- a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java +++ b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.agroal.internal; import java.sql.Connection; diff --git a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/StrategyRegistrationProviderImpl.java b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/StrategyRegistrationProviderImpl.java index b542cb4f0f30..531315cae267 100644 --- a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/StrategyRegistrationProviderImpl.java +++ b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/StrategyRegistrationProviderImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.agroal.internal; diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalConnectionProviderTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalConnectionProviderTest.java index 189d98603a06..8a5a8a2894a9 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalConnectionProviderTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalConnectionProviderTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.agroal; diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java index de5209d48172..75b7840c8c75 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.agroal; diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java index 58e12cc2db9c..fffc366a112b 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.agroal; diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/PreparedStatementSpyConnectionProvider.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/PreparedStatementSpyConnectionProvider.java index 131b18aaa823..d71cac364914 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/PreparedStatementSpyConnectionProvider.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/PreparedStatementSpyConnectionProvider.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.agroal.util; diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java index 61c1bc6b008c..27408fa059f2 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.c3p0.internal; diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java index 02d94f1b50bb..bd98ab0e12f6 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.c3p0.internal; diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/StrategyRegistrationProviderImpl.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/StrategyRegistrationProviderImpl.java index 571fd4dbad11..f2e9f273990f 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/StrategyRegistrationProviderImpl.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/StrategyRegistrationProviderImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.c3p0.internal; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java index 20a0283079db..337277c44c46 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.c3p0; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java index 5c6e44397f9b..cbcce75971c6 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ package org.hibernate.test.c3p0; import java.sql.Connection; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java index 4deeeab468e4..7d077bb8fe8a 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ package org.hibernate.test.c3p0; import java.sql.Connection; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ProxyConnectionProvider.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ProxyConnectionProvider.java index cbae1713c25e..072a7f8b555d 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ProxyConnectionProvider.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ProxyConnectionProvider.java @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ package org.hibernate.test.c3p0; import java.sql.Connection; @@ -11,7 +15,6 @@ import org.hibernate.testing.util.ReflectionUtil; import org.mockito.Answers; -import org.mockito.MockSettings; import org.mockito.Mockito; /** diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java index 3c83c192eb46..8cb4cbfaf755 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.c3p0; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java index fefc4d0b95b2..a51ca78e8b84 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.c3p0; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java index 6e0ae4420fa5..be705daf97f5 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.c3p0; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java index 86ae13680922..846cf80edf28 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ package org.hibernate.test.c3p0; import java.sql.SQLException; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java index 1fede761fca4..61cb5df93e5d 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.test.c3p0; @@ -18,8 +16,8 @@ import org.hibernate.testing.orm.junit.JiraKey; /** - * Tests that when using cached prepared statement with batching enabled doesn't bleed over into new transactions. - * + * Tests that when using cached prepared statement with batching enabled doesn't bleed over into new transactions. + * * @author Shawn Clowater */ public class StatementCacheTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java index 09d6ccbb2877..2f8737e0104b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java index 0ab86ef3ef16..141b79af82bd 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect; import java.util.List; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java index d73897a57aa6..a83a40f7580f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDSqlAstTranslator.java index e187406b3baa..e54bb926cbaa 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java index 49830fe8d8f0..50024b79e69e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheSqlAstTranslator.java index 788e3ca45d30..fa707b760712 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java index 04b85b78b339..ead1ea777801 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacySqlAstTranslator.java index 08223a9ad7b9..63a75fcd7ada 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java index 638b8a5d831b..2522c1899585 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectResolver.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectResolver.java index afe82966a49f..f9d4dc341166 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectResolver.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectResolver.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectSelector.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectSelector.java index f58f96226a9c..1677cfaf5e65 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectSelector.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDialectSelector.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java index 08b45c6e1546..e1cc4046878a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java index 7f516f7e69db..f6ab94261c1b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java index 607efd39fb3e..9fa498464314 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java index 815f5561bd0f..605742b95cc9 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java index 6e8315dc0899..4f8ad5476d34 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java index 8d8fb58c9b02..83240b738a8b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java index 6f11ecd58a44..7e79e2a6aecf 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java index 3dadf47cfc25..47549c07454b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacySqlAstTranslator.java index 3aea1a5ebc1d..80439a572d70 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -11,7 +9,6 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; -import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; @@ -19,7 +16,6 @@ import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; -import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.CaseSimpleExpression; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbySqlAstTranslator.java index 8cbec280b025..d2e68a667981 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -11,7 +9,6 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; -import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; @@ -19,7 +16,6 @@ import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; -import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.CaseSimpleExpression; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java index 6f47f288fa0e..b6779f06d1fc 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java index 6f9c1215fda9..78312f9f91bd 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java index 932f4ccf628e..361661f62c3c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java index c95d269072d0..4db8a901a8f6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java index 2446f29dd462..30cb4f8cc5bc 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacySqlAstTranslator.java index 0c4fb51be250..18d00068a334 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java index 8e59fd9b03e1..54fc83e84e95 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java index 22528b21d065..6c6aa273df15 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java index cee86a878dea..8db771321b7b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqmToSqlAstConverter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java index d7c6ad8145d6..1482c0d260a6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -92,7 +90,7 @@ * Perform string casts to varchar; removes space padding. * * - * + * * @author Ian Booth * @author Bruce Lunsford * @author Max Rydahl Andersen diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqlAstTranslator.java index 7a4af55cc9a6..88b7c1ce6fc7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java index 49534024a7f3..7a83ee805455 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresSqmToSqlAstConverter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java index d56e791050cb..0dbc1f986b6a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java index 01cf6eb82e42..a6a9b161071a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java index e527bd5baafa..fde7a7ece477 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -17,7 +15,6 @@ import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.LimitLimitHandler; -import org.hibernate.dialect.pagination.LimitOffsetLimitHandler; import org.hibernate.dialect.sequence.SequenceSupport; import org.hibernate.dialect.temptable.TemporaryTable; import org.hibernate.dialect.temptable.TemporaryTableKind; @@ -332,4 +329,3 @@ public boolean supportsJdbcConnectionLobCreation(DatabaseMetaData databaseMetaDa return false; } } - diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBSqlAstTranslator.java index 011098389488..ac6f27a008fb 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MaxDBSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java index 3da7ba4005a5..474352cc2b36 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -42,7 +40,6 @@ import static org.hibernate.type.SqlTypes.CHAR; import static org.hibernate.type.SqlTypes.CLOB; import static org.hibernate.type.SqlTypes.LONG32NVARCHAR; -import static org.hibernate.type.SqlTypes.LONG32VARBINARY; import static org.hibernate.type.SqlTypes.LONG32VARCHAR; import static org.hibernate.type.SqlTypes.NCHAR; import static org.hibernate.type.SqlTypes.NCLOB; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLSqlAstTranslator.java index 7510df6451ba..a745a3e20853 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java index 80d960de4d4f..77e6710fa1ab 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java index ec382f39b65d..3036b681b321 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java index a85f18f43542..6302f3c8c98e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java index 1b8af5cc5d6c..b98b192bad65 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java index 219079710bcf..ec88b5a78623 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -1349,7 +1347,7 @@ public void augmentRecognizedTableTypes(List tableTypesList) { tableTypesList.add( "MATERIALIZED VIEW" ); /* - PostgreSQL 10 and later adds support for Partition table. + PostgreSQL 10 and later adds support for Partition table. */ if ( getVersion().isSameOrAfter( 10 ) ) { tableTypesList.add( "PARTITIONED TABLE" ); diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java index 4dae9260dac3..5ab957c5c6b6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java index cffaa287db96..0c27cd5a0ef8 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.boot.model.FunctionContributions; import org.hibernate.dialect.DatabaseVersion; -import org.hibernate.dialect.PostgreSQLSqlAstTranslator; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index a53cc04e1a00..9376d7e23e9b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java index 9a1f97109d78..b66992801496 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200SqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java index 924247be2641..a5363f4fdb94 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java index 2b744a2b84f6..7c2ba4ac75da 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -21,11 +19,9 @@ import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; -import org.hibernate.sql.ast.tree.MutationStatement; import org.hibernate.sql.ast.tree.Statement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; -import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java index 96139da3a493..486666b3506f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteSqlAstTranslator.java index 0eb9dbd26b9b..f53ae5719a0a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java index 94a3b544ba58..57222592a434 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java index c646a5500542..2a806e4b4d96 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java index 230b6d4f1e6a..784488b85cdd 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java index b5ace7590994..186d78cca73a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -28,7 +26,6 @@ import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.CaseSimpleExpression; import org.hibernate.sql.ast.tree.expression.ColumnReference; -import org.hibernate.sql.ast.tree.expression.AggregateColumnWriteExpression; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.QueryLiteral; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java index e77527c4c9a6..ae693e73cba1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java index 841594f12e66..057b1f73fb2f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -12,12 +10,10 @@ import org.hibernate.LockMode; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.sqm.ComparisonOperator; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.CaseSimpleExpression; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java index 1ee36ad947c4..dbc4f8b62779 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -43,7 +41,6 @@ import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.sql.SqmTranslator; import org.hibernate.query.sqm.sql.SqmTranslatorFactory; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java index 90db1a23af69..dfc96868a32c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -19,7 +17,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java index cffd42898698..31ac69046c85 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqmToSqlAstConverter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java index 5d9d2a7cb35c..08e001854704 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -201,7 +199,7 @@ public int getDefaultDecimalPrecision() { @Override public long getFractionalSecondPrecisionInNanos() { - // Do duration arithmetic in a seconds, but + // Do duration arithmetic in a seconds, but // with the fractional part return 1_000_000_000; //seconds!! } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataSqlAstTranslator.java index 27282c3df123..ffaeb8ef6639 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -13,7 +11,6 @@ import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.Statement; -import org.hibernate.sql.ast.tree.cte.CteStatement; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Literal; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java index dd2beca9aae2..651ea147a7e2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java index b0eadebbfa06..493f16d98f09 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java index d39d485b3c09..d49b2bafc148 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.function; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java index d9d1575cbd00..cc400ebe3099 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.function; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java index 0a87e1b8468a..af34e16ae967 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CUBRIDIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java index de04c23f31c8..29dec0d32a45 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/CacheIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java index 68f1ac657ad8..d7572a63a88b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/FirebirdIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java index bb61ed9d2fe4..d040aef5a44d 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InformixIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java index dbbbba18f20a..2f6298ffb463 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres10IdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java index 91310d3f70c7..818567d3269a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Ingres9IdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java index b65c12b26605..61acd99cade9 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/MimerSQLIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java index e30170023826..4444a3f56667 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SQLiteIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java index a06442a5165c..0e90b018a551 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/SybaseAnywhereIdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java index 252831dad055..de5932953b96 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/Teradata14IdentityColumnSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.identity; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/AltibaseLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/AltibaseLimitHandler.java index eb2d71bbdd21..3829eda8947c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/AltibaseLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/AltibaseLimitHandler.java @@ -1,17 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect.pagination; import org.hibernate.dialect.pagination.LimitLimitHandler; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/DerbyLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/DerbyLimitHandler.java index ac782209460f..ff8b9948cfd2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/DerbyLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/DerbyLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstLimitHandler.java index 4ef012923742..9fcad91bf17c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstSkipLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstSkipLimitHandler.java index 9fd45c98d2b6..c13612efb1a6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstSkipLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/FirstSkipLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/IngresLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/IngresLimitHandler.java index 332c3dd427b8..73c7dc33f283 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/IngresLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/IngresLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/RowsLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/RowsLimitHandler.java index 9c3c86a06316..0ad62fed1251 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/RowsLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/RowsLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/SkipFirstLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/SkipFirstLimitHandler.java index cf0fca2e9d38..f7fe65d8fa46 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/SkipFirstLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/SkipFirstLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/TimesTenLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/TimesTenLimitHandler.java index 4d95ef2af0df..7357779f6d37 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/TimesTenLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/TimesTenLimitHandler.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.pagination; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/AltibaseSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/AltibaseSequenceSupport.java index 2f2867346191..e2016e06aeb1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/AltibaseSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/AltibaseSequenceSupport.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect.sequence; import org.hibernate.dialect.sequence.NextvalSequenceSupport; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CUBRIDSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CUBRIDSequenceSupport.java index ccb9713961ab..76745376a5f6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CUBRIDSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CUBRIDSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CacheSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CacheSequenceSupport.java index 555d209a0f82..ec39a9d5f7e4 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CacheSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/CacheSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/DerbySequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/DerbySequenceSupport.java index 1445d6c31519..16e666a00f87 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/DerbySequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/DerbySequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/FirebirdSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/FirebirdSequenceSupport.java index 97cf20ca27ab..91880044baab 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/FirebirdSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/FirebirdSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InformixSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InformixSequenceSupport.java index 4371603158ba..e59ed475dd9a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InformixSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InformixSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/IngresLegacySequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/IngresLegacySequenceSupport.java index b5335d031cb3..8d377b0e207f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/IngresLegacySequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/IngresLegacySequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InterbaseSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InterbaseSequenceSupport.java index b5daf2a17020..229a5844bba7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InterbaseSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/InterbaseSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MaxDBSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MaxDBSequenceSupport.java index 5f3104852f83..e39081d40e07 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MaxDBSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MaxDBSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MimerSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MimerSequenceSupport.java index b7d1d828e45f..8d8688a2f842 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MimerSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/MimerSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/PostgreSQLLegacySequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/PostgreSQLLegacySequenceSupport.java index f5a65030937f..8ef804948bc5 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/PostgreSQLLegacySequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/PostgreSQLLegacySequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/RDMSSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/RDMSSequenceSupport.java index f81276e91ab2..dcf06cd7451d 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/RDMSSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/RDMSSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorAltibaseDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorAltibaseDatabaseImpl.java index 0e6b92840849..d57c8cad67d6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorAltibaseDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorAltibaseDatabaseImpl.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect.sequence; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorCUBRIDDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorCUBRIDDatabaseImpl.java index 8efe4cff6e85..843d68cd26dc 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorCUBRIDDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorCUBRIDDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorDerbyDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorDerbyDatabaseImpl.java index 63d9d5a10636..b9fbcd534b25 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorDerbyDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorDerbyDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorFirebirdDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorFirebirdDatabaseImpl.java index 5886abe9b4c4..16ea355efbf1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorFirebirdDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorFirebirdDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorInformixDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorInformixDatabaseImpl.java index 26a3d2d7d03c..5428ce548a39 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorInformixDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorInformixDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorIngresDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorIngresDatabaseImpl.java index 124e233d61a4..e4fd6d7408ad 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorIngresDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorIngresDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorMimerSQLDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorMimerSQLDatabaseImpl.java index 4e55a34ed608..7811192e1f64 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorMimerSQLDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorMimerSQLDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorSAPDBDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorSAPDBDatabaseImpl.java index 07a7b5704d5c..a29353332d61 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorSAPDBDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorSAPDBDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorTimesTenDatabaseImpl.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorTimesTenDatabaseImpl.java index 6a7716aa299e..1f2194f72615 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorTimesTenDatabaseImpl.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SequenceInformationExtractorTimesTenDatabaseImpl.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/TimesTenSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/TimesTenSequenceSupport.java index 802aa1b5801d..04b9266dfee2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/TimesTenSequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/TimesTenSequenceSupport.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.sequence; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/unique/InformixUniqueDelegate.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/unique/InformixUniqueDelegate.java index 1728849b3096..ba61fdd6ad4a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/unique/InformixUniqueDelegate.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/unique/InformixUniqueDelegate.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unique; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java index c9daf9cf6cf3..5b4dbac8825b 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect; import java.util.Locale; @@ -47,22 +44,22 @@ public void testSupportLimits() { @Test public void testSelectWithLimitOnly() { assertEquals( "select c1, c2 from t1 order by c1, c2 desc limit ?", - dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", - toRowSelection( 0, 15 ) ).toLowerCase( Locale.ROOT)); + dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", + toRowSelection( 0, 15 ) ).toLowerCase( Locale.ROOT)); } @Test public void testSelectWithOffsetLimit() { assertEquals( "select c1, c2 from t1 order by c1, c2 desc limit 1+?,?", - dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", - toRowSelection( 5, 15 ) ).toLowerCase(Locale.ROOT)); + dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", + toRowSelection( 5, 15 ) ).toLowerCase(Locale.ROOT)); } @Test public void testSelectWithNoLimit() { assertEquals( "select c1, c2 from t1 order by c1, c2 desc", - dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", - null ).toLowerCase(Locale.ROOT)); + dialect.getLimitHandler().processSql("select c1, c2 from t1 order by c1, c2 desc", + null ).toLowerCase(Locale.ROOT)); } private Limit toRowSelection(int firstRow, int maxRows) { diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java index 4fe93fb06791..37ecb0688dfe 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect; import jakarta.persistence.Tuple; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectFactoryTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectFactoryTest.java index 8422e8acfef7..423cd51c863b 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectFactoryTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectFactoryTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -11,7 +9,6 @@ import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl; import org.hibernate.engine.jdbc.dialect.spi.DialectResolver; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectSelectorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectSelectorTest.java index 037dd162662b..962a9f557a07 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectSelectorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/CommunityDialectSelectorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java index 50abc51509da..09350761a703 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyCustomSQLTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyCustomSQLTest.java index bd829ae75e21..a1cffc37e441 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyCustomSQLTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyCustomSQLTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDateTimeParameterTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDateTimeParameterTest.java index 6c815cd2fa17..8f1c15c968cf 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDateTimeParameterTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDateTimeParameterTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java index f3207c4d434a..6184c199d089 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -10,7 +8,6 @@ import static org.junit.Assert.assertEquals; -import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyJpaTckUsageTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyJpaTckUsageTest.java index 62c8812c7aeb..aa83b092b230 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyJpaTckUsageTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyJpaTckUsageTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java index 180486fbe18a..912780982f20 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLimitHandlerTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLimitHandlerTest.java index 77cc21938a60..ad36cd586ca5 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLimitHandlerTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLimitHandlerTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoreProcedures.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoreProcedures.java index d467dc28008a..7f61aa76298d 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoreProcedures.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoreProcedures.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoredProcedureTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoredProcedureTest.java index 7e4d2826d62a..fdc70307f63c 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoredProcedureTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyStoredProcedureTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyTransactionTimeoutTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyTransactionTimeoutTest.java index 0e80f85e63e0..da7cfb4c9e10 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyTransactionTimeoutTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyTransactionTimeoutTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java index 54855d3b92e4..d2b0d572d40e 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java index 101460902189..29ab032044b4 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -206,5 +204,3 @@ public static class Event { private String district; } } - - diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/IngresLimitHandlerTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/IngresLimitHandlerTest.java index af8b1aebbc19..a5e6d68a5cdb 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/IngresLimitHandlerTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/IngresLimitHandlerTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/Person.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/Person.java index c14b626a4556..3489048d1e35 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/Person.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/Person.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.community.dialect; import java.sql.*; @@ -82,4 +79,4 @@ public Clob getComments() { public void setComments(Clob comments) { this.comments = comments; } -} \ No newline at end of file +} diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/RowsLimitHandlerTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/RowsLimitHandlerTest.java index 26ef52d81516..59ae2166f4a1 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/RowsLimitHandlerTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/RowsLimitHandlerTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java index 5613683bdc72..e20d113c4847 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java index df19e5926c38..0eb9908276a5 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect; @@ -10,7 +8,6 @@ import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.community.dialect.SQLServerLegacyDialect; import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; import org.hibernate.query.spi.Limit; @@ -136,9 +133,9 @@ public void testGetLimitStringAliasGenerationWithAliasesNoAs() { public void testPagingWithColumnNameStartingWithFrom() { final String sql = "select column1 c1, from_column c2 from table1"; assertEquals( "with query_ as (select row_.*,row_number() over (order by current_timestamp) as rownumber_ from (" + - "select column1 c1, from_column c2 from table1) row_) " + - "select c1,c2 from query_ where rownumber_>=? and rownumber_=? and rownumber_=? and rownumber_=? and rownumber_=? and rownumber_=? and rownumber_=? and rownumber_=? and rownumber_. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.functional.cache; @@ -111,7 +109,7 @@ public void testDialectSQLFunctions() { .get(0); assertTrue( 0 == value.intValue() ); - s.remove(simple); + s.remove(simple); t.commit(); s.close(); } @@ -128,7 +126,7 @@ public void testSetProperties() { //misuse of "Single" as a propertyobject, but it was the first testclass i found with a collection ;) Single single = new Single() { // trivial hack to test properties with arrays. @SuppressWarnings( {"unchecked"}) - String[] getStuff() { + String[] getStuff() { return (String[]) getSeveral().toArray(new String[getSeveral().size()]); } }; @@ -480,8 +478,8 @@ public void testBlobClob() throws Exception { s.flush(); s.refresh(b); //b.getBlob().setBytes( 2, "abc".getBytes() ); - log.debug("levinson: just bfore b.getClob()"); - b.getClob().getSubString(2, 3); + log.debug("levinson: just bfore b.getClob()"); + b.getClob().getSubString(2, 3); //b.getClob().setString(2, "abc"); s.flush(); s.getTransaction().commit(); @@ -522,11 +520,11 @@ public void testBlobClob() throws Exception { public void testSqlFunctionAsAlias() { String functionName = locateAppropriateDialectFunctionNameForAliasTest(); if (functionName == null) { - log.info("Dialect does not list any no-arg functions"); + log.info("Dialect does not list any no-arg functions"); return; } - log.info("Using function named [" + functionName + "] for 'function as alias' test"); + log.info("Using function named [" + functionName + "] for 'function as alias' test"); String query = "select " + functionName + " from Simple as " + functionName + " where " + functionName + ".id = 10"; Session s = openSession(); @@ -614,18 +612,18 @@ public void testCachedQueryOnInsert() throws Exception { } public void testInterSystemsFunctions() throws Exception { - Calendar cal = new GregorianCalendar(); - cal.set(1977,6,3,0,0,0); - java.sql.Timestamp testvalue = new java.sql.Timestamp(cal.getTimeInMillis()); - testvalue.setNanos(0); - Calendar cal3 = new GregorianCalendar(); - cal3.set(1976,2,3,0,0,0); - java.sql.Timestamp testvalue3 = new java.sql.Timestamp(cal3.getTimeInMillis()); - testvalue3.setNanos(0); - - final Session s = openSession(); - s.beginTransaction(); - try { + Calendar cal = new GregorianCalendar(); + cal.set(1977,6,3,0,0,0); + java.sql.Timestamp testvalue = new java.sql.Timestamp(cal.getTimeInMillis()); + testvalue.setNanos(0); + Calendar cal3 = new GregorianCalendar(); + cal3.set(1976,2,3,0,0,0); + java.sql.Timestamp testvalue3 = new java.sql.Timestamp(cal3.getTimeInMillis()); + testvalue3.setNanos(0); + + final Session s = openSession(); + s.beginTransaction(); + try { s.doWork( new Work() { @Override @@ -635,14 +633,14 @@ public void execute(Connection connection) throws SQLException { } } ); - } - catch (Exception ex) { - System.out.println("as we expected stored procedure sp does not exist when we drop it"); + } + catch (Exception ex) { + System.out.println("as we expected stored procedure sp does not exist when we drop it"); - } + } s.getTransaction().commit(); - s.beginTransaction(); + s.beginTransaction(); s.doWork( new Work() { @Override @@ -668,82 +666,82 @@ public void execute(Connection connection) throws SQLException { } } ); - s.getTransaction().commit(); - - s.beginTransaction(); - - TestInterSystemsFunctionsClass object = new TestInterSystemsFunctionsClass( Long.valueOf( 10 ) ); - object.setDateText( "1977-07-03" ); - object.setDate1( testvalue ); - object.setDate3( testvalue3 ); - s.persist( object ); - s.getTransaction().commit(); - s.close(); - - Session s2 = openSession(); - s2.beginTransaction(); - TestInterSystemsFunctionsClass test = s2.get(TestInterSystemsFunctionsClass.class, 10L ); - assertTrue( test.getDate1().equals(testvalue)); - test = (TestInterSystemsFunctionsClass) s2.byId( TestInterSystemsFunctionsClass.class ).with( LockOptions.NONE ).load( 10L ); - assertTrue( test.getDate1().equals(testvalue)); - Date value = (Date) s2.createQuery( "select nvl(o.date,o.dateText) from TestInterSystemsFunctionsClass as o" ) + s.getTransaction().commit(); + + s.beginTransaction(); + + TestInterSystemsFunctionsClass object = new TestInterSystemsFunctionsClass( Long.valueOf( 10 ) ); + object.setDateText( "1977-07-03" ); + object.setDate1( testvalue ); + object.setDate3( testvalue3 ); + s.persist( object ); + s.getTransaction().commit(); + s.close(); + + Session s2 = openSession(); + s2.beginTransaction(); + TestInterSystemsFunctionsClass test = s2.get(TestInterSystemsFunctionsClass.class, 10L ); + assertTrue( test.getDate1().equals(testvalue)); + test = (TestInterSystemsFunctionsClass) s2.byId( TestInterSystemsFunctionsClass.class ).with( LockOptions.NONE ).load( 10L ); + assertTrue( test.getDate1().equals(testvalue)); + Date value = (Date) s2.createQuery( "select nvl(o.date,o.dateText) from TestInterSystemsFunctionsClass as o" ) .list() .get(0); - assertTrue( value.equals(testvalue)); - Object nv = s2.createQuery( "select nullif(o.dateText,o.dateText) from TestInterSystemsFunctionsClass as o" ) + assertTrue( value.equals(testvalue)); + Object nv = s2.createQuery( "select nullif(o.dateText,o.dateText) from TestInterSystemsFunctionsClass as o" ) .list() .get(0); - assertTrue( nv == null); - String dateText = (String) s2.createQuery( + assertTrue( nv == null); + String dateText = (String) s2.createQuery( "select nvl(o.dateText,o.date) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue( dateText.equals("1977-07-03")); - value = (Date) s2.createQuery( "select ifnull(o.date,o.date1) from TestInterSystemsFunctionsClass as o" ) + assertTrue( dateText.equals("1977-07-03")); + value = (Date) s2.createQuery( "select ifnull(o.date,o.date1) from TestInterSystemsFunctionsClass as o" ) .list() .get(0); - assertTrue( value.equals(testvalue)); - value = (Date) s2.createQuery( "select ifnull(o.date3,o.date,o.date1) from TestInterSystemsFunctionsClass as o" ) + assertTrue( value.equals(testvalue)); + value = (Date) s2.createQuery( "select ifnull(o.date3,o.date,o.date1) from TestInterSystemsFunctionsClass as o" ) .list() .get(0); - assertTrue( value.equals(testvalue)); - Integer pos = (Integer) s2.createQuery( + assertTrue( value.equals(testvalue)); + Integer pos = (Integer) s2.createQuery( "select position('07', o.dateText) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue(pos.intValue() == 6); - String st = (String) s2.createQuery( "select convert(o.date1, SQL_TIME) from TestInterSystemsFunctionsClass as o" ) + assertTrue(pos.intValue() == 6); + String st = (String) s2.createQuery( "select convert(o.date1, SQL_TIME) from TestInterSystemsFunctionsClass as o" ) .list() .get(0); - assertTrue( st.equals("00:00:00")); - java.sql.Time tm = (java.sql.Time) s2.createQuery( + assertTrue( st.equals("00:00:00")); + java.sql.Time tm = (java.sql.Time) s2.createQuery( "select cast(o.date1, time) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue( tm.toString().equals("00:00:00")); - Double diff = (Double) s2.createQuery( + assertTrue( tm.toString().equals("00:00:00")); + Double diff = (Double) s2.createQuery( "select timestampdiff(SQL_TSI_FRAC_SECOND, o.date3, o.date1) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue(diff.doubleValue() != 0.0); - diff = (Double) s2.createQuery( + assertTrue(diff.doubleValue() != 0.0); + diff = (Double) s2.createQuery( "select timestampdiff(SQL_TSI_MONTH, o.date3, o.date1) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue(diff.doubleValue() == 16.0); - diff = (Double) s2.createQuery( + assertTrue(diff.doubleValue() == 16.0); + diff = (Double) s2.createQuery( "select timestampdiff(SQL_TSI_WEEK, o.date3, o.date1) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue(diff.doubleValue() >= 16*4); - diff = (Double) s2.createQuery( + assertTrue(diff.doubleValue() >= 16*4); + diff = (Double) s2.createQuery( "select timestampdiff(SQL_TSI_YEAR, o.date3, o.date1) from TestInterSystemsFunctionsClass as o" ).list() .get(0); - assertTrue(diff.doubleValue() == 1.0); + assertTrue(diff.doubleValue() == 1.0); - s2.getTransaction().commit(); - s2.close(); - } + s2.getTransaction().commit(); + s2.close(); + } } diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java index 35531ca20034..b477eeac8ebc 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.functional.cache; import java.util.Date; @@ -14,10 +12,10 @@ */ public class TestInterSystemsFunctionsClass { private Long id; - private Date date3; - private Date date1; - private Date date; - private String dateText; + private Date date3; + private Date date1; + private Date date; + private String dateText; public TestInterSystemsFunctionsClass() { } @@ -35,38 +33,38 @@ public void setId(Long id) { } public Date getDate() { - return date; - } + return date; + } - public void setDate(Date date) { - this.date = date; - } + public void setDate(Date date) { + this.date = date; + } - public String getDateText() { - return dateText; - } + public String getDateText() { + return dateText; + } - public void setDateText(String dateText) { - this.dateText = dateText; - } + public void setDateText(String dateText) { + this.dateText = dateText; + } - public Date getDate1() { - return date1; - } + public Date getDate1() { + return date1; + } - public void setDate1(Date date1) { - this.date1 = date1; - } + public void setDate1(Date date1) { + this.date1 = date1; + } - public Date getDate3() { - return date3; - } + public Date getDate3() { + return date3; + } - public void setDate3(Date date3) { - this.date3 = date3; - } + public void setDate3(Date date3) { + this.date3 = date3; + } } diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SQLServer2005LockHintsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SQLServer2005LockHintsTest.java index ad73eb8ce06f..f746dc43d730 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SQLServer2005LockHintsTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SQLServer2005LockHintsTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.lockhint; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SybaseASE15LockHintsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SybaseASE15LockHintsTest.java index b7898993d78f..25dcbbc46f1f 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SybaseASE15LockHintsTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SybaseASE15LockHintsTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.lockhint; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java index e33b0a6308ec..50fe6f668c2f 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.sequence; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java index eee441f9bc31..9f9de27fddaa 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.sequence; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java index fccfbb582bf2..02d533e9a42b 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.sequence; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java index e3181845a136..61989317fe03 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.sequence; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java index 7e133a4780e7..4dafdb0b8a12 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.community.dialect.unit.sequence; diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index d3b1634a216f..5f327224a7ed 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -282,3 +282,8 @@ tasks.sourcesJar.dependsOn ':hibernate-core:generateGraphParser' tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser' tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser' tasks.sourcesJar.dependsOn ':hibernate-core:generateOrderingParser' + +tasks.spotlessJava.dependsOn ':hibernate-core:generateGraphParser' +tasks.spotlessJava.dependsOn ':hibernate-core:generateHqlParser' +tasks.spotlessJava.dependsOn ':hibernate-core:generateSqlScriptParser' +tasks.spotlessJava.dependsOn ':hibernate-core:generateOrderingParser' diff --git a/hibernate-core/src/main/java/org/hibernate/AnnotationException.java b/hibernate-core/src/main/java/org/hibernate/AnnotationException.java index 594f07b8f2b2..dcc5bcac42e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/AnnotationException.java +++ b/hibernate-core/src/main/java/org/hibernate/AnnotationException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java index a8db252d51e5..7bc6eaa8460a 100644 --- a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java +++ b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/BaseSessionEventListener.java b/hibernate-core/src/main/java/org/hibernate/BaseSessionEventListener.java index 83cba7613254..a8fdcd1b336c 100644 --- a/hibernate-core/src/main/java/org/hibernate/BaseSessionEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/BaseSessionEventListener.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Cache.java b/hibernate-core/src/main/java/org/hibernate/Cache.java index b8355ae557ba..9a27dd75d5a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/Cache.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/CacheMode.java b/hibernate-core/src/main/java/org/hibernate/CacheMode.java index a276b5588c4b..c7ec5a38eaf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/CacheMode.java +++ b/hibernate-core/src/main/java/org/hibernate/CacheMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/CallbackException.java b/hibernate-core/src/main/java/org/hibernate/CallbackException.java index 71457fcd331e..5b695b0a38aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/CallbackException.java +++ b/hibernate-core/src/main/java/org/hibernate/CallbackException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java index eb083b3e7212..0364eb46daf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java b/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java index 0a4735b69d0a..fcece90242b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java b/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java index e670d6635e5d..c94e8e90f6a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java b/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java index 9601274b524f..8a81e6e673ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java @@ -1,15 +1,13 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; /** * Raised whenever a duplicate for a certain type occurs, * such as a duplicate class, table, or property name. - * + * * @author Max Rydahl Andersen * @author Steve Ebersole */ @@ -95,7 +93,7 @@ public DuplicateMappingException(String customMessage, Type type, String name) { public String getType() { return type; } - + public String getName() { return name; } diff --git a/hibernate-core/src/main/java/org/hibernate/EnabledFetchProfile.java b/hibernate-core/src/main/java/org/hibernate/EnabledFetchProfile.java index a92f2c5f7066..a9d7cd21417d 100644 --- a/hibernate-core/src/main/java/org/hibernate/EnabledFetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/EnabledFetchProfile.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/EntityFilterException.java b/hibernate-core/src/main/java/org/hibernate/EntityFilterException.java index d5004bf77197..0cb30d18f119 100644 --- a/hibernate-core/src/main/java/org/hibernate/EntityFilterException.java +++ b/hibernate-core/src/main/java/org/hibernate/EntityFilterException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java index f3867a2faf0c..a5a10a66bc0c 100644 --- a/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/FetchMode.java index 8303f4cbdc78..64aa7d2f4242 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FetchMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/FetchNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/FetchNotFoundException.java index 1896944e1ade..af0ca114118d 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/FetchNotFoundException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Filter.java b/hibernate-core/src/main/java/org/hibernate/Filter.java index 39921da4e40e..a5cdab84b8c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/Filter.java +++ b/hibernate-core/src/main/java/org/hibernate/Filter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/FlushMode.java b/hibernate-core/src/main/java/org/hibernate/FlushMode.java index 29caaf86a0c1..ad5ba2118079 100644 --- a/hibernate-core/src/main/java/org/hibernate/FlushMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FlushMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Hibernate.java b/hibernate-core/src/main/java/org/hibernate/Hibernate.java index 23a442890462..fcf9b999c063 100644 --- a/hibernate-core/src/main/java/org/hibernate/Hibernate.java +++ b/hibernate-core/src/main/java/org/hibernate/Hibernate.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -266,10 +264,10 @@ public static Class getClass(T proxy) { } /** - * Get the true, underlying class of a proxied entity. + * Get the true, underlying class of a proxied entity. *

* Like {@link #getClass}, this operation might initialize a proxy by side effect. - * However, here the initialization is avoided if possible. If the entity type is + * However, here the initialization is avoided if possible. If the entity type is * defined with subclasses, the proxy will need to be initialized to properly * determine the class. * @@ -365,8 +363,8 @@ public static void initializeProperty(Object proxy, String attributeName) { } } - /** - * If the given object is not a proxy, return it. But, if it is a proxy, ensure + /** + * If the given object is not a proxy, return it. But, if it is a proxy, ensure * that the proxy is initialized, and return a direct reference to its proxied * entity object. * @@ -375,7 +373,7 @@ public static void initializeProperty(Object proxy, String attributeName) { * * @throws LazyInitializationException if this operation is called on an * uninitialized proxy that is not associated with an open session. - */ + */ public static Object unproxy(Object proxy) { final LazyInitializer lazyInitializer = extractLazyInitializer( proxy ); return lazyInitializer != null ? lazyInitializer.getImplementation() : proxy; diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateError.java b/hibernate-core/src/main/java/org/hibernate/HibernateError.java index d7c2d68f75df..6bb44c1ab150 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateError.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateError.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateException.java b/hibernate-core/src/main/java/org/hibernate/HibernateException.java index 6a2885b5b40f..5b3714638a62 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateException.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -14,7 +12,7 @@ *

* Note that every {@linkplain java.sql.SQLException exception arising * from the JDBC layer} is wrapped in some form of {@link JDBCException}. - * + * * @author Gavin King */ public class HibernateException extends PersistenceException { diff --git a/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java index 4a9d9ea038ca..844bafd4ae28 100644 --- a/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/IdentifierLoadAccess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Incubating.java b/hibernate-core/src/main/java/org/hibernate/Incubating.java index 0a17f43d3700..270c4803ca6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/Incubating.java +++ b/hibernate-core/src/main/java/org/hibernate/Incubating.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/InstantiationException.java b/hibernate-core/src/main/java/org/hibernate/InstantiationException.java index b620c4cc3438..d56b58cf15b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/InstantiationException.java +++ b/hibernate-core/src/main/java/org/hibernate/InstantiationException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java index 28c52a742859..bca3937c083d 100644 --- a/hibernate-core/src/main/java/org/hibernate/Interceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/Interceptor.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -263,7 +261,7 @@ default void postFlush(Iterator entities) throws CallbackException {} *
    *
  • {@code Boolean.TRUE} - the entity is transient *
  • {@code Boolean.FALSE} - the entity is detached - *
  • {@code null} - Hibernate uses the {@code unsaved-value} mapping and other heuristics to + *
  • {@code null} - Hibernate uses the {@code unsaved-value} mapping and other heuristics to * determine if the object is unsaved *
* @@ -355,10 +353,10 @@ default String getEntityName(Object object) throws CallbackException { default Object getEntity(String entityName, Object id) throws CallbackException { return null; } - + /** - * Called when a Hibernate transaction is begun via the Hibernate {@code Transaction} - * API. Will not be called if transactions are being controlled via some other + * Called when a Hibernate transaction is begun via the Hibernate {@code Transaction} + * API. Will not be called if transactions are being controlled via some other * mechanism (CMT, for example). * * @param tx The Hibernate transaction facade object diff --git a/hibernate-core/src/main/java/org/hibernate/Internal.java b/hibernate-core/src/main/java/org/hibernate/Internal.java index 7c3e7601b37d..a53e4ff17b54 100644 --- a/hibernate-core/src/main/java/org/hibernate/Internal.java +++ b/hibernate-core/src/main/java/org/hibernate/Internal.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -33,4 +31,3 @@ @Documented public @interface Internal { } - diff --git a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java index 289c70810e17..eddb54ea6f02 100644 --- a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -13,7 +11,7 @@ *

* Similar to {@link MappingException}, but contains more information * about the path and type of mapping (e.g. file, resource or URL). - * + * * @author Max Rydahl Andersen * @author Steve Ebersole */ @@ -61,7 +59,7 @@ public InvalidMappingException(String customMessage, Origin origin) { public String getType() { return type; } - + public String getPath() { return path; } diff --git a/hibernate-core/src/main/java/org/hibernate/JDBCException.java b/hibernate-core/src/main/java/org/hibernate/JDBCException.java index 1eca3b555f7d..0f6448a62719 100644 --- a/hibernate-core/src/main/java/org/hibernate/JDBCException.java +++ b/hibernate-core/src/main/java/org/hibernate/JDBCException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -78,7 +76,7 @@ public int getErrorCode() { public SQLException getSQLException() { return sqlException; } - + /** * Get the actual SQL statement being executed when the exception occurred. * diff --git a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java index 90f35d9f9de9..afdf2abc1882 100644 --- a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java +++ b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Length.java b/hibernate-core/src/main/java/org/hibernate/Length.java index cb9261be5c08..71724ba37732 100644 --- a/hibernate-core/src/main/java/org/hibernate/Length.java +++ b/hibernate-core/src/main/java/org/hibernate/Length.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/LobHelper.java b/hibernate-core/src/main/java/org/hibernate/LobHelper.java index fc8501b56a6f..6ee3da32488f 100644 --- a/hibernate-core/src/main/java/org/hibernate/LobHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/LobHelper.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/LockMode.java b/hibernate-core/src/main/java/org/hibernate/LockMode.java index 89b7f55c7fbf..b09c03885cee 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockMode.java +++ b/hibernate-core/src/main/java/org/hibernate/LockMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/LockOptions.java b/hibernate-core/src/main/java/org/hibernate/LockOptions.java index f85c526d28de..9072c4245fc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/LockOptions.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/MappingException.java b/hibernate-core/src/main/java/org/hibernate/MappingException.java index 026313e20169..a1cd9bf38439 100644 --- a/hibernate-core/src/main/java/org/hibernate/MappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/MappingException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Metamodel.java b/hibernate-core/src/main/java/org/hibernate/Metamodel.java index 502e0fe716e6..ab931931b701 100644 --- a/hibernate-core/src/main/java/org/hibernate/Metamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/Metamodel.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java index 0f2a5b398893..bab6eb4db9df 100644 --- a/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java index 1d3f1ed28414..d44cf93cb54d 100644 --- a/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -116,7 +114,7 @@ default NaturalIdLoadAccess withLoadGraph(RootGraph graph) { /** * Add a {@link org.hibernate.annotations.NaturalId @NaturalId} * attribute value. - * + * * @param attributeName The name of an attribute of the entity * that is annotated {@code @NaturalId} * @param value The value of the attribute @@ -211,7 +209,7 @@ default NaturalIdLoadAccess withLoadGraph(RootGraph graph) { * the session, return that instance, initializing it if needed. This * method never returns an uninitialized instance. * - * @return The persistent instance or {@code null} + * @return The persistent instance or {@code null} */ T load(); diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java index 3ce6382d2f44..519fea7094f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java index 659fbe18da31..b88e49d00a45 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java index 328211429bab..2fb32dae4dd3 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java +++ b/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java b/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java index e46d8c2dc474..628f493b59a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java +++ b/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java index 162fb84e214e..11350f9059c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -23,7 +21,7 @@ public class ObjectNotFoundException extends UnresolvableObjectException { /** * Constructs a {@code ObjectNotFoundException} using the given information. - * + * * @param identifier The identifier of the entity * @param entityName The name of the entity */ diff --git a/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java b/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java index bf22a41ed257..a1af82b4452f 100644 --- a/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java b/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java index 263d58915c0b..5d52a18daa40 100644 --- a/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java +++ b/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java b/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java index 4ba1afbf211f..2403c5510d6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java index 8af7099e9828..68686414389b 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/PropertySetterAccessException.java b/hibernate-core/src/main/java/org/hibernate/PropertySetterAccessException.java index 1675732bd48c..e9092007fa1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertySetterAccessException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertySetterAccessException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java b/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java index 5020d939eeb3..e4bebec4fc5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -17,7 +15,7 @@ * is null, or *

  • an association references an unsaved transient instance. * - * + * * @author Gavin King */ public class PropertyValueException extends HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/QueryException.java b/hibernate-core/src/main/java/org/hibernate/QueryException.java index 09da0d4846b8..aad15570ee88 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java b/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java index bcfe513851f0..083978a34bbe 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java @@ -1,44 +1,42 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate; - -/** - * Indicates a problem with the runtime arguments bound to query parameters. - * - * @author Emmanuel Bernard - */ -public class QueryParameterException extends QueryException { - /** - * Constructs a {@code QueryParameterException} using the supplied exception message. - * - * @param message The message explaining the exception condition - */ - public QueryParameterException(String message) { - super( message ); - } - - /** - * Constructs a {@code QueryParameterException} - * - * @param message The message explaining the exception condition - * @param queryString The query that led to the exception - * @param cause The underlying cause - */ - public QueryParameterException(String message, String queryString, Exception cause) { - super( message, queryString, cause ); - } - - /** - * Constructs a {@code QueryParameterException} - * - * @param message The message explaining the exception condition - * @param queryString The query that led to the exception - */ - public QueryParameterException(String message, String queryString) { - super( message, queryString ); - } -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate; + +/** + * Indicates a problem with the runtime arguments bound to query parameters. + * + * @author Emmanuel Bernard + */ +public class QueryParameterException extends QueryException { + /** + * Constructs a {@code QueryParameterException} using the supplied exception message. + * + * @param message The message explaining the exception condition + */ + public QueryParameterException(String message) { + super( message ); + } + + /** + * Constructs a {@code QueryParameterException} + * + * @param message The message explaining the exception condition + * @param queryString The query that led to the exception + * @param cause The underlying cause + */ + public QueryParameterException(String message, String queryString, Exception cause) { + super( message, queryString, cause ); + } + + /** + * Constructs a {@code QueryParameterException} + * + * @param message The message explaining the exception condition + * @param queryString The query that led to the exception + */ + public QueryParameterException(String message, String queryString) { + super( message, queryString ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java b/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java index d95f4fb710f1..b2830aa2e9a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ReadOnlyMode.java b/hibernate-core/src/main/java/org/hibernate/ReadOnlyMode.java index 45b1e1ffd66f..2dea698be3e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/ReadOnlyMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ReadOnlyMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -15,7 +13,7 @@ * * @since 7.0 * - * @see Session#setDefaultReadOnly(boolean) + * @see Session#setDefaultReadOnly(boolean) * @see Session#find(Class, Object, FindOption...) * * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/Remove.java b/hibernate-core/src/main/java/org/hibernate/Remove.java index 6f8078438231..c7a5b763f5d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/Remove.java +++ b/hibernate-core/src/main/java/org/hibernate/Remove.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java b/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java index 922ad904c09f..74f1d5bd2382 100644 --- a/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ResourceClosedException.java b/hibernate-core/src/main/java/org/hibernate/ResourceClosedException.java index 65b735d5e0b1..403ac67f0441 100644 --- a/hibernate-core/src/main/java/org/hibernate/ResourceClosedException.java +++ b/hibernate-core/src/main/java/org/hibernate/ResourceClosedException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java index fd409c3a259f..ac9703fdbc8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java index 1684b382f9fd..94b705a72523 100644 --- a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index 64c0a3358ffd..e86de4198f6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -385,10 +383,10 @@ public interface Session extends SharedSessionContract, EntityManager { boolean isDirty(); /** - * Will entities and proxies that are loaded into this session be made + * Will entities and proxies that are loaded into this session be made * read-only by default? *

    - * To determine the read-only/modifiable setting for a particular entity + * To determine the read-only/modifiable setting for a particular entity * or proxy use {@link #isReadOnly(Object)}. * * @see #isReadOnly(Object) @@ -828,7 +826,7 @@ public interface Session extends SharedSessionContract, EntityManager { /** * Return the entity name for a persistent entity. - * + * * @param object a persistent entity associated with this session * * @return the entity name @@ -905,7 +903,7 @@ public interface Session extends SharedSessionContract, EntityManager { /** * Create an {@link IdentifierLoadAccess} instance to retrieve an instance of the named * entity type by its primary key. - * + * * @param entityName the entity name of the entity type to be retrieved * * @return an instance of {@link IdentifierLoadAccess} for executing the lookup @@ -960,7 +958,7 @@ public interface Session extends SharedSessionContract, EntityManager { * entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id}, * which may be a composite natural id. The entity must have at least one attribute * annotated {@link org.hibernate.annotations.NaturalId}. - * + * * @param entityName the entity name of the entity type to be retrieved * * @return an instance of {@link NaturalIdLoadAccess} for executing the lookup @@ -1036,7 +1034,7 @@ public interface Session extends SharedSessionContract, EntityManager { @Override void disableFilter(String filterName); - + /** * Get the {@linkplain SessionStatistics statistics} for this session. * diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java index 5ba0f9d9505f..657fd25d1a08 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -14,7 +12,7 @@ /** * Allows creation of a new {@link Session} with specific options. - * + * * @author Steve Ebersole * * @see SessionFactory#withOptions() diff --git a/hibernate-core/src/main/java/org/hibernate/SessionEventListener.java b/hibernate-core/src/main/java/org/hibernate/SessionEventListener.java index abdcd0aa8643..bbc4d4d0d32f 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionEventListener.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/SessionException.java b/hibernate-core/src/main/java/org/hibernate/SessionException.java index 19f276282cb3..d1e8793fe42e 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionException.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java index d2cd04366a51..bdf155814600 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -348,8 +346,8 @@ default R fromStatelessTransaction(Function action) { /** * Return all {@link EntityGraph}s registered for the given entity type. - * - * @see #addNamedEntityGraph + * + * @see #addNamedEntityGraph */ List> findEntityGraphsByType(Class entityClass); diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java b/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java index a3cebcce0281..c316a36db5ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java index 79d5233bb2fb..4cc6e1122b2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java index be0f1683ac32..e0ed2eb532e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java index 5e5d92534ff4..949074fe97d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -21,7 +19,7 @@ * 

      * Book book = session.bySimpleNaturalId(Book.class).load(isbn);
  *
    - * + * * @author Eric Dalquist * @author Steve Ebersole * @@ -137,7 +135,7 @@ default SimpleNaturalIdLoadAccess withLoadGraph(RootGraph graph) { * an uninitialized instance. * * @param naturalIdValue The value of the natural-id - * + * * @return The persistent instance or {@code null} */ T load(Object naturalIdValue); diff --git a/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java index 315d285a654c..29549295fa2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java +++ b/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java index 406d5dbde0d3..4e6c63e13ebd 100644 --- a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java +++ b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java index 088fbd404d63..e4467227a53f 100644 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java +++ b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java index 449d2d793c58..7c9d1cba98b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/TimeZoneStorageStrategy.java b/hibernate-core/src/main/java/org/hibernate/TimeZoneStorageStrategy.java index d373886f0b9a..0f987cffcd4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/TimeZoneStorageStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/TimeZoneStorageStrategy.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java index cf7416e11846..814a92bd35d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/Transaction.java +++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/TransactionException.java b/hibernate-core/src/main/java/org/hibernate/TransactionException.java index 3c86ecae2606..758b5cf84870 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransactionException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransactionException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/TransactionManagementException.java b/hibernate-core/src/main/java/org/hibernate/TransactionManagementException.java index ea0b4156bc62..5f47f4029f7e 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransactionManagementException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransactionManagementException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -18,4 +16,3 @@ public TransactionManagementException(String message) { super( message ); } } - diff --git a/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java b/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java index 1e6d052a128c..37d0cb5d4445 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java b/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java index caea0ae8d215..0571cb3b825d 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; @@ -29,9 +27,9 @@ public class TransientPropertyValueException extends TransientObjectException { * @param propertyName - the property name */ public TransientPropertyValueException( - String message, - String transientEntityName, - String propertyOwnerEntityName, + String message, + String transientEntityName, + String propertyOwnerEntityName, String propertyName) { super( message ); this.transientEntityName = transientEntityName; diff --git a/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java b/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java index 599914f61db3..864ec4630ef9 100644 --- a/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java +++ b/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java @@ -1,23 +1,21 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate; - -/** - * Used when a user provided type does not match the expected one. - * - * @author Emmanuel Bernard - */ -public class TypeMismatchException extends HibernateException { - /** - * Constructs a {@code TypeMismatchException} using the supplied message. - * - * @param message The message explaining the exception condition - */ - public TypeMismatchException(String message) { - super( message ); - } -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate; + +/** + * Used when a user provided type does not match the expected one. + * + * @author Emmanuel Bernard + */ +public class TypeMismatchException extends HibernateException { + /** + * Constructs a {@code TypeMismatchException} using the supplied message. + * + * @param message The message explaining the exception condition + */ + public TypeMismatchException(String message) { + super( message ); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/UnknownEntityTypeException.java b/hibernate-core/src/main/java/org/hibernate/UnknownEntityTypeException.java index 39a43d2098b7..45e6673ca66d 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnknownEntityTypeException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnknownEntityTypeException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/UnknownFilterException.java b/hibernate-core/src/main/java/org/hibernate/UnknownFilterException.java index 944f417efff6..c885ed64fa0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnknownFilterException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnknownFilterException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java b/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java index a1358b1e39a0..4f48e3090442 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java index 273562600849..8a8810eda3e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/UnsupportedLockAttemptException.java b/hibernate-core/src/main/java/org/hibernate/UnsupportedLockAttemptException.java index af1f5e784f44..c240571b1cd4 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnsupportedLockAttemptException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnsupportedLockAttemptException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/Version.java b/hibernate-core/src/main/java/org/hibernate/Version.java index 7e3282b3916e..7e58f4148aee 100644 --- a/hibernate-core/src/main/java/org/hibernate/Version.java +++ b/hibernate-core/src/main/java/org/hibernate/Version.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java index ce6e78de0911..b761aae0db40 100644 --- a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java +++ b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java index 5ad8ff5c2511..40addfbe076c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java index 03008c4c7ac9..a43e8649fcb5 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; @@ -247,7 +245,7 @@ public void beforeExecutions() throws HibernateException { @Override public void execute() throws HibernateException { - // nothing to do + // nothing to do } private static class EntityCleanup implements Serializable { diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java index c51d68bf2232..7d599f11579b 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; @@ -138,7 +136,7 @@ protected final void evict() throws CacheException { if ( persister.hasCache() ) { final CollectionDataAccess cache = persister.getCacheAccessStrategy(); final Object ck = cache.generateCacheKey( - key, + key, persister, session.getFactory(), session.getTenantIdentifier() diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java index d2dde526899f..8778ef0010f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java index ba373ac3bf15..4496a8e19ee1 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java index 0f60dd00d92c..25ca115ed29e 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; @@ -62,7 +60,7 @@ public void execute() throws HibernateException { if ( !collection.isDirty() ) { throw new AssertionFailure( "collection is not dirty" ); } - //do nothing - we only need to notify the cache... + //do nothing - we only need to notify the cache... } else if ( !affectedByFilters && collection.empty() ) { if ( !emptySnapshot ) { @@ -95,7 +93,7 @@ else if ( collection.needsRecreate( persister ) ) { statistics.updateCollection( persister.getRole() ); } } - + private void preUpdate() { getFastSessionServices().eventListenerGroup_PRE_COLLECTION_UPDATE .fireLazyEventOnEachListener( this::newPreCollectionUpdateEvent, diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/DelayedPostInsertIdentifier.java b/hibernate-core/src/main/java/org/hibernate/action/internal/DelayedPostInsertIdentifier.java index 6a62ef675aca..b524c7110b71 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/DelayedPostInsertIdentifier.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/DelayedPostInsertIdentifier.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java index 0cc8c531f1e5..6f332d9c0642 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java index 5fd9ba2a2caa..5142c7948027 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java index f800a661be93..28e41538aa80 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java index e58b1ea7b487..27198c60412c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIncrementVersionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIncrementVersionProcess.java index 6b8676e3f903..df4db5149109 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIncrementVersionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIncrementVersionProcess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java index e6bafdfff70a..af6da63dbf34 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java index 68705cffbd16..b6469c6ecabf 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityVerifyVersionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityVerifyVersionProcess.java index 3cc50ab6d922..fe6c1c23886f 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityVerifyVersionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityVerifyVersionProcess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/OrphanRemovalAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/OrphanRemovalAction.java index 8152d751da45..5ef3e6ef3027 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/OrphanRemovalAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/OrphanRemovalAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java index cfafa8efd370..5da162eba41f 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; @@ -19,11 +17,11 @@ *

    * For example, {@link org.hibernate.persister.collection.OneToManyPersister} * needs to insert indexes for lists. See HHH-8083. - * + * * @author Brett Meyer */ public final class QueuedOperationCollectionAction extends CollectionAction { - + /** * Constructs a CollectionUpdateAction * @param collection The collection to update diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index 982c6edef7d4..e04a720116fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.internal; diff --git a/hibernate-core/src/main/java/org/hibernate/action/spi/AfterTransactionCompletionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/spi/AfterTransactionCompletionProcess.java index 02d3a58a76b1..72a7a95c95d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/spi/AfterTransactionCompletionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/spi/AfterTransactionCompletionProcess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.spi; diff --git a/hibernate-core/src/main/java/org/hibernate/action/spi/BeforeTransactionCompletionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/spi/BeforeTransactionCompletionProcess.java index ec45a510d717..6e3cf3b65a4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/spi/BeforeTransactionCompletionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/spi/BeforeTransactionCompletionProcess.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.spi; diff --git a/hibernate-core/src/main/java/org/hibernate/action/spi/Executable.java b/hibernate-core/src/main/java/org/hibernate/action/spi/Executable.java index 1486033d5c6a..439cfe3113cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/spi/Executable.java +++ b/hibernate-core/src/main/java/org/hibernate/action/spi/Executable.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.action.spi; @@ -15,7 +13,7 @@ * An operation which may be scheduled for later execution. Usually, the * operation is a database insert/update/delete, together with required * second-level cache management. - * + * * @author Gavin King * @author Steve Ebersole */ @@ -56,7 +54,7 @@ public interface Executable { * before-transaction-completion process */ @Nullable BeforeTransactionCompletionProcess getBeforeTransactionCompletionProcess(); - + /** * Reconnect to session after deserialization * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java index 242ad2da2cec..11565402983a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminator.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminator.java index 922ea0696b4c..4cfd3f08ad37 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValue.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValue.java index ce534ae5f2fe..b3efe4584b3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValue.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValue.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValues.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValues.java index b682e33a9f35..2d2284de1484 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValues.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyDiscriminatorValues.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaClass.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaClass.java index c9717a0d3f69..3c9caad1e363 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaClass.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaClass.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaType.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaType.java index 66830c1e8f27..8a53623109e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJavaType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcType.java index 219835593afd..477d9311bca7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcTypeCode.java index 579667892fb7..d9e9cb54a651 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyKeyJdbcTypeCode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Array.java b/hibernate-core/src/main/java/org/hibernate/annotations/Array.java index 365fc6b2a4ef..e14201c5d047 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Array.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Array.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java index 145715d106f4..324fabbd28f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeBinderType.java b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeBinderType.java index 7b5794fe405e..69f59bd9e0f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeBinderType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeBinderType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Bag.java b/hibernate-core/src/main/java/org/hibernate/annotations/Bag.java index 2b86a8e33061..286995dfba7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Bag.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Bag.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java index e45553e878dd..818f15e25175 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java index 728bd5d70721..4a7a1ef75431 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java index cc3b5e7eeefd..dc872732fafb 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CacheLayout.java b/hibernate-core/src/main/java/org/hibernate/annotations/CacheLayout.java index 432f85671c76..2e5abe5d39e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CacheLayout.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CacheLayout.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java index dffceb6b032d..e37893f53407 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java index 8428c6c0cbbb..d9f4c30e3744 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -44,14 +42,14 @@ public enum CascadeType { /** * Equivalent to {@link jakarta.persistence.CascadeType#PERSIST}. - * - * @see jakarta.persistence.EntityManager#persist(Object) + * + * @see jakarta.persistence.EntityManager#persist(Object) */ PERSIST, /** * Equivalent to {@link jakarta.persistence.CascadeType#MERGE}. - * + * * @see jakarta.persistence.EntityManager#merge(Object) */ MERGE, @@ -89,8 +87,8 @@ public enum CascadeType { /** * A cascade type for the {@code replicate()} operation. * - * @see org.hibernate.Session#replicate(Object, ReplicationMode) - * + * @see org.hibernate.Session#replicate(Object, ReplicationMode) + * * @deprecated since {@link org.hibernate.Session#replicate(Object, ReplicationMode)} * is deprecated */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java index 825b29594159..38c2a1fa1350 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Checks.java b/hibernate-core/src/main/java/org/hibernate/annotations/Checks.java index 84f7551c54c0..b074c4f56e17 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Checks.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Checks.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Collate.java b/hibernate-core/src/main/java/org/hibernate/annotations/Collate.java index 0ce0af0ebd2d..449f4430b5f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Collate.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Collate.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java index a02fe228f368..a63eb4b309f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaType.java index 267d6cf2b06e..e0082354ae29 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcType.java index 1cd3097a738c..7908d5d7c8b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcTypeCode.java index eb059d7754a7..6f9eae5c5a67 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJdbcTypeCode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdMutability.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdMutability.java index 1777615cc9be..f96f45b7ac96 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdMutability.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdMutability.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdType.java index 2906b98047dd..c20477872e14 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java index 5f6f85250b94..abe57bfc0322 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java index 28615b2305ad..8e5293ccd2f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistrations.java index 5fefe7d5d570..9b694f13d8c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionTypeRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnDefault.java b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnDefault.java index 61eb98b8770a..be2f030f2de9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnDefault.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnDefault.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java index dbe330b4830a..d7b2d217a67e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java index 91d14bdfe9de..a9cf50c177fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -16,7 +14,7 @@ /** * Plural annotation for @ColumnTransformer. * Useful when more than one column is using this behavior. - * + * * @author Emmanuel Bernard */ @Target({FIELD,METHOD}) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java index d0b3104794e5..250016658db8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Comment.java b/hibernate-core/src/main/java/org/hibernate/annotations/Comment.java index 363bd338caca..aa97d790dfaf 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Comment.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Comment.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Comments.java b/hibernate-core/src/main/java/org/hibernate/annotations/Comments.java index 7af2cb51cd54..dce8bdd3109a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Comments.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Comments.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeType.java index cbc3de96bdd6..bf5338fa0a4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java index 43a485bc15b7..585434a0e848 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistrations.java index 78eb516792a9..79d2e9c92726 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CompositeTypeRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ConcreteProxy.java b/hibernate-core/src/main/java/org/hibernate/annotations/ConcreteProxy.java index 0e769f972a72..1f7d96082546 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ConcreteProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ConcreteProxy.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java index 07ff72ce7a6b..e9cbed577a39 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistrations.java index b7424994b767..85a604294c17 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ConverterRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CreationTimestamp.java b/hibernate-core/src/main/java/org/hibernate/annotations/CreationTimestamp.java index e124e9d44ca9..89eda5bc2e73 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CreationTimestamp.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CreationTimestamp.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CurrentTimestamp.java b/hibernate-core/src/main/java/org/hibernate/annotations/CurrentTimestamp.java index efb53e7a93ca..a464f6cd2d66 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CurrentTimestamp.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CurrentTimestamp.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java index 0d2d886f8b8d..6d9f0d54ca6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java index be47a20872b6..fedf5762995b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java index 34c0701f0dd9..62b37843a4af 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ -// $Id$ package org.hibernate.annotations; import org.hibernate.binder.internal.DiscriminatorOptionsBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicInsert.java b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicInsert.java index eabfcb8aab2a..7544f94045b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicInsert.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java index 571e7cdcc1de..8f825dde259e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiator.java b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiator.java index 873f4343ff00..1b13e4b6db0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java index 3f6d3ffcf60a..88c763119b99 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistrations.java index 28532aaed241..cb010a48b95d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddableInstantiatorRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java b/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java index b983d17eb9d1..ae360a802b5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java @@ -1,46 +1,44 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Specifies the default fetching method for the annotated association. - *

    - * When this annotation is not explicitly specified, then: - *

      - *
    • {@linkplain FetchMode#SELECT select fetching} is used for - * {@linkplain jakarta.persistence.FetchType#LAZY lazy} fetching, - * and - *
    • {@linkplain FetchMode#JOIN join fetching} is used for - * {@linkplain jakarta.persistence.FetchType#EAGER eager} fetching. - *
    - *

    - * The default fetching method specified by this annotation may be - * overridden in a given {@linkplain FetchProfile fetch profile}. - *

    - * Note that join fetching is incompatible with lazy fetching, and so - * {@code @Fetch(JOIN)} implies {@code fetch=EAGER}. - * - * @author Emmanuel Bernard - * - * @see FetchMode - * @see FetchProfile - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface Fetch { - /** - * The method that should be used to fetch the association. - */ - FetchMode value(); -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Specifies the default fetching method for the annotated association. + *

    + * When this annotation is not explicitly specified, then: + *

      + *
    • {@linkplain FetchMode#SELECT select fetching} is used for + * {@linkplain jakarta.persistence.FetchType#LAZY lazy} fetching, + * and + *
    • {@linkplain FetchMode#JOIN join fetching} is used for + * {@linkplain jakarta.persistence.FetchType#EAGER eager} fetching. + *
    + *

    + * The default fetching method specified by this annotation may be + * overridden in a given {@linkplain FetchProfile fetch profile}. + *

    + * Note that join fetching is incompatible with lazy fetching, and so + * {@code @Fetch(JOIN)} implies {@code fetch=EAGER}. + * + * @author Emmanuel Bernard + * + * @see FetchMode + * @see FetchProfile + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface Fetch { + /** + * The method that should be used to fetch the association. + */ + FetchMode value(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java index 276775edc992..b833fd9df7a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java index 68ef53023ba9..98e5bf6c190c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java @@ -1,141 +1,139 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import jakarta.persistence.FetchType; - -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static jakarta.persistence.FetchType.EAGER; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.hibernate.annotations.FetchMode.JOIN; - -/** - * Defines a fetch profile, by specifying its {@link #name}, together - * with a list of {@linkplain #fetchOverrides fetch strategy overrides}. - * The definition of a single named fetch profile may be split over - * multiple {@link FetchProfile @FetchProfile} annotations which share - * the same {@link #name}. - *

    - * Additional fetch strategy overrides may be added to a named fetch - * profile by annotating the fetched associations themselves with the - * {@link FetchProfileOverride @FetchProfileOverride} annotation, - * specifying the {@linkplain FetchProfileOverride#profile name of the - * fetch profile}. - *

    - * A named fetch profile must be explicitly enabled in a given session - * by calling {@link org.hibernate.Session#enableFetchProfile(String)} - * for it to have any effect at runtime. - *

    - * Fetch profiles compete with JPA-defined - * {@linkplain jakarta.persistence.NamedEntityGraph named entity graphs}, - * and so programs which wish to maintain compatibility with alternative - * implementations of JPA should prefer {@code @NamedEntityGraph}. The - * semantics of these two facilities are not quite identical, however, - * since a fetch profile is a list, not a graph. - *

    - * Or, if we insist on thinking in terms of graphs: - *

      - *
    • for a fetch profile, the graph is implicit, determined by - * recursively following fetched associations from the root entity, - * and each {@link FetchOverride} in the fetch profile applies the - * same fetching strategy to the overridden association wherever it - * is reached recursively within the graph, whereas - *
    • an entity graph is explicit, and simply specifies that each path - * from the root of the graph should be fetched. - *
    - *

    - * However, a fetch profile is not by nature rooted at any one particular - * entity, and so {@code @FetchProfile} is not required to annotate the - * entity classes it affects. It may even occur as a package-level - * annotation. - *

    - * Instead, the root entity of a fetch graph is determined by the context - * in which the fetch profile is active. For example, if a fetch profile - * is active when {@link org.hibernate.Session#get(Class, Object)} is - * called, then the root entity is the entity with the given {@link Class}. - * Given a root entity as input, an active fetch profile contributes to - * the determination of the fetch graph. - *

    - * A JPA {@link jakarta.persistence.EntityGraph} may be constructed in - * Java code at runtime. But this amounts to a separate, albeit extremely - * limited, query facility that competes with JPA's own {@linkplain - * jakarta.persistence.criteria.CriteriaBuilder criteria queries}. - * There's no such capability for fetch profiles. - * - * @see FetchProfileOverride - * @see org.hibernate.Session#enableFetchProfile(String) - * @see org.hibernate.SessionFactory#containsFetchProfileDefinition(String) - * - * @author Hardy Ferentschik - */ -@Target({TYPE, PACKAGE}) -@Retention(RUNTIME) -@Repeatable(FetchProfiles.class) -public @interface FetchProfile { - /** - * The name of the fetch profile. Must be unique within a persistence - * unit. - * - * @see org.hibernate.SessionFactory#getDefinedFetchProfileNames() - */ - String name(); - - /** - * The list of association fetching strategy overrides. - *

    - * Additional overrides may be specified by marking the - * fetched associations themselves with the {@link Fetch @Fetch} - * annotation. - */ - FetchOverride[] fetchOverrides() default {}; - - /** - * Overrides the fetching strategy for a particular association in - * the named fetch profile being defined. A "strategy" is a fetching - * {@linkplain #mode method}, together with the {@linkplain #fetch - * timing}. If {@link #mode} and {@link #fetch} are both unspecified, - * the strategy defaults to {@linkplain FetchType#EAGER eager} - * {@linkplain FetchMode#JOIN join} fetching. - *

    - * Additional fetch strategy overrides may be specified using the - * {@link FetchProfileOverride @FetchProfileOverride} annotation. - * - * @see FetchProfileOverride - */ - @Target({ TYPE, PACKAGE }) - @Retention(RUNTIME) - @interface FetchOverride { - /** - * The entity containing the association whose default fetch - * strategy is being overridden. - */ - Class entity(); - - /** - * The association whose default fetch strategy is being - * overridden. - */ - String association(); - - /** - * The {@linkplain FetchMode method} used for fetching the - * association in the fetch profile being defined. - */ - FetchMode mode() default JOIN; - - /** - * The {@link FetchType timing} of association fetching in - * the fetch profile being defined. - */ - FetchType fetch() default EAGER; - } -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import jakarta.persistence.FetchType; + +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static jakarta.persistence.FetchType.EAGER; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.hibernate.annotations.FetchMode.JOIN; + +/** + * Defines a fetch profile, by specifying its {@link #name}, together + * with a list of {@linkplain #fetchOverrides fetch strategy overrides}. + * The definition of a single named fetch profile may be split over + * multiple {@link FetchProfile @FetchProfile} annotations which share + * the same {@link #name}. + *

    + * Additional fetch strategy overrides may be added to a named fetch + * profile by annotating the fetched associations themselves with the + * {@link FetchProfileOverride @FetchProfileOverride} annotation, + * specifying the {@linkplain FetchProfileOverride#profile name of the + * fetch profile}. + *

    + * A named fetch profile must be explicitly enabled in a given session + * by calling {@link org.hibernate.Session#enableFetchProfile(String)} + * for it to have any effect at runtime. + *

    + * Fetch profiles compete with JPA-defined + * {@linkplain jakarta.persistence.NamedEntityGraph named entity graphs}, + * and so programs which wish to maintain compatibility with alternative + * implementations of JPA should prefer {@code @NamedEntityGraph}. The + * semantics of these two facilities are not quite identical, however, + * since a fetch profile is a list, not a graph. + *

    + * Or, if we insist on thinking in terms of graphs: + *

      + *
    • for a fetch profile, the graph is implicit, determined by + * recursively following fetched associations from the root entity, + * and each {@link FetchOverride} in the fetch profile applies the + * same fetching strategy to the overridden association wherever it + * is reached recursively within the graph, whereas + *
    • an entity graph is explicit, and simply specifies that each path + * from the root of the graph should be fetched. + *
    + *

    + * However, a fetch profile is not by nature rooted at any one particular + * entity, and so {@code @FetchProfile} is not required to annotate the + * entity classes it affects. It may even occur as a package-level + * annotation. + *

    + * Instead, the root entity of a fetch graph is determined by the context + * in which the fetch profile is active. For example, if a fetch profile + * is active when {@link org.hibernate.Session#get(Class, Object)} is + * called, then the root entity is the entity with the given {@link Class}. + * Given a root entity as input, an active fetch profile contributes to + * the determination of the fetch graph. + *

    + * A JPA {@link jakarta.persistence.EntityGraph} may be constructed in + * Java code at runtime. But this amounts to a separate, albeit extremely + * limited, query facility that competes with JPA's own {@linkplain + * jakarta.persistence.criteria.CriteriaBuilder criteria queries}. + * There's no such capability for fetch profiles. + * + * @see FetchProfileOverride + * @see org.hibernate.Session#enableFetchProfile(String) + * @see org.hibernate.SessionFactory#containsFetchProfileDefinition(String) + * + * @author Hardy Ferentschik + */ +@Target({TYPE, PACKAGE}) +@Retention(RUNTIME) +@Repeatable(FetchProfiles.class) +public @interface FetchProfile { + /** + * The name of the fetch profile. Must be unique within a persistence + * unit. + * + * @see org.hibernate.SessionFactory#getDefinedFetchProfileNames() + */ + String name(); + + /** + * The list of association fetching strategy overrides. + *

    + * Additional overrides may be specified by marking the + * fetched associations themselves with the {@link Fetch @Fetch} + * annotation. + */ + FetchOverride[] fetchOverrides() default {}; + + /** + * Overrides the fetching strategy for a particular association in + * the named fetch profile being defined. A "strategy" is a fetching + * {@linkplain #mode method}, together with the {@linkplain #fetch + * timing}. If {@link #mode} and {@link #fetch} are both unspecified, + * the strategy defaults to {@linkplain FetchType#EAGER eager} + * {@linkplain FetchMode#JOIN join} fetching. + *

    + * Additional fetch strategy overrides may be specified using the + * {@link FetchProfileOverride @FetchProfileOverride} annotation. + * + * @see FetchProfileOverride + */ + @Target({ TYPE, PACKAGE }) + @Retention(RUNTIME) + @interface FetchOverride { + /** + * The entity containing the association whose default fetch + * strategy is being overridden. + */ + Class entity(); + + /** + * The association whose default fetch strategy is being + * overridden. + */ + String association(); + + /** + * The {@linkplain FetchMode method} used for fetching the + * association in the fetch profile being defined. + */ + FetchMode mode() default JOIN; + + /** + * The {@link FetchType timing} of association fetching in + * the fetch profile being defined. + */ + FetchType fetch() default EAGER; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverride.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverride.java index 7a4cc650c2fe..9adfe5bd0711 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverride.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverride.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverrides.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverrides.java index e997c171762c..58dcff6cf60c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverrides.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfileOverrides.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java index 6663af79b365..e1cb2e2edd66 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java index 8709d4db3d3e..b1cd2de97e18 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java index 894c063be29f..9e76ff196fe9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java index 5275e95ae7ff..b1c0fe7fe6e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java index 0c945535b732..e8e96c6cdc2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java @@ -1,78 +1,76 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Specifies that the join table of a collection is affected by a - * named filter declared using {@link FilterDef}, and allows the - * {@linkplain FilterDef#defaultCondition default filter condition} - * to be overridden for the annotated entity or collection role. - * - * @author Emmanuel Bernard - * @author Rob Worsnop - * - * @see Filter - */ -@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -@Repeatable(FilterJoinTables.class) -public @interface FilterJoinTable { - /** - * The name of the filter declared using {@link FilterDef}. - */ - String name(); - - /** - * The filter condition, a SQL expression used for filtering - * the rows returned by a query when the filter is enabled. - * If not specified, the default filter condition given by - * {@link FilterDef#defaultCondition} is used. - *

    - * By default, aliases of filtered tables are automatically - * interpolated into the filter condition, before any token - * that looks like a column name. Occasionally, when the - * interpolation algorithm encounters ambiguity, the process - * of alias interpolation produces broken SQL. In such cases, - * alias interpolation may be controlled explicitly using - * either {@link #deduceAliasInjectionPoints} or - * {@link #aliases}. - */ - String condition() default ""; - - /** - * Determines how tables aliases are interpolated into the - * {@link #condition} SQL expression. - *

      - *
    • if {@code true}, and by default, an alias is added - * automatically to every column occurring in the SQL - * expression, but - *
    • if {@code false}, aliases are only interpolated where - * an explicit placeholder of form {@code {alias}} occurs - * in the SQL expression. - *
    • Finally, if {@link #aliases explicit aliases} are - * specified, then alias interpolation happens only for - * the specified aliases. - *
    - */ - boolean deduceAliasInjectionPoints() default true; - - /** - * Explicitly specifies how aliases are interpolated into - * the {@link #condition} SQL expression. Each {@link - * SqlFragmentAlias} specifies a placeholder name and the - * table whose alias should be interpolated. Placeholders - * are of form {@code {name}} where {@code name} matches - * a {@link SqlFragmentAlias#alias}. - */ - SqlFragmentAlias[] aliases() default {}; -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specifies that the join table of a collection is affected by a + * named filter declared using {@link FilterDef}, and allows the + * {@linkplain FilterDef#defaultCondition default filter condition} + * to be overridden for the annotated entity or collection role. + * + * @author Emmanuel Bernard + * @author Rob Worsnop + * + * @see Filter + */ +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Repeatable(FilterJoinTables.class) +public @interface FilterJoinTable { + /** + * The name of the filter declared using {@link FilterDef}. + */ + String name(); + + /** + * The filter condition, a SQL expression used for filtering + * the rows returned by a query when the filter is enabled. + * If not specified, the default filter condition given by + * {@link FilterDef#defaultCondition} is used. + *

    + * By default, aliases of filtered tables are automatically + * interpolated into the filter condition, before any token + * that looks like a column name. Occasionally, when the + * interpolation algorithm encounters ambiguity, the process + * of alias interpolation produces broken SQL. In such cases, + * alias interpolation may be controlled explicitly using + * either {@link #deduceAliasInjectionPoints} or + * {@link #aliases}. + */ + String condition() default ""; + + /** + * Determines how tables aliases are interpolated into the + * {@link #condition} SQL expression. + *

      + *
    • if {@code true}, and by default, an alias is added + * automatically to every column occurring in the SQL + * expression, but + *
    • if {@code false}, aliases are only interpolated where + * an explicit placeholder of form {@code {alias}} occurs + * in the SQL expression. + *
    • Finally, if {@link #aliases explicit aliases} are + * specified, then alias interpolation happens only for + * the specified aliases. + *
    + */ + boolean deduceAliasInjectionPoints() default true; + + /** + * Explicitly specifies how aliases are interpolated into + * the {@link #condition} SQL expression. Each {@link + * SqlFragmentAlias} specifies a placeholder name and the + * table whose alias should be interpolated. Placeholders + * are of form {@code {name}} where {@code name} matches + * a {@link SqlFragmentAlias#alias}. + */ + SqlFragmentAlias[] aliases() default {}; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java index a7c07a0ec3b4..a79f312900ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java @@ -1,26 +1,24 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Add multiple {@code @FilterJoinTable} to a collection. - * - * @author Emmanuel Bernard - */ -@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface FilterJoinTables { - /** - * The aggregated filters. - */ - FilterJoinTable[] value(); -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Add multiple {@code @FilterJoinTable} to a collection. + * + * @author Emmanuel Bernard + */ +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface FilterJoinTables { + /** + * The aggregated filters. + */ + FilterJoinTable[] value(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java b/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java index c0afa08bd286..b031aace20bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java index 73c1462c1aec..c91af15f1e7b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java index df04bdacaaa7..c8cc6e9963b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FractionalSeconds.java b/hibernate-core/src/main/java/org/hibernate/annotations/FractionalSeconds.java index 808bc30e6053..66f9479c457b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FractionalSeconds.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FractionalSeconds.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java b/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java index 31b5c159f2f8..2dd3d61f88dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java @@ -1,97 +1,95 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import org.hibernate.generator.EventType; -import org.hibernate.generator.internal.GeneratedGeneration; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.hibernate.generator.EventType.INSERT; - -/** - * Specifies that the value of the annotated property is generated by the - * database. The generated value will be automatically retrieved using a - * SQL {@code select} after it is generated. - *

    - * {@code @Generated} relieves the program of the need to explicitly call - * {@link org.hibernate.Session#refresh(Object) refresh()} to synchronize - * state held in memory with state generated by the database when a SQL - * {@code insert} or {@code update} is executed. - *

    - * This is most useful when: - *

      - *
    • a database table has a column value populated by a database trigger, - *
    • a mapped column has a default value defined in DDL, in which case - * {@code @Generated} is used in conjunction with {@link ColumnDefault}, - *
    • a {@linkplain #sql() SQL expression} is used to compute the value of - * a mapped column, or - *
    • when a custom SQL {@link SQLInsert insert} or {@link SQLUpdate update} - * statement specified by an entity assigns a value to the annotated - * property of the entity, or {@linkplain #writable() transforms} the - * value currently assigned to the annotated property. - *
    - *

    - * On the other hand: - *

      - *
    • for identity/autoincrement columns mapped to an identifier property, - * use {@link jakarta.persistence.GeneratedValue}, and - *
    • for columns with a {@code generated always as} clause, prefer the - * {@link GeneratedColumn} annotation, so that Hibernate automatically - * generates the correct DDL. - *
    - * - * @author Emmanuel Bernard - * - * @see jakarta.persistence.GeneratedValue - * @see ColumnDefault - * @see GeneratedColumn - */ -@ValueGenerationType( generatedBy = GeneratedGeneration.class ) -@IdGeneratorType( GeneratedGeneration.class ) -@Target( {FIELD, METHOD} ) -@Retention( RUNTIME ) -public @interface Generated { - /** - * Specifies the events that cause the value to be generated by the - * database. - *
      - *
    • If {@link EventType#INSERT} is included, the generated value - * will be selected after each SQL {@code insert} statement is - * executed. - *
    • If {@link EventType#UPDATE} is included, the generated value - * will be selected after each SQL {@code update} statement is - * executed. - *
    - */ - EventType[] event() default INSERT; - - /** - * A SQL expression used to generate the value of the column mapped by - * the annotated property. The expression is included in generated SQL - * {@code insert} and {@code update} statements. - */ - String sql() default ""; - - /** - * Determines if the value currently assigned to the annotated property - * is included in SQL {@code insert} and {@code update} statements. This - * is useful if the generated value is obtained by transforming the - * assigned property value as it is being written. - *

    - * Often used in combination with {@link SQLInsert}, {@link SQLUpdate}, - * or {@link ColumnTransformer#write()}. - * - * @return {@code true} if the current value should be included in SQL - * {@code insert} and {@code update} statements. - */ - boolean writable() default false; -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.hibernate.generator.EventType; +import org.hibernate.generator.internal.GeneratedGeneration; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.hibernate.generator.EventType.INSERT; + +/** + * Specifies that the value of the annotated property is generated by the + * database. The generated value will be automatically retrieved using a + * SQL {@code select} after it is generated. + *

    + * {@code @Generated} relieves the program of the need to explicitly call + * {@link org.hibernate.Session#refresh(Object) refresh()} to synchronize + * state held in memory with state generated by the database when a SQL + * {@code insert} or {@code update} is executed. + *

    + * This is most useful when: + *

      + *
    • a database table has a column value populated by a database trigger, + *
    • a mapped column has a default value defined in DDL, in which case + * {@code @Generated} is used in conjunction with {@link ColumnDefault}, + *
    • a {@linkplain #sql() SQL expression} is used to compute the value of + * a mapped column, or + *
    • when a custom SQL {@link SQLInsert insert} or {@link SQLUpdate update} + * statement specified by an entity assigns a value to the annotated + * property of the entity, or {@linkplain #writable() transforms} the + * value currently assigned to the annotated property. + *
    + *

    + * On the other hand: + *

      + *
    • for identity/autoincrement columns mapped to an identifier property, + * use {@link jakarta.persistence.GeneratedValue}, and + *
    • for columns with a {@code generated always as} clause, prefer the + * {@link GeneratedColumn} annotation, so that Hibernate automatically + * generates the correct DDL. + *
    + * + * @author Emmanuel Bernard + * + * @see jakarta.persistence.GeneratedValue + * @see ColumnDefault + * @see GeneratedColumn + */ +@ValueGenerationType( generatedBy = GeneratedGeneration.class ) +@IdGeneratorType( GeneratedGeneration.class ) +@Target( {FIELD, METHOD} ) +@Retention( RUNTIME ) +public @interface Generated { + /** + * Specifies the events that cause the value to be generated by the + * database. + *
      + *
    • If {@link EventType#INSERT} is included, the generated value + * will be selected after each SQL {@code insert} statement is + * executed. + *
    • If {@link EventType#UPDATE} is included, the generated value + * will be selected after each SQL {@code update} statement is + * executed. + *
    + */ + EventType[] event() default INSERT; + + /** + * A SQL expression used to generate the value of the column mapped by + * the annotated property. The expression is included in generated SQL + * {@code insert} and {@code update} statements. + */ + String sql() default ""; + + /** + * Determines if the value currently assigned to the annotated property + * is included in SQL {@code insert} and {@code update} statements. This + * is useful if the generated value is obtained by transforming the + * assigned property value as it is being written. + *

    + * Often used in combination with {@link SQLInsert}, {@link SQLUpdate}, + * or {@link ColumnTransformer#write()}. + * + * @return {@code true} if the current value should be included in SQL + * {@code insert} and {@code update} statements. + */ + boolean writable() default false; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GeneratedColumn.java b/hibernate-core/src/main/java/org/hibernate/annotations/GeneratedColumn.java index 1240f05bb966..9d6faf7c4cd1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GeneratedColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GeneratedColumn.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java index be9e603f7070..fb400bb16ce6 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java index 3b9f639e5132..053142c9e401 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/HQLSelect.java b/hibernate-core/src/main/java/org/hibernate/annotations/HQLSelect.java index c6e86f948b7e..69f1d6dbf89c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/HQLSelect.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/HQLSelect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java b/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java index 7f3f19c11b90..6354bc2b1dcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java index fc11d5158f23..e5cd966c9ced 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -21,7 +19,7 @@ * Changes made in memory to the state of an immutable entity are never synchronized to * the database. The changes are ignored, with no exception thrown. *

    - * An immutable entity need not be dirty-checked, and so Hibernate does not need to + * An immutable entity need not be dirty-checked, and so Hibernate does not need to * maintain a snapshot of its state. This may help reduce memory allocation. * Note that it's also possible to obtain an entity in read-only mode in a given session, * and this has similar benefits. @@ -60,10 +58,10 @@ * have a type whose values are immutable. * * @author Emmanuel Bernard - * + * * @see org.hibernate.Session#setDefaultReadOnly(boolean) - * @see org.hibernate.Session#setReadOnly(Object, boolean) - * @see org.hibernate.query.Query#setReadOnly(boolean) + * @see org.hibernate.Session#setReadOnly(Object, boolean) + * @see org.hibernate.query.Query#setReadOnly(boolean) */ @Target({TYPE, METHOD, FIELD}) @Retention( RetentionPolicy.RUNTIME ) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Imported.java b/hibernate-core/src/main/java/org/hibernate/annotations/Imported.java index 08242cb24533..68f0066aea0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Imported.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Imported.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Instantiator.java b/hibernate-core/src/main/java/org/hibernate/annotations/Instantiator.java index be19cd880b0d..4b5808cb8992 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Instantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Instantiator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JavaType.java b/hibernate-core/src/main/java/org/hibernate/annotations/JavaType.java index 53ac19fe64a2..e64893061775 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JavaType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java index 7e33021d1961..6012cddc4e46 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistrations.java index 5dfc1a4c7267..0d5da7cdd2ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JavaTypeRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java index 0bb1ea2cdc66..1be897e8ade7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java index 4a154447f9d1..0aec53b798d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java index cf3b5cdc9268..556b8afec046 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistrations.java index b4a3aa5465d0..9412d8d93bdc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java index d28fdc6f6779..50550e307fe8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java index 286016e6f0e2..1913eaef96db 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java @@ -1,10 +1,7 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ - package org.hibernate.annotations; import jakarta.persistence.JoinColumn; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java index cffa2d7f5bf7..8ba68fcf843b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/LazyGroup.java b/hibernate-core/src/main/java/org/hibernate/annotations/LazyGroup.java index 687101be823f..3efc6c88c40d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/LazyGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/LazyGroup.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java index e75b102bb8d8..9dc713cf480f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJavaType.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJavaType.java index c5856620f3b2..24b692d4587d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJavaType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcType.java index c578eda1e9c4..fb4054e1ab33 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcTypeCode.java index 34622a32fcaa..1c60759099f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexJdbcTypeCode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java index 12b770e58a6c..cda309f3c795 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyCompositeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyCompositeType.java index 3bc421625177..3a04c55304de 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyCompositeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyCompositeType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJavaType.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJavaType.java index 8a01799b8071..37ccd6f4c45c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJavaType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcType.java index 89d24e1dd5eb..7ec6a53cd504 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -24,7 +22,7 @@ @Inherited @Retention(RUNTIME) public @interface MapKeyJdbcType { - /** + /** * The descriptor to use for the map-key column * * @see org.hibernate.annotations.JdbcType#value diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcTypeCode.java index a60c55ec92e1..c72b66e7104a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyJdbcTypeCode.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -24,7 +22,7 @@ @Inherited @Retention(RUNTIME) public @interface MapKeyJdbcTypeCode { - /** + /** * The code for the descriptor to use for the map-key column * * @see JdbcTypeCode#value diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyMutability.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyMutability.java index a8559e4c73fb..7de82846e268 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyMutability.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyMutability.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java index 3efaf0e8c179..b53818671846 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java b/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java index a763ef4faa51..ba5834610053 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java index e587a99f9993..89bf6e15a0d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java index 7a028ee81d84..1793efca7772 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java index e5bbc16ea993..c0592851d4b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java index 8d2adf547268..c22084276e51 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Nationalized.java b/hibernate-core/src/main/java/org/hibernate/annotations/Nationalized.java index a177f84153f1..596004445379 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Nationalized.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Nationalized.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java index 9c8d82037e9e..1e2fc92fbafc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdCache.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdCache.java index 9213d3864a72..00a714383d95 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdCache.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdCache.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java b/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java index c23c0cd95dba..c83bd00b092a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java b/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java index 52c42bc21b01..e99f5b9e4443 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java index 8a748bdc5216..14b08386f5d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java index 6d02f2cbe86c..adb791b49da5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java index 1a7d4bd5aa0b..aa2526939fc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java index 27e61206da31..da245d358292 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLocking.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLocking.java index 283d1fc2fd16..25a48c193401 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLocking.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLocking.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java index 403adfc3ce30..897f5ed2c78d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java index 97ac71bb9fe2..bf3445ed59f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java b/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java index 6435d4ca2601..0edc0a353f4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java b/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java index 0cae37952772..89ddcf644533 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java @@ -1,23 +1,21 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Reference the property as a pointer back to the owner (generally the owning entity). - * - * @author Emmanuel Bernard - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface Parent { -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Reference the property as a pointer back to the owner (generally the owning entity). + * + * @author Emmanuel Bernard + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface Parent { +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java index 86e8aa08ab70..b4875c057ef2 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/PropertyRef.java b/hibernate-core/src/main/java/org/hibernate/annotations/PropertyRef.java index 385a2c9bc7ca..2a87653f3c1e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/PropertyRef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/PropertyRef.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryCacheLayout.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryCacheLayout.java index 9f3086447536..6b792fee7a9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryCacheLayout.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/QueryCacheLayout.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java b/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java index d873a4af7bc0..4078064660e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/RowId.java b/hibernate-core/src/main/java/org/hibernate/annotations/RowId.java index e276e36537e3..d10495640910 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/RowId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/RowId.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java index e6b4e763629b..b3ad3ec324dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java index 49d9eaf772e7..cabd4bc11428 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java @@ -1,63 +1,61 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import org.hibernate.jdbc.Expectation; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Specifies a custom SQL DML statement to be used in place of the default SQL generated by - * Hibernate when an entire collection is deleted from the database. - * - * @author László Benke - */ -@Target({TYPE, FIELD, METHOD}) -@Retention(RUNTIME) -public @interface SQLDeleteAll { - /** - * Procedure name or SQL {@code DELETE} statement. - */ - String sql(); - - /** - * Is the statement callable (aka a {@link java.sql.CallableStatement})? - */ - boolean callable() default false; - - /** - * An {@link Expectation} class used to verify that the operation was successful. - * - * @see Expectation.None - * @see Expectation.RowCount - * @see Expectation.OutParameter - */ - Class verify() default Expectation.class; - - /** - * A {@link ResultCheckStyle} used to verify that the operation was successful. - * - * @deprecated use {@link #verify()} with an {@link Expectation} class - */ - @Deprecated(since = "6.5") - ResultCheckStyle check() default ResultCheckStyle.NONE; - - /** - * The name of the table affected. Never required. - * - * @return the name of the secondary table - * - * @since 6.2 - */ - String table() default ""; -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import org.hibernate.jdbc.Expectation; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Specifies a custom SQL DML statement to be used in place of the default SQL generated by + * Hibernate when an entire collection is deleted from the database. + * + * @author László Benke + */ +@Target({TYPE, FIELD, METHOD}) +@Retention(RUNTIME) +public @interface SQLDeleteAll { + /** + * Procedure name or SQL {@code DELETE} statement. + */ + String sql(); + + /** + * Is the statement callable (aka a {@link java.sql.CallableStatement})? + */ + boolean callable() default false; + + /** + * An {@link Expectation} class used to verify that the operation was successful. + * + * @see Expectation.None + * @see Expectation.RowCount + * @see Expectation.OutParameter + */ + Class verify() default Expectation.class; + + /** + * A {@link ResultCheckStyle} used to verify that the operation was successful. + * + * @deprecated use {@link #verify()} with an {@link Expectation} class + */ + @Deprecated(since = "6.5") + ResultCheckStyle check() default ResultCheckStyle.NONE; + + /** + * The name of the table affected. Never required. + * + * @return the name of the secondary table + * + * @since 6.2 + */ + String table() default ""; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeletes.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeletes.java index f684d1c0ac64..2ed3a2c4fe75 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeletes.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeletes.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java index 9518ebbe96d5..33af60e69b5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInserts.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInserts.java index fed708d4c5c5..0324ba2941b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInserts.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInserts.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLJoinTableRestriction.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLJoinTableRestriction.java index 2175788e4cab..e2de4f2a81e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLJoinTableRestriction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLJoinTableRestriction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLOrder.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLOrder.java index 0f533f47aa6c..ccf1e088a80b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLOrder.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLRestriction.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLRestriction.java index 0fcd90a0550d..dbf003fc7519 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLRestriction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLRestriction.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLSelect.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLSelect.java index 77e8927fe5fa..6ed1d13b41f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLSelect.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLSelect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java index 1e35d8767ca1..dc7a74c95e4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdates.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdates.java index 97bceb819eee..6372c74d1e18 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdates.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdates.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRow.java b/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRow.java index b8319e8ba7af..2469696fbc74 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRow.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRow.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRows.java b/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRows.java index a98a29d3ceac..9b51932b1788 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRows.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SecondaryRows.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java index 0c6b9e76dce1..ce4358fe29ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java index fa3c651f36ed..1137e8c1a0fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SortComparator.java b/hibernate-core/src/main/java/org/hibernate/annotations/SortComparator.java index a2d2817a27d5..dad8143a584d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SortComparator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SortComparator.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SortNatural.java b/hibernate-core/src/main/java/org/hibernate/annotations/SortNatural.java index 42295d5f4e68..0f52e93e72b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SortNatural.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SortNatural.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java index 8375db387f4f..6ba19a8c8fcc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java b/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java index 80f2b6a7b567..26fdbb91d728 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; @@ -29,7 +27,7 @@ public enum SourceType { /** * Indicates that values are generated by the database. *

    - * For a generated timestamp, the {@code current_timestamp} function + * For a generated timestamp, the {@code current_timestamp} function * might be the source. */ DB diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SqlFragmentAlias.java b/hibernate-core/src/main/java/org/hibernate/annotations/SqlFragmentAlias.java index 16bdf23a1feb..6ecef27f5be7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SqlFragmentAlias.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SqlFragmentAlias.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Struct.java b/hibernate-core/src/main/java/org/hibernate/annotations/Struct.java index de3fab5efe35..8d5644dd8a37 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Struct.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Struct.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java b/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java index 7ce3bba19971..2f298c326afb 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java @@ -1,32 +1,30 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Maps an immutable and read-only entity to a given SQL {@code select} expression. - *

    - * This is an alternative to defining a database view and mapping the entity to - * the view using the {@link jakarta.persistence.Table @Table} annotation. - * - * @see Synchronize - * - * @author Sharath Reddy - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface Subselect { - /** - * The query. - */ - String value(); -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Maps an immutable and read-only entity to a given SQL {@code select} expression. + *

    + * This is an alternative to defining a database view and mapping the entity to + * the view using the {@link jakarta.persistence.Table @Table} annotation. + * + * @see Synchronize + * + * @author Sharath Reddy + */ +@Target(TYPE) +@Retention(RUNTIME) +public @interface Subselect { + /** + * The query. + */ + String value(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java b/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java index cc77cd9bde9e..bfbf114687ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java @@ -1,64 +1,62 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Specifies a table or tables that hold state mapped by the annotated - * entity or collection. - *

    - * If Hibernate is not aware that a certain table holds state mapped - * by an entity class or collection, then modifications might not be - * {@linkplain org.hibernate.FlushMode#AUTO automatically synchronized} - * with the database before a query is executed against that table, and - * the query might return stale data. - *

    - * Ordinarily, Hibernate knows the tables containing the state of an - * entity or collection. This annotation might be necessary if: - *

      - *
    • an entity or collection maps a database view, - *
    • an entity or collection is persisted using handwritten SQL, - * that is, using {@link SQLSelect @SQLSelect} and friends, or - *
    • an entity is mapped using {@link Subselect @Subselect}. - *
    - *

    - * By default, the table names specified by this annotation are interpreted - * as {@linkplain org.hibernate.boot.model.naming.PhysicalNamingStrategy - * logical names}, and are processed by - * {@link org.hibernate.boot.model.naming.PhysicalNamingStrategy#toPhysicalTableName}. - * But if {@link #logical logical=false}, the table names will be treated - * as physical names, and will not be processed by the naming strategy. - * - * @author Sharath Reddy - * - * @see org.hibernate.query.SynchronizeableQuery - */ -@Target({TYPE, FIELD, METHOD}) -@Retention(RUNTIME) -public @interface Synchronize { - /** - * Names of tables that hold state mapped by the annotated entity. - * Updates to these tables must be flushed to the database before - * execution of any query which refers to the annotated entity. - */ - String[] value(); - - /** - * Specifies whether the table names given by {@link #value} - * should be interpreted as logical or physical names. - * - * @return {@code true} if they are logical names - */ - boolean logical() default true; -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Specifies a table or tables that hold state mapped by the annotated + * entity or collection. + *

    + * If Hibernate is not aware that a certain table holds state mapped + * by an entity class or collection, then modifications might not be + * {@linkplain org.hibernate.FlushMode#AUTO automatically synchronized} + * with the database before a query is executed against that table, and + * the query might return stale data. + *

    + * Ordinarily, Hibernate knows the tables containing the state of an + * entity or collection. This annotation might be necessary if: + *

      + *
    • an entity or collection maps a database view, + *
    • an entity or collection is persisted using handwritten SQL, + * that is, using {@link SQLSelect @SQLSelect} and friends, or + *
    • an entity is mapped using {@link Subselect @Subselect}. + *
    + *

    + * By default, the table names specified by this annotation are interpreted + * as {@linkplain org.hibernate.boot.model.naming.PhysicalNamingStrategy + * logical names}, and are processed by + * {@link org.hibernate.boot.model.naming.PhysicalNamingStrategy#toPhysicalTableName}. + * But if {@link #logical logical=false}, the table names will be treated + * as physical names, and will not be processed by the naming strategy. + * + * @author Sharath Reddy + * + * @see org.hibernate.query.SynchronizeableQuery + */ +@Target({TYPE, FIELD, METHOD}) +@Retention(RUNTIME) +public @interface Synchronize { + /** + * Names of tables that hold state mapped by the annotated entity. + * Updates to these tables must be flushed to the database before + * execution of any query which refers to the annotated entity. + */ + String[] value(); + + /** + * Specifies whether the table names given by {@link #value} + * should be interpreted as logical or physical names. + * + * @return {@code true} if they are logical names + */ + boolean logical() default true; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Target.java b/hibernate-core/src/main/java/org/hibernate/annotations/Target.java index 4c120eca8391..f3cddd8b1493 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Target.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Target.java @@ -1,34 +1,32 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Explicitly specifies the target entity type in an association, - * avoiding reflection and generics resolution. This annotation is - * almost never useful. - * - * @author Emmanuel Bernard - * - * @deprecated use annotation members of JPA association mapping - * annotations, for example, - * {@link jakarta.persistence.OneToMany#targetEntity()} - */ -@Deprecated(since = "6.2") -@java.lang.annotation.Target({FIELD, METHOD}) -@Retention(RUNTIME) -public @interface Target { - /** - * The target entity type. - */ - Class value(); -} +/* + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Explicitly specifies the target entity type in an association, + * avoiding reflection and generics resolution. This annotation is + * almost never useful. + * + * @author Emmanuel Bernard + * + * @deprecated use annotation members of JPA association mapping + * annotations, for example, + * {@link jakarta.persistence.OneToMany#targetEntity()} + */ +@Deprecated(since = "6.2") +@java.lang.annotation.Target({FIELD, METHOD}) +@Retention(RUNTIME) +public @interface Target { + /** + * The target entity type. + */ + Class value(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TenantId.java b/hibernate-core/src/main/java/org/hibernate/annotations/TenantId.java index 98b01dc003f7..abaded6ff72d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TenantId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TenantId.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneColumn.java b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneColumn.java index 343d1f61f904..41050a23632c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneColumn.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorage.java b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorage.java index 8b9e886a13e1..a8fb7dbeda21 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorage.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorage.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorageType.java b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorageType.java index f601ad4272e5..d62e79295f3e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorageType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorageType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java index 294e4ec79a18..cc3e28dc057a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TypeBinderType.java b/hibernate-core/src/main/java/org/hibernate/annotations/TypeBinderType.java index 807f3454c5e0..12a5369da3aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TypeBinderType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TypeBinderType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java index cbf8b0800ca7..469e51de5b1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistration.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistrations.java b/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistrations.java index f51329ca67f5..7c9616373ca2 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistrations.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TypeRegistrations.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/UpdateTimestamp.java b/hibernate-core/src/main/java/org/hibernate/annotations/UpdateTimestamp.java index 175b20ba40dd..e3cce198fdca 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/UpdateTimestamp.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/UpdateTimestamp.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java b/hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java index 2a895373e7e3..25d73166fd09 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/UuidGenerator.java @@ -1,13 +1,10 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.UUID; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java b/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java index fba19644846c..d10efa195ac8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/View.java b/hibernate-core/src/main/java/org/hibernate/annotations/View.java index 8f6495a1b316..2f6665c31d0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/View.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/View.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/CheckHQL.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/CheckHQL.java index 153b81fcc840..5d357f92886d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/CheckHQL.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/CheckHQL.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Exclude.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Exclude.java index d295c47c5f9e..87816b8d89d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Exclude.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Exclude.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java index 83a0dfab372a..9cf80e8a6a4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/GenericDialect.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/GenericDialect.java index 33ef25b5fda2..f1e661b2cf83 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/GenericDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/GenericDialect.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java index 1d2d564020dd..112f215c9511 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Pattern.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Pattern.java index e9f45e83dec0..f3a9ab42c3a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Pattern.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Pattern.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/SQL.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/SQL.java index 9dcf0e4ab85f..fef9caaff79f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/SQL.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/SQL.java @@ -1,8 +1,6 @@ /* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * SPDX-License-Identifier: LGPL-2.1-or-later + * Copyright Red Hat Inc. and Hibernate Authors */ package org.hibernate.annotations.processing; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java index 7e6fe20291d0..2ee6eaacfb69 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java @@ -72,7 +72,7 @@ * } * *

    - * The Metamodel Generator produces this implementation when + * The Metamodel Generator produces this implementation when * the interface is compiled: * 

      * package org.example;
@@ -86,13 +86,13 @@
  * import org.hibernate.StatelessSession;
  * import org.hibernate.query.Order;
  *
- * @Dependent 
- * @StaticMetamodel(BookRepository.class) 
+ * @Dependent
+ * @StaticMetamodel(BookRepository.class)
  * @Generated("org.hibernate.processor.HibernateProcessor")
  * public class BookRepository_ implements BookRepository {
  *
  *
- *    @Override 
+ *    @Override
  *    public List<Book> booksByTitle(String title, Order<Book> order) {
  *         return session.createQuery(BOOKS_BY_TITLE_String, Book.class)
  *                 .setParameter("title", title)
@@ -100,14 +100,14 @@
  *                 .getResultList();
  *    }
  *
- *    @Override 
+ *    @Override
  *    public Book bookByIsbn(@Nonnull String isbn) {
  *         return session.get(Book.class, isbn);
  *    }
  *
  *     private final @Nonnull StatelessSession session;
  *
- *    @Inject 
+ *    @Inject
  *    public BookRepository_(@Nonnull StatelessSession session) {
  *         this.session = session;
  *    }
@@ -116,7 +116,7 @@
  *         return session;
  *    }
  *
- *    @Override 
+ *    @Override
  *    public List<Book> booksByPublisher(long publisher$id) {
  *         var builder = session.getFactory().getCriteriaBuilder();
  *         var query = builder.createQuery(Book.class);
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/AttributeBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/AttributeBinder.java
index e36758b9f0ba..81565de5e104 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/AttributeBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/AttributeBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/TypeBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/TypeBinder.java
index 4e62a1dd45cd..c5b7d5f99803 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/TypeBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/TypeBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/AttributeAccessorBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/AttributeAccessorBinder.java
index fd503550861c..7c7eef7d5448 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/AttributeAccessorBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/AttributeAccessorBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/BatchSizeBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/BatchSizeBinder.java
index 59812c0a261e..effc48fd46fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/BatchSizeBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/BatchSizeBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/CollateBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/CollateBinder.java
index b1a43d57caff..8b4b6ccc027b 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/CollateBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/CollateBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java
index bafe20609a14..a426eb2f8c8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentsBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentsBinder.java
index 98c855282a2b..f85910a966af 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentsBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/CommentsBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/DiscriminatorOptionsBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/DiscriminatorOptionsBinder.java
index a9f941d67180..f837b46ea69e 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/DiscriminatorOptionsBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/DiscriminatorOptionsBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java b/hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java
index 8d3b49d56f4d..04ca27773d64 100644
--- a/hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.binder.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
index 102b6af69692..b5f414bf3d4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/CacheRegionDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/CacheRegionDefinition.java
index 9cad2d20bb0e..90c348a04656 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/CacheRegionDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/CacheRegionDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/InvalidMappingException.java b/hibernate-core/src/main/java/org/hibernate/boot/InvalidMappingException.java
index cf8a5cbf9120..45f274c2337b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/InvalidMappingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/InvalidMappingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MappingException.java b/hibernate-core/src/main/java/org/hibernate/boot/MappingException.java
index 0b62016cca32..9c0ebaaad103 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MappingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MappingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MappingNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/boot/MappingNotFoundException.java
index 6d2d8c2b70af..bf04961dcf9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MappingNotFoundException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MappingNotFoundException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java
index 6ec3f2bb90cb..d7a21a773efd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
index 31537259b992..5a58812d24c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
index 0206f3e1f668..916ef20c4e6f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/ResourceLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/ResourceLocator.java
index 539b545b0d43..5eff64ca2927 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/ResourceLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/ResourceLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/ResourceStreamLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/ResourceStreamLocator.java
index 222987977e0f..5235dc6c4e30 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/ResourceStreamLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/ResourceStreamLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
index 28fc0a1a27b3..59b36e7a6b2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
index 03d6c004493b..55af40146ea5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/TempTableDdlTransactionHandling.java b/hibernate-core/src/main/java/org/hibernate/boot/TempTableDdlTransactionHandling.java
index b4f762974568..ff6263a7c241 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/TempTableDdlTransactionHandling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/TempTableDdlTransactionHandling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/UnsupportedOrmXsdVersionException.java b/hibernate-core/src/main/java/org/hibernate/boot/UnsupportedOrmXsdVersionException.java
index 8f852329e103..e7fc5ae979d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/UnsupportedOrmXsdVersionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/UnsupportedOrmXsdVersionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
index 11454fdb3bf6..4887db713889 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ByteArrayInputStreamAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ByteArrayInputStreamAccess.java
index 627792d2b363..c76dd32adeb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ByteArrayInputStreamAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ByteArrayInputStreamAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ExplodedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ExplodedArchiveDescriptor.java
index bfdbd02e140a..1baa5a7b2538 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ExplodedArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ExplodedArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/FileInputStreamAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/FileInputStreamAccess.java
index 103709343923..6644b925fa18 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/FileInputStreamAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/FileInputStreamAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java
index f1af4308787d..04afec1549be 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java
index a0da59880f76..4c0613b8c713 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarProtocolArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarProtocolArchiveDescriptor.java
index 258a92a2c6e7..87919b27662a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarProtocolArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarProtocolArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
index 05be013ef714..a3f1095e46a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/StandardArchiveDescriptorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/UrlInputStreamAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/UrlInputStreamAccess.java
index 28e6df6a0cbc..3bc7bf9a2f48 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/UrlInputStreamAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/UrlInputStreamAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ClassDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ClassDescriptorImpl.java
index 5198e37eeb09..84da5d466871 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ClassDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ClassDescriptorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java
index 994a49dd3dbe..8faa3e795ea2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java
@@ -1,16 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
 import java.util.Collections;
 
-import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
-import org.hibernate.boot.archive.scan.spi.MappingFileDescriptor;
-import org.hibernate.boot.archive.scan.spi.PackageDescriptor;
 import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.scan.spi.ScanParameters;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/MappingFileDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/MappingFileDescriptorImpl.java
index c532d3a07b4f..1b14896f0003 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/MappingFileDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/MappingFileDescriptorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/NoopEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/NoopEntryHandler.java
index a157c926505d..968403f99f3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/NoopEntryHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/NoopEntryHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/PackageDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/PackageDescriptorImpl.java
index 2424d6880e60..905ce2a82b6f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/PackageDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/PackageDescriptorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
index 3eb8f10de3ca..5770e746b53d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultImpl.java
index 1bfef896ceac..0eac9dedda23 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanOptions.java
index cc76c6d7ffc8..946bc2cae8ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanParameters.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanParameters.java
index f4475bf9c1c6..6d2df6b958e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanParameters.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanParameters.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanner.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanner.java
index 8c9ab5026903..66f150864620 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanner.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/StandardScanner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
index 3874eadc5082..4327ccc1ff9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassDescriptor.java
index d153ac07d8f8..55afa98a8b5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java
index 561c0f8f6424..26e7ef2e5df1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/MappingFileDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/MappingFileDescriptor.java
index 2471255a302f..c2370bb7a003 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/MappingFileDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/MappingFileDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/NonClassFileArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/NonClassFileArchiveEntryHandler.java
index fc9fb8db891e..1f4bccd809c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/NonClassFileArchiveEntryHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/NonClassFileArchiveEntryHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageDescriptor.java
index 80ee2b42f5d8..0716b80f1e44 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageInfoArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageInfoArchiveEntryHandler.java
index 18140dab75fb..c1f3dd2defa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageInfoArchiveEntryHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/PackageInfoArchiveEntryHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanEnvironment.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanEnvironment.java
index 5ac798c0a3d5..fae50bbb7d22 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanEnvironment.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanEnvironment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java
index 4a0f92cbc8bf..c1e11f2061e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanParameters.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanParameters.java
index ac07a80a24bc..4f00eb469092 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanParameters.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanParameters.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanResult.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanResult.java
index 36ef2302ff7a..5cf760ede4ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/Scanner.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/Scanner.java
index 807e9d23c347..3defcd7aea3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/Scanner.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/Scanner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.scan.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptor.java
index b95d5f386a5d..30527e86913e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptorFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptorFactory.java
index 63f2e1e6ee5e..763fbead7b3f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/AbstractArchiveDescriptorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveContext.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveContext.java
index 1c8ffe3d5144..fb624c9cc032 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java
index 70e3d24b264c..d2fd43ed901a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptorFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptorFactory.java
index 48d239fb69b3..85ae8a3a3020 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntry.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntry.java
index e99531ccad4b..36e0e2fd10e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntryHandler.java
index ba0f5c9c3b6a..3dd91944545d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntryHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveEntryHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveException.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveException.java
index 6a30a69df809..9bf32b2a0196 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/InputStreamAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/InputStreamAccess.java
index 8e87c72ffa7c..71d7ac8e47eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/InputStreamAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/InputStreamAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/JarFileEntryUrlAdjuster.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/JarFileEntryUrlAdjuster.java
index 9f27cb64a041..d949993860a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/JarFileEntryUrlAdjuster.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/JarFileEntryUrlAdjuster.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.archive.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java
index 995d035a31a9..bdac48c0cd24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
index df6c4457299d..45d9ea481284 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java
index 731684bd4887..25623c3c14c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java
index ae3f338e1c67..29b967f8f6e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java
index 09d86ab2c04b..2315c99b2925 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java
index 3c81a2d19e37..aebe29146eb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
@@ -28,7 +26,7 @@
  * Use Hibernate metadata to ignore cascade on entities.
  * Cascade on embeddable objects or collection of embeddable objects are accepted
  * Also use Hibernate's native {@link Hibernate#isInitialized} method call.
- * 
+ *
  * @author Emmanuel Bernard
  */
 public class HibernateTraversableResolver implements TraversableResolver {
@@ -36,7 +34,7 @@ public class HibernateTraversableResolver implements TraversableResolver {
 
 	public HibernateTraversableResolver(
 			EntityPersister persister,
-			ConcurrentHashMap> associationsPerEntityPersister, 
+			ConcurrentHashMap> associationsPerEntityPersister,
 			SessionFactoryImplementor factory) {
 		associations = associationsPerEntityPersister.get( persister );
 		if ( associations == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java
index 6711dbf300fa..70ce69a01a53 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
index d5a831a3d1c3..eef69376337b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java
index dddfcef461d0..7bc8d3988e8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.beanvalidation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceImpl.java
index 6baea079aa65..07639d1deccb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceInitiator.java
index 96fb975cdb0e..d61107eadf50 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/CfgXmlAccessServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
index b3343d9e221b..8a5af2a23d65 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
index a2982358c928..f06bf31aefb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/CfgXmlAccessService.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/CfgXmlAccessService.java
index 13059d933425..1e13a7c435b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/CfgXmlAccessService.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/CfgXmlAccessService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
index a94ce8a75413..8958711c3ba3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java
index 41671ee54a76..f3e68af81750 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.cfgxml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/Abstract.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/Abstract.java
index d398c4de92bf..10a9e37f5ad3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/Abstract.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/Abstract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/AnyKeyType.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/AnyKeyType.java
index 36c42b2cbdcb..6dd79a1b7bd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/AnyKeyType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/AnyKeyType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
index 103656b13364..b76a8f1da32b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
index 0234da61935b..91bebb4ec46b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java
index c0bc413a2470..e07273569198 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/CollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/CollectionClassification.java
index 4ba3fd39d81d..56048c823672 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/CollectionClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/CollectionClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java
index 77d5f655b288..78abfb6f3715 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderInitiator.java
index ff29f3f2899c..ea1d056624b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderService.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderService.java
index e86c6cf0a366..1eab8c2db9f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderService.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultSessionFactoryBuilderService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/Extends.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/Extends.java
index 7e576d27ccb4..9ce019e1cf1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/Extends.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/Extends.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/FailedSecondPassException.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/FailedSecondPassException.java
index 62c3d17d85f5..4124b78be7a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/FailedSecondPassException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/FailedSecondPassException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ForeignKeyNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/ForeignKeyNameSource.java
index 6ac2d35d4325..5f41774c2ae9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ForeignKeyNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/ForeignKeyNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
index 6ffd69ac2061..5c701d5722d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
@@ -46,7 +44,6 @@
 import org.hibernate.boot.model.internal.AnnotatedClassType;
 import org.hibernate.boot.model.internal.CreateKeySecondPass;
 import org.hibernate.boot.model.internal.FkSecondPass;
-import org.hibernate.boot.model.internal.IdBagIdGeneratorResolverSecondPass;
 import org.hibernate.boot.model.internal.IdGeneratorResolver;
 import org.hibernate.boot.model.internal.ImplicitToOneJoinTableSecondPass;
 import org.hibernate.boot.model.internal.OptionalDeterminationSecondPass;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java
index 18bf938207e0..f5a655e7c6d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
index a17b9f33ab23..68c2adc558e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
index f38f7ef5b241..96a6fd1857cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
index 17f6594bc442..eae387206b8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java
index bb56ba73df60..932d1aad2bfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedNativeQueryDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedNativeQueryDefinitionImpl.java
index f996c3fb1873..cadaee08fc01 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedNativeQueryDefinitionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedNativeQueryDefinitionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.AbstractNamedQueryDefinition;
 import org.hibernate.boot.query.NamedNativeQueryDefinition;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -20,7 +17,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
index 21ab2aceab4c..8d8601a551b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/RootMappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/RootMappingDefaults.java
index ecd19b0aa762..64f0a0293050 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/RootMappingDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/RootMappingDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
index f5757bd3ca98..68f38f51261c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForNamedQueryValidation.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForNamedQueryValidation.java
index 330706529ef3..0ae788558d10 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForNamedQueryValidation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForNamedQueryValidation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForRegistration.java
index 1169e1d9dcc9..32ac643f2332 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForSchemaExport.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForSchemaExport.java
index f2dfde9c86c2..7c33e339c368 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForSchemaExport.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryObserverForSchemaExport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
index fbd6ab712c38..57aa2d76f454 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SimpleResourceLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SimpleResourceLocator.java
index 299c4d5b7c31..79fb861cd429 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SimpleResourceLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SimpleResourceLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardEntityNotFoundDelegate.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardEntityNotFoundDelegate.java
index be83fa4b2763..e102ff78e74d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardEntityNotFoundDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardEntityNotFoundDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardResourceLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardResourceLocator.java
index f3f938872960..3fa09f6418bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardResourceLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/StandardResourceLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
index e1c694ca8b63..1c23c3cf2171 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
index fd0b95217a89..39e6aaa3cd1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
index 49985e8b5397..f6e1427e077b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/SourceType.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/SourceType.java
index b738b184e786..73ce053374e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/SourceType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/SourceType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.jaxb;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/SharedCacheModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/SharedCacheModeMarshalling.java
index de0e4d748632..67f54bcd9d16 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/SharedCacheModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/SharedCacheModeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/TransactionTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/TransactionTypeMarshalling.java
index 9beb69e3a785..21febfada1c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/TransactionTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/TransactionTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/ValidationModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/ValidationModeMarshalling.java
index e33b1fc2ccb4..c981b48f5c94 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/ValidationModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/cfg/internal/ValidationModeMarshalling.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.cfg.internal;
 
 import org.hibernate.internal.util.StringHelper;
 
-import jakarta.persistence.SharedCacheMode;
 import jakarta.persistence.ValidationMode;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheAccessTypeConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheAccessTypeConverter.java
index 656ef230c7db..950da876ea25 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheAccessTypeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheAccessTypeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheModeConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheModeConverter.java
index aaa00c56ef76..daa87a76f6e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/CacheModeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ExecuteUpdateResultCheckStyleConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ExecuteUpdateResultCheckStyleConverter.java
index 8566bd03dfb0..a59341feaa0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ExecuteUpdateResultCheckStyleConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ExecuteUpdateResultCheckStyleConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/FlushModeConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/FlushModeConverter.java
index 25f94df3976f..89a2dfc827ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/FlushModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/FlushModeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/GenerationTimingConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/GenerationTimingConverter.java
index 546bc0801c5e..7fd333573ac3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/GenerationTimingConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/GenerationTimingConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ImplicitResultSetMappingDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ImplicitResultSetMappingDefinition.java
index e1dcac85246d..15987114add2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ImplicitResultSetMappingDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/ImplicitResultSetMappingDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/LockModeConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/LockModeConverter.java
index 558b4f55b5b7..c2515d3271fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/LockModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/LockModeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/OptimisticLockStyleConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/OptimisticLockStyleConverter.java
index 0baeba829d7c..689bb78649b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/OptimisticLockStyleConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/OptimisticLockStyleConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/RepresentationModeConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/RepresentationModeConverter.java
index f9bb962f14b3..6aaad86f626c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/RepresentationModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/internal/RepresentationModeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/AttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/AttributeMapping.java
index cd1280e7ef21..90a2c15a5d45 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/AttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/AttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ConfigParameterContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ConfigParameterContainer.java
index 6a6981b46d60..c2b162da38be 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ConfigParameterContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ConfigParameterContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/Discriminatable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/Discriminatable.java
index 9c1056e16317..47f7b38e7cbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/Discriminatable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/Discriminatable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
index 59cf08a576ed..711aeea5a26f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryNonScalarRootReturn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryNonScalarRootReturn.java
index 1d792523a662..7ce598ff5343 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryNonScalarRootReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryNonScalarRootReturn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryReturn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryReturn.java
index 94033382614d..14f4485872ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/NativeQueryReturn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
index ec75f630de28..8c61d64d2b2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoIdBagAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoIdBagAdapter.java
index 18d7a3947d40..8f2c49e24706 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoIdBagAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoIdBagAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoPrimitiveArrayAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoPrimitiveArrayAdapter.java
index 228e8c4f96e1..d3a06f7eefaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoPrimitiveArrayAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfoPrimitiveArrayAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingBindingDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingBindingDefinition.java
index ab1ce8d33b54..6ffa4c34c2bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingBindingDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingBindingDefinition.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
 import java.util.List;
 
-import org.hibernate.boot.query.HbmResultSetMappingDescriptor;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingContainer.java
index 7b68d0ee5e48..d276562b5fe7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ResultSetMappingContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SecondaryTableContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SecondaryTableContainer.java
index 4e306b6e1353..87bb3c3328e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SecondaryTableContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SecondaryTableContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SimpleValueTypeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SimpleValueTypeInfo.java
index 8952c187e13a..af7da6a568df 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SimpleValueTypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SimpleValueTypeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SingularAttributeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SingularAttributeInfo.java
index f71c81ed378c..03df4736e89d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SingularAttributeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SingularAttributeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
index 426db8849f88..a5175639142e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TableInformationContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TableInformationContainer.java
index 9b7e38e357e1..0b8be0ab3c28 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TableInformationContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TableInformationContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ToolingHintContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ToolingHintContainer.java
index fcddf88b0839..53e18f649d4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ToolingHintContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/ToolingHintContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TypeContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TypeContainer.java
index d35e82ff1479..47340750b062 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TypeContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TypeContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/BootModelPreprocessor.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/BootModelPreprocessor.java
index 3caaa16a5937..d79d54292056 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/BootModelPreprocessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/BootModelPreprocessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaSource.java
index a744bc7db75f..437fafc02d1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaTarget.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaTarget.java
index 2a494f5c45d5..5f1d2536c940 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnAndFormulaTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaults.java
index 5aaab351084a..04f1a66b2217 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsBasicImpl.java
index 78041c7056c7..b9172dcbceb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsInsertableNonUpdateableImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsInsertableNonUpdateableImpl.java
index 92d35fb81083..13896d08ef71 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsInsertableNonUpdateableImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsInsertableNonUpdateableImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsProperty.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsProperty.java
index a89fdafc9d84..b0a4ce3af99d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsProperty.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ColumnDefaultsProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ComponentTypeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ComponentTypeInfo.java
index de11390ceea5..1f7e71fcf71b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ComponentTypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ComponentTypeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/EntityTypeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/EntityTypeInfo.java
index bbdaa13856ca..766203085ef6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/EntityTypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/EntityTypeInfo.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
-import java.util.Map;
 
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmTransformationLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmTransformationLogging.java
index 456a75fc692b..57669ad33bf0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmTransformationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmTransformationLogging.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
 import org.hibernate.boot.BootLogging;
-import org.hibernate.boot.jaxb.JaxbLogger;
 
 import org.jboss.logging.Logger;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
index 614b19d332e6..0a6da850295b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
@@ -954,7 +952,7 @@ private static JaxbNamedHqlQueryImpl transformNamedQuery(JaxbHbmNamedQueryType h
 				queryParam.setType( hbmQueryParam.getType() );
 			}
 		}
-		
+
 		return query;
 	}
 
@@ -1074,7 +1072,7 @@ else if ( element instanceof JaxbHbmSynchronizeType hbmSynchronize ) {
 				}
 			}
 		}
-		
+
 		return query;
 	}
 
@@ -3249,7 +3247,7 @@ private void transferFetchable(
 			JaxbSingularAssociationAttribute fetchable) {
 		FetchType laziness = FetchType.LAZY;
 		JaxbSingularFetchModeImpl fetch = JaxbSingularFetchModeImpl.SELECT;
-		
+
 		if (hbmLazy != null) {
 			if (hbmLazy.equals( JaxbHbmLazyWithNoProxyEnum.FALSE )) {
 				laziness = FetchType.EAGER;
@@ -3258,7 +3256,7 @@ else if (hbmLazy.equals( JaxbHbmLazyWithNoProxyEnum.NO_PROXY )) {
 				// TODO: @LazyToOne(LazyToOneOption.PROXY) or @LazyToOne(LazyToOneOption.NO_PROXY)
 			}
 		}
-		
+
 		// allow fetch style to override laziness, if necessary
 		if (constrained != null && ! constrained) {
 			// NOTE SPECIAL CASE: one-to-one constrained=false cannot be proxied, so default to join and non-lazy
@@ -3279,11 +3277,11 @@ else if (hbmLazy.equals( JaxbHbmLazyWithNoProxyEnum.NO_PROXY )) {
 				}
 			}
 		}
-		
+
 		fetchable.setFetch( laziness );
 		fetchable.setFetchMode( fetch );
 	}
-	
+
 	// ToMany
 	private void transferFetchable(
 			JaxbHbmLazyWithExtraEnum hbmLazy,
@@ -3292,7 +3290,7 @@ private void transferFetchable(
 			JaxbPluralAttribute fetchable) {
 		FetchType laziness = FetchType.LAZY;
 		JaxbPluralFetchModeImpl fetch = JaxbPluralFetchModeImpl.SELECT;
-		
+
 		if (hbmLazy != null) {
 			if (hbmLazy.equals( JaxbHbmLazyWithExtraEnum.EXTRA )) {
 				throw new MappingException( "HBM transformation: extra lazy not yet supported.", origin() );
@@ -3301,7 +3299,7 @@ else if (hbmLazy.equals( JaxbHbmLazyWithExtraEnum.FALSE )) {
 				laziness = FetchType.EAGER;
 			}
 		}
-		
+
 		// allow fetch style to override laziness, if necessary
 		if (hbmFetch == null) {
 			if (hbmOuterJoin != null && hbmOuterJoin.equals( JaxbHbmOuterJoinEnum.TRUE ) ) {
@@ -3318,11 +3316,11 @@ else if (hbmFetch.equals( JaxbHbmFetchStyleWithSubselectEnum.SUBSELECT ) ) {
 				fetch = JaxbPluralFetchModeImpl.SUBSELECT;
 			}
 		}
-		
+
 		fetchable.setFetch( laziness );
 		fetchable.setFetchMode( fetch );
 	}
-	
+
 	// KeyManyToOne
 	private static FetchType convert(JaxbHbmLazyEnum hbmLazy) {
 		if ( hbmLazy != null && "false".equalsIgnoreCase( hbmLazy.value() ) ) {
@@ -3403,12 +3401,12 @@ private static JaxbCascadeTypeImpl convertCascadeType(String s) {
 		}
 		return cascadeType;
 	}
-	
+
 	private boolean isOrphanRemoval(String s) {
 		return isNotEmpty( s )
 				&& s.toLowerCase( Locale.ROOT ).contains( "orphan" );
 	}
-	
+
 	private String getFullyQualifiedClassName(String className) {
 		// todo : right now we do both, we set the package into the XML and qualify the names; pick one...
 		//		1) pass the names through as-is and set the package into the XML; the orm.xml reader
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ManagedTypeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ManagedTypeInfo.java
index c64789f82956..abe1d3cc2f0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ManagedTypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/ManagedTypeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/MappedSuperclassTypeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/MappedSuperclassTypeInfo.java
index 7587ff8957cc..f12e5df4c018 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/MappedSuperclassTypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/MappedSuperclassTypeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/PropertyInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/PropertyInfo.java
index c9999b464c8a..2956aaffad9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/PropertyInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/PropertyInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapter.java
index b21583fba71b..b1a857bf9117 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapterJaxbHbmColumnType.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapterJaxbHbmColumnType.java
index b1ab9ba67fce..ca9000a48561 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapterJaxbHbmColumnType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/SourceColumnAdapterJaxbHbmColumnType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java
index 0e0118a068d6..082c7be9a911 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java
index 7e450675a96a..f64acd84b1e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java
index c0f3982aaaec..f914eec9b285 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationException.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationException.java
index 7b7a8c7c327d..5ec985eb0aa1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationHelper.java
index 2aed8d94e308..b24e571c65fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationState.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationState.java
index fec7cabcbf4c..4070f7f16a17 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TransformationState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnknownEntityReferenceException.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnknownEntityReferenceException.java
index 175d62186a55..aafbe6ad7c63 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnknownEntityReferenceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnknownEntityReferenceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnsupportedFeatureHandling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnsupportedFeatureHandling.java
index b3bd29a5b348..144152f2a5ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnsupportedFeatureHandling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/UnsupportedFeatureHandling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
index ab7fdd2d8887..47db70ffb90d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.hbm.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
index 5b158e288c10..84d6292807a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
index 0cab1868464b..28e6d82ee418 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
@@ -147,7 +145,7 @@ public static void createSerFile(File xmlFile, File outputFile, Binder binder) {
 				outputFile
 		);
 	}
-	
+
 	private boolean isSerfileObsolete() {
 		return xmlFile.exists() && serFile.exists() && xmlFile.lastModified() > serFile.lastModified();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ConfigurationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ConfigurationBinder.java
index 5784b6864033..7331f354da24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ConfigurationBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ConfigurationBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
index c7b47db2bf65..6d7034a32741 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
index f4a03670b0b0..8f982b04f71e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
index 933ebe444b47..7077d03c5241 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
index 2bca618c9ba9..3cc8af333c01 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
index 80fe08b20d4e..0c09deef1566 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
index 2e8ad18ae782..d122274e85a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
index cd0f7fa4336a..4101c1f31b7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
index 9005eb193f29..bd5cdb6ce4d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
@@ -14,7 +12,6 @@
 import org.hibernate.boot.MappingException;
 import org.hibernate.boot.MappingNotFoundException;
 import org.hibernate.boot.jaxb.Origin;
-import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.spi.Binder;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.jaxb.spi.XmlSource;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
index 5506a58dfed5..ec477d72f579 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/AbstractEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/AbstractEventReader.java
index ca43ad51d08b..896e08e45738 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/AbstractEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/AbstractEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
index a0ea008281f3..02f2757e1224 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
index aaa38e908cd8..1145c9e21808 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/ConfigurationEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/ConfigurationEventReader.java
index a71b08cd6d7b..f0fe01a7df08 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/ConfigurationEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/ConfigurationEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
index f202a79a7cbd..5d81b6e1a824 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
index bc6468ce6c01..0062503c52d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
index 0259230e19ad..e1c94e203632 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
index 0332bb92bd2a..f15be3666a76 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
index fb72119c400c..9ea7c51ba36f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
index 28db1f078122..7f1c26802755 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
index 53e873702ca2..c302954e8106 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
index 1a4e6c4bfd48..25895afaf35f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/GenerationTiming.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/GenerationTiming.java
index 9707bf4a7113..707df1bba258 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/GenerationTiming.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/GenerationTiming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
index 2f11f1a84f12..2424ba1a5c73 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
index 37cb3e74051e..d731f75e44de 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.jaxb.mapping.internal;
 
 import org.hibernate.cache.spi.access.AccessType;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
index 21a2e1aaa5f4..1b4f96b15f69 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
-import java.util.Locale;
 
 import org.hibernate.CacheMode;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
index 15a6304c1d12..49fa85eb6f68 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
index 670a1b6f29d6..26f4f1fd7b62 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
index 15a904143778..ea12dd0e9588 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
index 84322b87f1aa..225623229b3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchModeMarshalling.java
index 5cda5a6ab04f..d59efe79d075 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchModeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
index 7c8c458fb9fd..daa14f5c18af 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
index 8fb41c14be85..8b132e01b1c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
index 9d10c092d33e..773f18c11381 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
index 85678a657dcb..dcf1dfe4514f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
index 9fa4cc55ccd7..c37ace56b864 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
index 3771c205829c..4a498769d3b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
-import java.util.Locale;
 
 import org.hibernate.boot.internal.LimitedCollectionClassification;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
index f526692404d7..ab39fd3eab8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/NotFoundActionMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/NotFoundActionMarshalling.java
index 12f79ad96540..6be83f0f9971 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/NotFoundActionMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/NotFoundActionMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
index 3e3dc6ae3862..8c27d8cd31e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
index b87cfb54b005..c8cf0081dcac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
-import java.util.Locale;
 
 import org.hibernate.engine.OptimisticLockStyle;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
index 283ea47852e9..baafafbea45e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
index c237afe3b9a6..6bf9e84a1429 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
index 8d310efe56fd..d2b174d63305 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
index 4e09daf85f46..942f533a27e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
index 7766e36c2e78..51100f8a10a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
index 149b7a20d2ab..3fed83ec4539 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
index 8f5687f790bc..64bc405e043b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
index 0e8555e899e6..ac977298f8cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
index 6fc7bab7a1ed..20cb799a5807 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCascadableAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCascadableAttribute.java
index b9cdd01d8de0..bdd01d81c48e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCascadableAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCascadableAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
index ba91542451b4..cff466adea27 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
index 78a441feda70..df4f2e611b07 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
index 334a9e2c9505..9f36169c8736 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
index 5ebcc07a284c..dc7c366e0baf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
index cd3bf989c7a0..127511cf5a74 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbJoinTableCapable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbJoinTableCapable.java
index c9e2fde308d0..58ad07c843de 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbJoinTableCapable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbJoinTableCapable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
index 3160d84f9060..7a30c0bb5ed3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
index 78137617f97d..27b47ecef294 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLockableAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLockableAttribute.java
index 9505f1764500..f768adeb4c74 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLockableAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLockableAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
index ab4e12227789..edd7d6df1128 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
index dcbc00e13f28..f156e508b7b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
index 8c89cb3516b3..90ddf276d19a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
index 2a2dbeda7479..3bcaf3ba5501 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
index 54e32783574b..20e52f6c026a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
index d74643cfa4f5..1c7e8893ea5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
index 9d8985d12678..e1487d320ad7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHint.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHint.java
index 92d97c9cbd4c..53261bd8e4db 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHint.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHintContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHintContainer.java
index 3b5a5c7d1968..d324221938cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHintContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbQueryHintContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
index 9249b6648168..c344036518ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAssociationAttribute.java
index a066b706f68e..254bfb98ce23 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAssociationAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAssociationAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAttribute.java
index 0f47727cb084..6127ca597a77 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSingularAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java
index 2ca98d8f0ad0..ce43f103ca37 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java
index 934cd4d269af..bb8187a7bad3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java
index 0efd46fb0a4f..c3ba436a94ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java
index 7c0d5ac2200c..36df656ddf39 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java
index c771ecdc50a0..65a67f6c427e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java
index e6b601d3dc22..c007947502f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java
index bcfbc81361d3..c5e678291122 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java
index 6ff7f42450a2..1269d6010d96 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java
index eeebfe684801..c9d2e9923dbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java
index 6317931fefb5..9c64c79c4c75 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java
index 87bce1fbf6cb..0477fd168681 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java
index 87cd8c6920f7..66cd5e8b6121 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java
index 26358ee7a35d..64b5326dac91 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java
index 0346f6f28556..43a6744e945c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java
index d141ee429cc9..6d080fe4c5d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java
index 9c3771b42be4..db204b99fe6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
index 6e27b12e852c..f73a0df1611b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
index c7b15bb30c62..82cd6f4f5853 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
index 969b2544a7a1..d729bdb8af03 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
index 8d81fcf2b5b1..b2d3f19f78d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/Caching.java b/hibernate-core/src/main/java/org/hibernate/boot/model/Caching.java
index f5529a7372c0..691b80327e0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/Caching.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/Caching.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java b/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
index afcb088811fa..79686716b872 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributions.java b/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributions.java
index eed3ebd79be1..2edec01d0d78 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributor.java
index 11ec12af0547..95df6a2a9aa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/FunctionContributor.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.model;
 
 import org.hibernate.service.JavaServiceLoadable;
@@ -52,8 +42,8 @@ public interface FunctionContributor {
 	 * The range 0-500 is reserved for Hibernate, range 500-1000 for libraries and
 	 * 1000-Integer.MAX_VALUE for user-defined FunctionContributors.
 	 * 
    
-	 * Contributions from higher precedence contributors (higher numbers) effectively override 
-	 * contributions from lower precedence.  E.g. if a contributor with precedence 1000 contributes a 
+	 * Contributions from higher precedence contributors (higher numbers) effectively override
+	 * contributions from lower precedence.  E.g. if a contributor with precedence 1000 contributes a
 	 * function named {@code "max"}, that will override Hibernate's standard function of that name.
 	 *
 	 * @return the ordinal for this FunctionContributor
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/IdentifierGeneratorDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/IdentifierGeneratorDefinition.java
index dba739f61390..f37dbe1a1916 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/IdentifierGeneratorDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/IdentifierGeneratorDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/JavaTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/JavaTypeDescriptor.java
index 8efeda670456..d871bafa717e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/JavaTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/JavaTypeDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/NamedEntityGraphDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/NamedEntityGraphDefinition.java
index d87dd9ebb4a1..e88bdd54b6e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/NamedEntityGraphDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/NamedEntityGraphDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TruthValue.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TruthValue.java
index bf16b90b4a2e..d244d5c0adc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TruthValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TruthValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java
index c94accb4bf3a..ffabe3fca571 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributions.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributions.java
index 4e12ec503c0d..5acf3bd80df4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
index 8f2176812d9e..5bf09da72900 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
index 5260d2b1e29d..918a30421028 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistry.java
index f3da7ffebe44..416043362a3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
index 9261f9467ae2..0c04bcd00253 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
index 401c9ac19d3e..8012a822206f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
index b607e62fa3af..7a727946a393 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorBypassedImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorBypassedImpl.java
index 52d59433e787..976baa93eeac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorBypassedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorBypassedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
index 6dd5ee3ed033..3fcf5df3ff5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
index 4dbcdc6890ac..d5da7294f560 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
index babf6c6b8bb7..e4093de3796d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
index f5f971bfeaec..989a619b3d34 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/AutoApplicableConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/AutoApplicableConverterDescriptor.java
index 2b15e7df801a..bec878748685 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/AutoApplicableConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/AutoApplicableConverterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Contract for handling auto-apply checks for JPA AttributeConverters
- * 
+ *
  * @author Steve Ebersole
  */
 public interface AutoApplicableConverterDescriptor {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterAutoApplyHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterAutoApplyHandler.java
index e3f034f4bc2f..aafda236c2f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterAutoApplyHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterAutoApplyHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
index 48e9b3a6a8f4..baf702c9c1a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterRegistry.java
index 242bba0e8dd2..77ea65fd7afd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/JpaAttributeConverterCreationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/JpaAttributeConverterCreationContext.java
index 191c89dd9f63..d697b06a1c5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/JpaAttributeConverterCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/JpaAttributeConverterCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
index f352d761425a..c97e34011c5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.convert.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
index 06ce1c58b93c..129b47af92b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentBinder.java
index 4b47055e4674..10bd5e15a2b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -20,11 +18,8 @@
 import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Component;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Value;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.java.spi.EmbeddableAggregateJavaType;
 import org.hibernate.type.spi.TypeConfiguration;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentSecondPass.java
index 56395ccbca44..58a76561788b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedClassType.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedClassType.java
index bcab08619150..c5e0fdc65528 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedClassType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedClassType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
index 9baff8525341..e8c7813f2acb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
index 476eef6251eb..ac3582bcbdc5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedDiscriminatorColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedDiscriminatorColumn.java
index 3a722860c028..26f19d8c2c96 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedDiscriminatorColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedDiscriminatorColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
index e5dc8fbe199a..196b5e6a1ab4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
index 3d09e462bb71..48621739cc03 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
index 1861eb0729b6..158fa3f646c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
index 0b39af21e8c4..4e5af9b74c0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
index 70d3660b52b3..d9c4e07e1109 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ArrayBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ArrayBinder.java
index faefe9ff0faf..6215c5a32f64 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ArrayBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ArrayBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java
index 9c585bd0e9d3..a3b58ef35bf0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BagBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BagBinder.java
index 689ffb86eb17..f0f9f7f1b3cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BagBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BagBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
index 028a8f150ed1..a159d066177c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
index cd892f39bfd8..da05f57676eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CannotForceNonNullableException.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CannotForceNonNullableException.java
index 6f6853824435..decb0d9350e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CannotForceNonNullableException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CannotForceNonNullableException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassLoaderAccessLazyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassLoaderAccessLazyImpl.java
index 3f690d803d07..9bb7ed098842 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassLoaderAccessLazyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassLoaderAccessLazyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
index 9abb4ea005d8..0e692d6f5c91 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
index eba15ceee24c..220b3bb8870c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java
index d2d8ef50f0a9..1aa15b811668 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java
index c0971478ec16..185c2384550e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
index d7c31a92ec80..66680b100bae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
index 2a5ad1eeef83..2b6de2988088 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CopyIdentifierComponentSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CopyIdentifierComponentSecondPass.java
index 5bcd23e93475..00a34adb2640 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CopyIdentifierComponentSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CopyIdentifierComponentSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CreateKeySecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CreateKeySecondPass.java
index 168dee022fa6..0e370f0f1d12 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CreateKeySecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CreateKeySecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DelayedParameterizedTypeBean.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DelayedParameterizedTypeBean.java
index 22a5b2b10189..dc791b0b7744 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DelayedParameterizedTypeBean.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DelayedParameterizedTypeBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java
index 0ec9b22da586..18675c99af66 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -15,7 +13,6 @@
 import org.hibernate.annotations.DialectOverride;
 import org.hibernate.boot.models.annotations.spi.DialectOverrider;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.models.spi.AnnotationTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
index 7841ff1f513f..04064c112e35 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
index 6916eb10526b..54ad0312b964 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -1855,8 +1853,8 @@ public void bindTable(
 	}
 
 	public void finalSecondaryTableBinding(PropertyHolder propertyHolder) {
-		 // This operation has to be done after the id definition of the persistence class.
-		 // ie after the properties parsing
+		// This operation has to be done after the id definition of the persistence class.
+		// ie after the properties parsing
 		final Iterator joinColumns = secondaryTableJoins.values().iterator();
 		for ( Map.Entry entrySet : secondaryTables.entrySet() ) {
 			if ( !secondaryTablesFromAnnotation.containsKey( entrySet.getKey() ) ) {
@@ -1866,8 +1864,8 @@ public void finalSecondaryTableBinding(PropertyHolder propertyHolder) {
 	}
 
 	public void finalSecondaryTableFromAnnotationBinding(PropertyHolder propertyHolder) {
-		 // This operation has to be done before the end of the FK second pass processing in order
-		 // to find the join columns belonging to secondary tables
+		// This operation has to be done before the end of the FK second pass processing in order
+		// to find the join columns belonging to secondary tables
 		Iterator joinColumns = secondaryTableFromAnnotationJoins.values().iterator();
 		for ( Map.Entry entrySet : secondaryTables.entrySet() ) {
 			if ( secondaryTablesFromAnnotation.containsKey( entrySet.getKey() ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchOverrideSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchOverrideSecondPass.java
index 45e62606e466..30da81a50aac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchOverrideSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchOverrideSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchSecondPass.java
index 478a3be6f24a..b14ea6ea1eb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FetchSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java
index b241d83b7a34..93c27d9504a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FkSecondPass.java
index a81e7a5cf175..e08c3d8e947b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FkSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FkSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ForeignKeyType.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ForeignKeyType.java
index 658be5ecf267..adc32f1dbff1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ForeignKeyType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ForeignKeyType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
index 16bde81500f6..f0c1d9ec44ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
index cdfdfc2ea245..25045913cb04 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
index 59565f0f958f..1b5c3dfa3d50 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -11,7 +9,6 @@
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.Internal;
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
-import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
@@ -19,7 +16,6 @@
 import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.id.Configurable;
-import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.OptimizableGenerator;
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.id.enhanced.LegacyNamingStrategy;
@@ -33,8 +29,6 @@
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 import java.util.Map;
 import java.util.Properties;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorStrategies.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorStrategies.java
index a52e2293b097..0039807a4015 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorStrategies.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorStrategies.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagBinder.java
index 23ac0b7e0d5c..8936f3961700 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagIdGeneratorResolverSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagIdGeneratorResolverSecondPass.java
index 972e994ec06a..db83c3fa3842 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagIdGeneratorResolverSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdBagIdGeneratorResolverSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolver.java
index a9c21e75133d..d8ad65457134 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolverSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolverSecondPass.java
index d0ec2d9b1d0e..2bee2dde317a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolverSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolverSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ImplicitToOneJoinTableSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ImplicitToOneJoinTableSecondPass.java
index 8e58094ee74f..e79cb6e8fb5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ImplicitToOneJoinTableSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ImplicitToOneJoinTableSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
index f5c253f579e9..affe2acd858b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
index 14988d690f26..a0334fe91436 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
index b486576a3f2a..d9830b5a8652 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/JoinedSubclassFkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/JoinedSubclassFkSecondPass.java
index a059393fe8ec..85492bf61d20 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/JoinedSubclassFkSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/JoinedSubclassFkSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ListBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ListBinder.java
index 4e6368457560..b89476b6ee00 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ListBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ListBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapBinder.java
index 861a159eefc9..67a4614378ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
index 10a1efb0bc41..43993d6a583e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Nullability.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Nullability.java
index db3be47b018f..d455530dd676 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Nullability.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Nullability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NullableDiscriminatorColumnSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NullableDiscriminatorColumnSecondPass.java
index ef2302167890..6b541af60861 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NullableDiscriminatorColumnSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NullableDiscriminatorColumnSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java
index 95f641a50cc3..e328b4a5c4d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -22,7 +20,7 @@ public interface ObjectNameSource {
 	/**
 	 * Retrieve the logical name for this object.  Usually this is the name under which
 	 * the "thing" is registered.
-	 * 
+	 *
 	 * @return The logical name.
 	 */
 	String getLogicalName();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java
index a038eee9a433..bcdd4cd949ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -20,7 +18,6 @@
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.DependantValue;
 import org.hibernate.mapping.Join;
-import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.ManyToOne;
 import org.hibernate.mapping.OneToOne;
 import org.hibernate.mapping.PersistentClass;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OptionalDeterminationSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OptionalDeterminationSecondPass.java
index 393f8544bfdb..332a885d0e55 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OptionalDeterminationSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/OptionalDeterminationSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PkDrivenByDefaultMapsIdSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PkDrivenByDefaultMapsIdSecondPass.java
index 8783cc6de68c..c219b0204c3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PkDrivenByDefaultMapsIdSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PkDrivenByDefaultMapsIdSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PrimitiveArrayBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PrimitiveArrayBinder.java
index 8228819d090a..43a2572da56e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PrimitiveArrayBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PrimitiveArrayBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
index bad9c3bc9c8c..9cd76b70c9bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
@@ -25,7 +23,6 @@
 import org.hibernate.annotations.OptimisticLock;
 import org.hibernate.annotations.Parent;
 import org.hibernate.binder.AttributeBinder;
-import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.spi.AccessType;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
index bd763ed5337e..e3f0d4f7d0ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
@@ -1,15 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.boot.model.internal;
 
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -28,7 +22,6 @@
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.spi.AccessType;
-import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.models.spi.ClassDetails;
@@ -39,7 +32,6 @@
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.models.spi.TypeVariableScope;
 
-import org.jboss.logging.Logger;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
index ba230325e9ff..8753d95b898a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolderBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolderBuilder.java
index 2403897c0035..f2c16cedcad8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolderBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolderBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
index 572a95660bfe..10bf797f680f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyPreloadedData.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyPreloadedData.java
index 4c391df75fb9..2f1d39a64b67 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyPreloadedData.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyPreloadedData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java
index 999f8ea04a7d..3c96acccc94a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java
index 035c09b8dada..6e8f4feebd2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QuerySecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QuerySecondPass.java
index 6fc22262a69d..4af4badd3f0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QuerySecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QuerySecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java
index f32203737434..8a9edffa5ef7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableFromAnnotationSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableFromAnnotationSecondPass.java
index 3444a61e251d..361b24dadfe5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableFromAnnotationSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableFromAnnotationSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableSecondPass.java
index b8b488142847..ce1562554214 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SecondaryTableSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBasicValueTypeSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBasicValueTypeSecondPass.java
index f87a67e5e24b..c71a6ff43a1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBasicValueTypeSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBasicValueTypeSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBinder.java
index 84aef1becc28..cda391f88576 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SetBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SimpleToOneFkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SimpleToOneFkSecondPass.java
index ba9155c9b24d..634b774897c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SimpleToOneFkSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SimpleToOneFkSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
index ba89a07ef3b8..f7e0fcb23c46 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java
index 73e80bf416c4..381bc41f0371 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
index b74fec73b989..60e876c3fc92 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TimeZoneStorageHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TimeZoneStorageHelper.java
index 3b2b780c8800..0728cfcc7aaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TimeZoneStorageHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TimeZoneStorageHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
index dfe4b98dfb9b..f1143d740641 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneFkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneFkSecondPass.java
index 8c1ab7af4da2..4a0d350c829f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneFkSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneFkSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/WrappedInferredData.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/WrappedInferredData.java
index 59ee3609aff9..591a170e73bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/WrappedInferredData.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/WrappedInferredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
index 5633f14285fb..0531e86ae94f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/CamelCaseToUnderscoresNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/CamelCaseToUnderscoresNamingStrategy.java
index 79568b85b6d4..c91248449921 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/CamelCaseToUnderscoresNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/CamelCaseToUnderscoresNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/DatabaseIdentifier.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/DatabaseIdentifier.java
index 5d2f19b60c09..6578bd276d61 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/DatabaseIdentifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/DatabaseIdentifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java
index 239ec76ddfdd..0d13333d7fec 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
index 64cada3ed3d4..aca49e4afb0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/IllegalIdentifierException.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/IllegalIdentifierException.java
index c9a177709ab8..640ead5ef0a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/IllegalIdentifierException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/IllegalIdentifierException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyDiscriminatorColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyDiscriminatorColumnNameSource.java
index ea9918afa558..d4e69bc8923d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyDiscriminatorColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyDiscriminatorColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyKeyColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyKeyColumnNameSource.java
index 0e6f48fdb25d..f39052423349 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyKeyColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitAnyKeyColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java
index eba52b92e6f4..66120c4bf3c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java
index 2ca375712c3f..8a315b689b1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
@@ -17,10 +15,10 @@
  */
 public interface ImplicitCollectionTableNameSource extends ImplicitNameSource {
 	/**
-	  * Access to the physical name of the owning entity's table.
-	  *
-	  * @return Owning entity's table name.
-	  */
+	 * Access to the physical name of the owning entity's table.
+	 *
+	 * @return Owning entity's table name.
+	 */
 	Identifier getOwningPhysicalTableName();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitConstraintNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitConstraintNameSource.java
index e0963f934e05..3c58ea740b44 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitConstraintNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitConstraintNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitDiscriminatorColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitDiscriminatorColumnNameSource.java
index 4fc5162fbf3f..949cbd0394ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitDiscriminatorColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitDiscriminatorColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitEntityNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitEntityNameSource.java
index 7f7b082e97f3..dba15742044e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitEntityNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitEntityNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitForeignKeyNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitForeignKeyNameSource.java
index 9647bec98048..66071b751036 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitForeignKeyNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitForeignKeyNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIdentifierColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIdentifierColumnNameSource.java
index 720b9d405a9c..b0169a8db4e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIdentifierColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIdentifierColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java
index 7b0bc4b4763b..6e7fe88b340d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexNameSource.java
index 324c6b5850da..00dac8c59210 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java
index 3556be7a0d13..58afa2b8bcc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java
index 5fac44803203..dff65dde93aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java
index e4a1bb65cad8..e352c1d7a33a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNameSource.java
index 6c2b6c6cc7d3..4a7e9b052020 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
index 2c8d52a583fc..693c62d3634e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java
index fa2b2cf9a003..ecf1966e6666 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
index c732e6510e52..b3abb6c5f453 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
index 8410b1884aca..a5c1ec2d3f3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
index 363f86f3dc4a..26b6f04e6edf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitPrimaryKeyJoinColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitPrimaryKeyJoinColumnNameSource.java
index 636b8af4f761..150e387b3eda 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitPrimaryKeyJoinColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitPrimaryKeyJoinColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitTenantIdColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitTenantIdColumnNameSource.java
index b10e86d77cb8..a53f94d217d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitTenantIdColumnNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitTenantIdColumnNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitUniqueKeyNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitUniqueKeyNameSource.java
index b061a9242510..d5cb19a851e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitUniqueKeyNameSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitUniqueKeyNameSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java
index c8e74a289591..85435165340c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java
index 804b7a89a6a7..3c8f6b91c0aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java
index c8dce07e7650..4fdafdc3ab87 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
index 002ad2080659..a00f21e9b1e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategyStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategyStandardImpl.java
index d2a7cf2fc45a..2fe6c130a262 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategyStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategyStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.naming;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueConverter.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueConverter.java
index 5193f98b8c25..aab35e06f894 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java
index c93887ace519..152c1be8f4c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
index 58030b73c081..92fea4c9e532 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
index 7f9db9e5ab18..dff30ada5609 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
@@ -18,24 +16,15 @@
 import org.hibernate.Internal;
 import org.hibernate.boot.BootLogging;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.jaxb.Origin;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
-import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
-import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.jaxb.spi.JaxbBindableMappingDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.spi.BootstrapContext;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.MappingSettings;
-import org.hibernate.engine.config.spi.ConfigurationService;
-import org.hibernate.internal.log.DeprecationLogger;
 
 import jakarta.persistence.AttributeConverter;
 
-import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java
index 4d8bd215fed2..9615d83227b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
index ee85dbda154f..836bbfbd617e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
index 95dfe37ce7fd..73b127564116 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeMutabilityPlanAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeMutabilityPlanAdapter.java
index 8571c43e02fc..e5aec7a9422e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeMutabilityPlanAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeMutabilityPlanAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java
index 0e60026cc429..e7fa2969901d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
index 6cd40dc201ba..7d5ed863964e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java
index c13b9af40cb7..a0001a877d2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
index a1d9042ef9ff..aea51bfc29d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/NoOpMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/NoOpMetadataSourceProcessorImpl.java
index 03a496a2080e..dd2f03a027c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/NoOpMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/NoOpMetadataSourceProcessorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.process.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
index e196c7f7cf07..7ef562e490a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AuxiliaryDatabaseObject.java
index 8b4937598ebe..f47e39c9742f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AuxiliaryDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AuxiliaryDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategy.java
index 4408fa05546d..ebedefaf7bfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyLegacy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyLegacy.java
index 74d084d188d7..ff3c754ec46c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyLegacy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyLegacy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyStandard.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyStandard.java
index 6e3e3993184f..306d3c39b0c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ColumnOrderingStrategyStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ContributableDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ContributableDatabaseObject.java
index a970c61dd870..2365a217f832 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ContributableDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ContributableDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
index 732a50880508..e9e7ec771cdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Exportable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Exportable.java
index 82b3817c79e3..bab1c1994cfa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Exportable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Exportable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ExportableProducer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ExportableProducer.java
index 39e7e6ae3dfb..bdc1cb22a402 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ExportableProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/ExportableProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/InitCommand.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/InitCommand.java
index bcb6a0b73b65..df442fd372d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/InitCommand.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/InitCommand.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java
index c8fe7665c650..fc18fdf2f950 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/NamedAuxiliaryDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
index 596058f1cea6..5c570641078c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedName.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedName.java
index 4b83c3a7c2e6..22f58887f389 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedName.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameImpl.java
index 8da139906c1e..4fe9e50c9b5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
index 14a365b73880..cb4fba0cb740 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedSequenceName.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedSequenceName.java
index 489446993fdc..336749c56479 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedSequenceName.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedSequenceName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTableName.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTableName.java
index c6c110ab05e2..a4db561078db 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTableName.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTableName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTypeName.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTypeName.java
index c52cd6b45154..5de2d72c2664 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTypeName.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedTypeName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Sequence.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Sequence.java
index 1d281bc36fd7..b92c0bb60d35 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Sequence.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Sequence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java
index 24a3fddd2304..53e53045d2ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SimpleAuxiliaryDatabaseObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java
index 63529b699d7e..50c40acdfaef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java
index cdf07bc4e1aa..828682d3ced3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.relational.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/ImplicitColumnNamingSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/ImplicitColumnNamingSecondPass.java
index 7b86b25c5a5c..3a4f05191995 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/ImplicitColumnNamingSecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/ImplicitColumnNamingSecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java
index b85409013277..c9f087d46dd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
index 1a161fbaf8c8..e36530cf0b3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.annotations;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
index 99a7c4168c46..6eb2789ddf26 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.annotations;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java
index 419b6d38101b..10d7c1fbca83 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.annotations;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
index 4d4f83ca5108..39d9074d6587 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java
index 09c6855e0084..a8904d2cb558 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAssociationElementSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAssociationElementSourceImpl.java
index 2d7b043b647b..636a25fc1216 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAssociationElementSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAssociationElementSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java
index 424a145efaf8..a92a4a991325 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractSingularAttributeSourceEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractSingularAttributeSourceEmbeddedImpl.java
index f1390b6c0cbf..00d83f32a548 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractSingularAttributeSourceEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractSingularAttributeSourceEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractToOneAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractToOneAttributeSourceImpl.java
index 5b54e2d955ce..aaf595f5ca1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractToOneAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractToOneAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java
index bb9bc9e302d4..6c27b878ecc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java
index 306cccc65659..0931ca9f1aaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AuxiliaryDatabaseObjectBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributeColumnsAndFormulasSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributeColumnsAndFormulasSource.java
index 69bdb7ee8183..9bc0a0771265 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributeColumnsAndFormulasSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributeColumnsAndFormulasSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributePropertySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributePropertySource.java
index dee841a18f4b..6c0a4840b5ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributePropertySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributePropertySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
index a9f325fc8f73..5670434f6a8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
index 7f3269242da1..eb6d7c2d66a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceBasicImpl.java
index 62174ae402da..f4b150977e78 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java
index d825a3e82803..d77176b7606d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java
index 47156bd32a97..dfc1e2c25850 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceContainer.java
index f4eb38ba64a1..1fd5f9d2046e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceImpl.java
index 5a5e757ca06b..ce219a779955 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceVirtualImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceVirtualImpl.java
index 7a32d573cb32..75605105f5a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceVirtualImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EmbeddableSourceVirtualImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
index b52c0e92f797..3f63204b4022 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchyBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchySourceImpl.java
index 9230137b15ef..afadcf922112 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityHierarchySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
index e47b22d47574..151031f26e1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsPluralAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsPluralAttributeImpl.java
index 8982a1f323ce..0acbe8de40db 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsPluralAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsPluralAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
index cab51d08ad29..3fb43b5da813 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
index ea930cd1db71..f61487f30445 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
index d5e7c3d62bbf..40c0d19305d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java
index 3236e5006fc5..be40d959e093 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FormulaImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FormulaImpl.java
index a186a6299a86..dea419cebd4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FormulaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FormulaImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java
index c692f9415c95..7e4e0b236667 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
index 38bde2c6ef91..00972779157b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
index 82c693404073..204c7d253371 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HibernateTypeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HibernateTypeSourceImpl.java
index 2690737d58cf..af0efb271b88 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HibernateTypeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HibernateTypeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java
index a63b323238b6..0d4af5855e07 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
index 3d6a0eb1c7b1..321876d8d5ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierGeneratorDefinitionBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java
index f0a907ca67fe..85020ae3df70 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceNonAggregatedCompositeImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceNonAggregatedCompositeImpl.java
index 59a8558b87f4..d31c8da7649a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceNonAggregatedCompositeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceNonAggregatedCompositeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceSimpleImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceSimpleImpl.java
index 0d9ddfb8abd3..0ae4bbc725d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceSimpleImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceSimpleImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/InLineViewSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/InLineViewSourceImpl.java
index c8cf09f5ac03..080d7669f7cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/InLineViewSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/InLineViewSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
@@ -24,7 +22,7 @@ public InLineViewSourceImpl(
 			MappingDocument mappingDocument,
 			String schemaName,
 			String catalogName,
-			String selectStatement, 
+			String selectStatement,
 			String logicalName,
 			String comment) {
 		super( mappingDocument );
@@ -54,7 +52,7 @@ public String getSelectStatement() {
 	public String getLogicalName() {
 		return logicalName;
 	}
-	
+
 	@Override
 	public String getComment() {
 		return comment;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IndexedPluralAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IndexedPluralAttributeSource.java
index 89a761089a07..84a499ce2763 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IndexedPluralAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IndexedPluralAttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/JoinedSubclassEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/JoinedSubclassEntitySourceImpl.java
index dd57716eb8f0..42b436dfc8e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/JoinedSubclassEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/JoinedSubclassEntitySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
@@ -77,7 +75,7 @@ public boolean isCascadeDeleteEnabled() {
 	public String getExplicitForeignKeyName() {
 		return jaxbKeyMapping.getForeignKey();
 	}
-	
+
 	@Override
 	public boolean createForeignKeyConstraint() {
 		// TODO: Can HBM do something like JPA's @ForeignKey(NO_CONSTRAINT)?
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOneAttributeColumnsAndFormulasSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOneAttributeColumnsAndFormulasSource.java
index 688d7014b925..34b8cf205a36 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOneAttributeColumnsAndFormulasSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOneAttributeColumnsAndFormulasSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOnePropertySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOnePropertySource.java
index 0b1a5b1f2aa4..f9c519cb9943 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOnePropertySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ManyToOnePropertySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
index 39180cc7b194..dd1a95d043a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
index 718f6112d622..bf4dd8567ef1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
@@ -2850,7 +2848,7 @@ public MetadataBuildingContext getBuildingContext() {
 			if ( isNotEmpty( tableSource.getCheckConstraint() ) ) {
 				table.addCheckConstraint( tableSource.getCheckConstraint() );
 			}
-		} 
+		}
 
 		table.setComment(tableSpecSource.getComment());
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
index 1e4fbc3be2a4..13911e59c34f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceBasicImpl.java
index 94e979ee2e44..54642a06e23a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceEmbeddedImpl.java
index 8c137c57fe47..dd8f62eaddbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java
index 0d8a7c8c5e2a..6731db9ca4b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToManyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToManyImpl.java
index 85dfc5126e51..ca7c47c351e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToManyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToManyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java
index fb8019bea74d..4dbfbe435618 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeKeySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeKeySourceImpl.java
index 3a105cbe85c1..1f919b1e408f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeKeySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeKeySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
@@ -132,7 +130,7 @@ public List getColumnOrFormulaElements() {
 	public String getExplicitForeignKeyName() {
 		return explicitFkName;
 	}
-	
+
 	@Override
 	public boolean createForeignKeyConstraint() {
 		// HBM has not corollary to JPA's @ForeignKey(NO_CONSTRAINT)
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToAnySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToAnySourceImpl.java
index ac2bc81f5ab3..f33f54a38e7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToAnySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToAnySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToManySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToManySourceImpl.java
index 7b0544649566..affbd207e873 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToManySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeyManyToManySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceBasicImpl.java
index 05adcc087408..8968088b52b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceEmbeddedImpl.java
index 8fe7df5467da..f59e43109423 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeMapKeySourceEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSequentialIndexSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSequentialIndexSourceImpl.java
index 602eddd78fc5..0e30c13442f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSequentialIndexSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSequentialIndexSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceArrayImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceArrayImpl.java
index df8c8d7aa221..347af1890bbe 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceArrayImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceArrayImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceBagImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceBagImpl.java
index 69d3620ca91e..5d4b95bf61c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceBagImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceBagImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceIdBagImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceIdBagImpl.java
index 5b97c86687f6..264f5585a2a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceIdBagImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceIdBagImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceListImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceListImpl.java
index 45bdaafed05a..3835491ea39a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceListImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceListImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceMapImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceMapImpl.java
index 3f7cef9ff714..42efb3e6fa70 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceMapImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourcePrimitiveArrayImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourcePrimitiveArrayImpl.java
index 57c5a439b86d..d3c2bc9daf0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourcePrimitiveArrayImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourcePrimitiveArrayImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceSetImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceSetImpl.java
index 9f62951d1d5c..fcbb12a9e3a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceSetImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeSourceSetImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PropertySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PropertySource.java
index c001491de802..4198cc1774f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PropertySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PropertySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java
index 362906eb42ae..9d875071407d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java
index ccc9ed7e4fa2..6677873686fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RootEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RootEntitySourceImpl.java
index 95728d439e02..2791e106079d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RootEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RootEntitySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SecondaryTableSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SecondaryTableSourceImpl.java
index 6832c7c0b81e..af857ee592bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SecondaryTableSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SecondaryTableSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
@@ -142,7 +140,7 @@ public boolean isCascadeDeleteEnabled() {
 	public String getExplicitForeignKeyName() {
 		return jaxbSecondaryTableMapping.getKey().getForeignKey();
 	}
-	
+
 	@Override
 	public boolean createForeignKeyConstraint() {
 		// TODO: Can HBM do something like JPA's @ForeignKey(NO_CONSTRAINT)?
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceAnyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceAnyImpl.java
index 6ac24e206241..97dd06ea96f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceAnyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceAnyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceBasicImpl.java
index b539fa62c1c9..82dc013f098b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceEmbeddedImpl.java
index d4e89be89498..ffda243c38d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceManyToOneImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceManyToOneImpl.java
index 4f49148dc034..917dc97848e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceManyToOneImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceManyToOneImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceOneToOneImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceOneToOneImpl.java
index 9335508eac59..3696f86131e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceOneToOneImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularAttributeSourceOneToOneImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
index c2b5e4d4e705..05a9b017c104 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SizeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SizeSourceImpl.java
index c37f3636fed6..a91e4c06197f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SizeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SizeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
index e3757f51e2dc..daf0b05ac6d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TableSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TableSourceImpl.java
index cb1af47986a2..881571f01c8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TableSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TableSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TimestampAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TimestampAttributeSourceImpl.java
index 90d314fdcc83..0380693d5128 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TimestampAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TimestampAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
index b74a85484e34..5e1b16839409 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/TypeDefinitionBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/VersionAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/VersionAttributeSourceImpl.java
index 79baddaa013e..7a5315f76f6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/VersionAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/VersionAttributeSourceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java
index e5c261a1290b..cc1d48d186c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java
index f675c7c30c4c..4f3206c71e97 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyDiscriminatorSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyDiscriminatorSource.java
index 50c104a3eb7d..c91b99d0ff09 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyDiscriminatorSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyDiscriminatorSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyKeySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyKeySource.java
index 51dbfcd18a7b..eca797ddaa4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyKeySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyKeySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyMappingSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyMappingSource.java
index deaaec657200..0d22f93c952f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyMappingSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AnyMappingSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AssociationSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AssociationSource.java
index e3efcfc521bb..afbc94dab08f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AssociationSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AssociationSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributePath.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributePath.java
index 97b2141a0e4a..ed6e90134001 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeRole.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeRole.java
index f616fd1c8cbf..1b35972ada69 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeRole.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeRole.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
index 1d86f4d06969..ba98f548c3fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSourceContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSourceContainer.java
index d4f2478a4423..73099b8091bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSourceContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSourceContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CascadeStyleSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CascadeStyleSource.java
index 7a6a243adc89..a048d6363b60 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CascadeStyleSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CascadeStyleSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CollectionIdSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CollectionIdSource.java
index 1f4ce77b136a..865ee2757756 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CollectionIdSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CollectionIdSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnBindingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnBindingDefaults.java
index 1d8bdf8eb6b9..d0359b6cbe53 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnBindingDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnBindingDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnSource.java
index 9799814f5110..415034f1c6c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnsAndFormulasSourceContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnsAndFormulasSourceContainer.java
index ecef455ee8c4..7b499a654656 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnsAndFormulasSourceContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ColumnsAndFormulasSourceContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
index 5a89f66f20ed..c5211155d46a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DerivedValueSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DerivedValueSource.java
index aa2536c1e5f1..6144c1d4f643 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DerivedValueSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DerivedValueSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DiscriminatorSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DiscriminatorSource.java
index 931299094f36..35871b59b30b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DiscriminatorSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/DiscriminatorSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableMapping.java
index 879a0448980e..5d4c1abd7887 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSource.java
index 57023d2024b1..069da72e963f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSourceContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSourceContributor.java
index b0786c30fc92..fe4326c0ecae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSourceContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddableSourceContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddedAttributeMapping.java
index 075f3efd9c26..71d226116a16 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddedAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EmbeddedAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityHierarchySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityHierarchySource.java
index b0790cf7ba1c..2922dcfa8be8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityHierarchySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityHierarchySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSource.java
index e18726eb8b59..20b42487e5d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSourceContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSourceContributor.java
index ee75174830e4..ffd71a3cd1df 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSourceContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntityNamingSourceContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java
index 6142b71ae227..7f9684606821 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristics.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristics.java
index dbd703d7e1b2..19986fd36a27 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristics.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsPluralAttribute.java
index 3428f2659596..f09ec7ca6a41 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsPluralAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsPluralAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsSingularAssociation.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsSingularAssociation.java
index c36c670698a9..ea94c58116f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsSingularAssociation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchCharacteristicsSingularAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchableAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchableAttributeSource.java
index 2cd6ed590578..a74ffac3d3a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchableAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FetchableAttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
index ac2b4c50ae70..9cee1e2908b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ForeignKeyContributingSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ForeignKeyContributingSource.java
index 3d1eef68ae2b..4019cf4c762b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ForeignKeyContributingSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ForeignKeyContributingSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/HibernateTypeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/HibernateTypeSource.java
index c784cdb3500d..f07d72029a98 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/HibernateTypeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/HibernateTypeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java
index 99b198fd9e0f..444596d70329 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSource.java
index 2e8b301b7ab2..37853282da97 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java
index 9326a09a4620..bc39afecbcec 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java
index cd24fe452943..e008dbc666c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceSimple.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceSimple.java
index c9d12bb74a45..77583232d8bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceSimple.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceSimple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InLineViewSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InLineViewSource.java
index 629332cde95a..58a78bfb07d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InLineViewSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InLineViewSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InheritanceType.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InheritanceType.java
index 36efc7e0c53a..276987c69108 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InheritanceType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/InheritanceType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JavaTypeDescriptorResolvable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JavaTypeDescriptorResolvable.java
index f2d75d3b1859..d6201950e232 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JavaTypeDescriptorResolvable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JavaTypeDescriptorResolvable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JdbcDataType.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JdbcDataType.java
index e80ae6f1c94b..4ec6b1b77f2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JdbcDataType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JdbcDataType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JoinedSubclassEntitySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JoinedSubclassEntitySource.java
index 6f582da4f716..6c0d2c04ac7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JoinedSubclassEntitySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JoinedSubclassEntitySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java
index 7e6f63c3787d..f8306398d655 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/LocalMetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/LocalMetadataBuildingContext.java
index 542f351408c3..ddc4e4504272 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/LocalMetadataBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/LocalMetadataBuildingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java
index 6e8dcacc36d9..8d94b98f6f3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java
@@ -1,28 +1,26 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
 /**
  * Describes a relationship annotated with {@link jakarta.persistence.MapsId}
- * 
+ *
  * @author Steve Ebersole
  */
 public interface MapsIdSource {
 	/**
 	 * Obtain the {@link jakarta.persistence.MapsId#value()} naming the attribute
 	 * within the EmbeddedId mapped by this relationship.
-	 * 
+	 *
 	 * @return The corresponding id attribute name.
 	 */
 	String getMappedIdAttributeName();
 
 	/**
 	 * The attribute source information
-	 * 
+	 *
 	 * @return The association attribute information
 	 */
 	SingularAttributeSourceToOne getAssociationAttributeSource();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MetadataSourceProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MetadataSourceProcessor.java
index 85d96cb9135a..7fed154057a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MetadataSourceProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MetadataSourceProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MultiTenancySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MultiTenancySource.java
index 49f4a78759be..07a5eb357dd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MultiTenancySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MultiTenancySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/NaturalIdMutability.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/NaturalIdMutability.java
index 46099657751c..8fae2724aef8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/NaturalIdMutability.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/NaturalIdMutability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
index 77729c00dc9f..de4e6a40e714 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementNature.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementNature.java
index c23b8865f4b8..13008c367f24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSource.java
index 9f5a0875668d..c744e825f1d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceAssociation.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceAssociation.java
index f1015915ea8a..f15ed4ec7c20 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceAssociation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceBasic.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceBasic.java
index f37393ada7c0..76e43d630815 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceEmbedded.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceEmbedded.java
index 406f779a9e7f..83e89da56fb0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceEmbedded.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToAny.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToAny.java
index df47eee58e4f..799c1c617d08 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToAny.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToAny.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToMany.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToMany.java
index db0e55fe4826..0899a5b2556f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToMany.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceManyToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceOneToMany.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceOneToMany.java
index 93391a610090..1fd1cb2f8fc3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceOneToMany.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeElementSourceOneToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexNature.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexNature.java
index 0935aca6ba90..aa2064de8b24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexSource.java
index c019c8933be7..5ceb6340b263 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeIndexSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeKeySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeKeySource.java
index ecdfa5761300..98ec181be422 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeKeySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeKeySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToAnySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToAnySource.java
index 7df10c761437..f3a0af63e0db 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToAnySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToAnySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToManySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToManySource.java
index ee1139311de5..57d858683dfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToManySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeyManyToManySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java
index ef7d5fa5cc0d..141aebef4d02 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceBasic.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceBasic.java
index 0cd8993239aa..e7552cc0295b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceEmbedded.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceEmbedded.java
index 160c43952af4..4d5688b41cd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceEmbedded.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySourceEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeNature.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeNature.java
index 0f069f7a7829..8057b7200bf7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSequentialIndexSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSequentialIndexSource.java
index 06bd2404ea4b..932b29f970bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSequentialIndexSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSequentialIndexSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSource.java
index 2f435a9df430..7798a186e336 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSourceArray.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSourceArray.java
index d18a811b3522..6aa1ae383d0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSourceArray.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeSourceArray.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSource.java
index 66ff216a5de9..fb43a667b012 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSourceContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSourceContainer.java
index 42ccff12ac7c..72d39035c6dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSourceContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/RelationalValueSourceContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SecondaryTableSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SecondaryTableSource.java
index c4521b993a5c..46d2df8fe752 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SecondaryTableSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SecondaryTableSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeNature.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeNature.java
index 3080fff3e32e..2448cd7dcedf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSource.java
index 2ee9a9848dd9..1ea44c20f1d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java
index c644b62c3a5c..839054dc979b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceBasic.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceBasic.java
index 5f0693da4e46..4c64450fe048 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceEmbedded.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceEmbedded.java
index 2a0353d069ba..6fff2cbceb2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceEmbedded.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceManyToOne.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceManyToOne.java
index 7090cd4294e0..c10cdb324029 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceManyToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceManyToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceOneToOne.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceOneToOne.java
index 74d5e896103c..bee83c692280 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceOneToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceToOne.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceToOne.java
index 203131cb3707..0d37f51092e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SizeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SizeSource.java
index 11bd5e0f8e72..6f8b0e2999f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SizeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SizeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Sortable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Sortable.java
index 2c56ff8ec610..d055ff772768 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Sortable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Sortable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SubclassEntitySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SubclassEntitySource.java
index 52305d8c1ffe..61a54590f930 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SubclassEntitySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SubclassEntitySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSource.java
index 449e776c7fd0..22d27e990c9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSpecificationSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSpecificationSource.java
index 2d9da5e9a995..c2d58b687189 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSpecificationSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSpecificationSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHint.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHint.java
index e335dc17892b..a083342f9d43 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHint.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContext.java
index ac862c41d45e..36252d882207 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContextContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContextContainer.java
index ea12f2179f71..17f9796e0342 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContextContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/ToolingHintContextContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
index 028d044a05f6..c15784ad9c1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.model.source.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java
index cfbc47fb3143..5922face703f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
index 92833a8e88f4..a0b273a04ba4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java
index b7ccac0a65b0..9dcabfadd7a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/Copied.java b/hibernate-core/src/main/java/org/hibernate/boot/models/Copied.java
index 1b0bc69b0a8e..bcc2cfc805ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/Copied.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/Copied.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
index 2562ce14eee8..4e8e82a72d7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
index 1ea40f8754f1..4a2ddfec6666 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
index d9a82b19081e..2269923677a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/MemberResolutionException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/MemberResolutionException.java
index f5ec7eef495b..dbe0e18ad3e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/MemberResolutionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/MemberResolutionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java
index ef96a621cc18..321039ac198b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
index fdb7e87e40de..307a88ce4907 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java
index c352246221a0..488253f4c8d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java
index 3c6f29a90055..71cf56236e23 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
index 30d256d09745..b5a5ed9fbdeb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java
index 57034281bc5f..026d7f1776aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java
index 61fc7ae79564..2d1c27342648 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java
index 31a6c0531e19..d8d0c1c26e7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java
index 4c561c3b49dd..0143ef5709de 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java
index 7351f78c0645..c17195be7ba4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java
index 7ad8d71c372e..b6072a8d9e0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java
index 06c435fcf849..5cb07d3cd636 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java
index 68b172773247..72cb2ca47e68 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java
index 46b43615fa5d..5123bd1b5491 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java
index faae8b5a4c0d..fed255248ec9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java
index 66dc2c1626ce..46941b3b0cb3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java
index 13e6e87e1d01..256753ef3e74 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java
index bd17f9652e41..c8054c8897da 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
@@ -12,9 +10,7 @@
 import org.hibernate.annotations.AttributeAccessor;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
-import org.jboss.jandex.AnnotationInstance;
 
-import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
 
 @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
 @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java
index 33c958eccdd0..aeb326785428 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java
index 15217713bbe3..77cd9fca8a56 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java
index a58eae51f797..751c18a88e06 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java
index 6442a573c287..f786ed00f451 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java
index 0bcb385ce3b5..9930fa369385 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java
index e9536ffdc259..e3943b053d72 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java
index 113794cdfb6d..28b22edb0df3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java
index db46b66c9df4..fd81d9202aaf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java
index 810306bc8132..8daa6baa6c8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java
index 979153016d4d..ce4696b8c1a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java
index 83bd2b8e81f8..18a56c7e4586 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java
index dea020374ba5..1619aac5162d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java
index 0f44d65b65e9..02fc2112de89 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java
index 9534852d3c7c..119bc70e7422 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java
index 139f89419675..a56a9c050809 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java
index 5b2e2f6701ef..bbf733c85e68 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java
index 7145cb5cc1a7..bf5bd4fb285e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java
index 6ebf37433338..9893c671ea3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java
index ccd6df44198d..0317e69c613e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java
index ccc006b753ff..41a225dc9fbe 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java
index 9ba972b763b8..c3306cb0ef7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java
index 487cfcb84c75..5df7a064214e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java
index ec0992c88ba1..72328f345817 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java
index 5f49e8900eba..1bc51a15879a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java
index 07eee16107cd..06825c14a729 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java
index 1ce3fa461395..1d231bc147bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java
index 35be83cd47d1..5dbfdef99026 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java
index ef6f33ef5b70..27a6e17d513f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java
index 6b9fdb80beb7..e67e8b147b63 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java
index faef22be0e10..8673210cffed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java
index 6602d41f96cc..654fedb3d7bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java
index ada468a550b0..50bb0286f0b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java
index 995bbf427111..4f5ee6e6c882 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java
index beba6ab7e411..dcba98ba4b4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java
index e09194e1d1af..ee5f86f16e16 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java
index 69a3755bbf8b..4743fe1a3776 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java
index dc518844efbc..997904719a47 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java
index 3556015b2245..24b0d2fe5731 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java
index 2b1a9a57a4d8..5f95205afcd8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java
index d8383be99f9c..f110cb49ab5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java
index c5849d921f40..cba40333491b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java
index 7707e729341d..3039ddf73ce4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java
index 5d37143f1354..b6a8c4f572b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java
index c90132dc2538..01b3d6a62902 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java
index 5f1822086dcb..ff28db83364a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java
index 759ccab1da5c..f5c22a0be737 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java
index 12000dcccf70..43c026529d40 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java
index ec4ef46505f0..da308fca9f68 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java
index d1b363a086b4..a5c09ed8c499 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java
index 87040c8cbe2b..ff701cdb6be9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java
index 655d7465cedb..b97abf508556 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java
index 3dfb3360e60c..815eb02f2a31 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java
index 1fa49573d077..4fe344d7c3fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java
index c9b93ab8e199..d6fef294aa96 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java
index 36a6259068e5..57304afad34e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java
index 487a715978e7..552e82d18336 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java
index 02b4fead319c..8a13d7b3206b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java
index 5fc189abbd06..45f07ab72871 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java
index b076bcfc6088..565ee1cca7fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java
index f8c298812e6b..852c14ce3674 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java
index 53de5bf8f434..1e647520df0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java
index 34b4ef74d955..b02da8194ed7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java
index 79ab3be7251f..adedd293b33b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java
index 05f94759ab0a..98bcbb1808d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java
index d612b59b6f7f..3233adee0bd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java
index f29bdc64cea8..c941c5831f08 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java
index 5f8b6d35f5c5..bacdf269eb15 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java
index 74e20de6610f..c1c7796b02b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java
index 6b6986056703..a90ecb493a40 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java
index 2ab4edcdf805..7a71341d2c19 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java
index f1a715f4050d..a13cd5efe356 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java
index 894ec72cf03b..04bb831d2a18 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java
index 478131654e81..bcff2874b384 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java
index 21dec71d7386..4df97074fa52 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java
index 2aeacd7137c0..2c5451d47a93 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java
index 1b97a3c8e71f..3fb63a1e1ace 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java
index 6f1cf3883543..ba219205a20a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java
index 699574b93e2d..a03479adbae8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java
index dcad15a59188..49e3b3dd27e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java
index 939a92439577..1d9478a25322 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java
index dc21544ce6ae..66f207ae3d86 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java
index f059121beeb1..72666bbfc809 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java
index 1e238db14773..50102feaf3a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java
index a273ce938988..c23ccf506db2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java
index 0591950607c3..9f6adef09c0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java
index 4dd219a4989d..069363ddeac9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java
index e044aba51c41..2d57bc04d003 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java
index 38f3f677b9ab..1729973ea2a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java
index cafed3327270..db359a657772 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java
index 3d060bc4b34e..8cb7d147c827 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java
index 1961816d91b2..6ca148a67f78 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java
index 6edf4e3982fd..502f0928edd8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java
index d405ac64b59a..cd11e4dfa799 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java
index 6aec0e47ec08..5c171b9271b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java
index 8a94a818f3bf..5306095c011d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java
index 56249fe8aa65..f244bdf473a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java
index 421c95b9c04f..366c4bbb5efb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java
index 3576361445d0..092d7a6b54b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java
index 69c9e4e371db..75c330f0fb98 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java
index 733922742932..bea1db36221f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java
index f383d5b016a1..ea8fa996a006 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java
index 538af10ce7ce..a614e3958d94 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
@@ -18,7 +16,6 @@
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
-import org.jboss.jandex.AnnotationInstance;
 
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.MapKeyJoinColumn;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java
index fef55ca99c87..17f55212820a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java
index f2113ed76352..89e0498bd7a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
@@ -13,7 +11,6 @@
 import org.hibernate.boot.models.annotations.spi.RepeatableContainer;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
-import org.jboss.jandex.AnnotationInstance;
 
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinColumns;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java
index dc9631f28c88..a9ae882b3051 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java
index 5b52f8b05b7e..767003d07729 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java
index 6d4c95426d8c..6b5c3dcf4453 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java
index 7ccf0dccaa23..42a50a089dae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java
index cedb89ef8ef7..29951e62ea61 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java
index 8de06e2e226d..7425c9e4d3a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java
index d020c2ca84c8..89618298bbf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java
index a723a1f20e09..25062b560f18 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java
index e6ccedd3dfd0..8a563b162932 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
index f08326d0453a..d12f6319c57f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java
index c3abddb64f30..ffd62b28ab5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java
index 752d67b29466..e0227b453325 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java
index e2330823d453..78c967c40077 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java
index 3b212a9c926f..beed5b8da213 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java
index af78ec1290e0..9e4bad026756 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java
index 4b34a787042b..d1dc481575f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java
index 67c2cec2b06c..302b65a5acc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java
index c328406fc8ee..a560c5783168 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java
index d233f4a60c0d..da8bb791ea51 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java
index 5b796054342d..9847103c35c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java
index 6728acd5c91b..d5f9a520b31e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java
index 4d341ff69daa..f915892ed69f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java
index 57ea7ad4ac9c..eb748fdabab3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java
index 4465e6adced1..f8a23fb65ade 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java
index 2bc2cb56d73c..8be938b6acd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java
index 9144040b025b..00a8a67b0496 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java
index aa35e520e056..c82f69611cc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java
index c56dfbc8f237..beef609108c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java
index e91eb52f9643..1b34e7b98777 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java
index 2ccd7643763a..7792cc498bd2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java
index 66b57d228c53..c46d8f07ccde 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java
index 87c1284a5a04..3d7d66a71ab3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java
index 648dc6c28c92..e0bebff044d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java
index 2b4c0898cba9..3d2ea5b4e20c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java
index b585d10b8b2f..065f5a0d30b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java
index ce4b3072cf0a..934cb8e9089d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java
index 2f0c7905cba3..99b7062ed25f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java
index d884bac43c1a..b1fa2ffd34f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java
index 5948582cf9dc..118675d5265d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java
index 1c541b422f2b..9cc528ab80f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java
index be20f2d9b12f..f8c3cb3fa2d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java
index 494c8e8fff79..e5448c6b1e4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java
index e68566f445c7..d23d6242e537 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java
index 01daaa842111..8ca77b5add79 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java
index 144ffc075381..af742b9c22c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java
index bc23c9699ce4..380b03a66a1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java
index f4169612f588..bf376d4b9063 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java
index d78ff356ce5b..2b33274c3e87 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java
index b5df6063bbbb..13181eff5916 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java
index fdd15e49b8c7..d6aceff7e8c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java
index fb616add4afc..d06e8988ae38 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByAnnotation.java
index d6d75d32c389..8ee43909772d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java
index 8504da9461c7..6dc7858af62b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java
index db453a675b16..0739c688d645 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java
index 2a23c9571a27..ec1f36a0716f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java
index d37683efcd24..b456c16d8356 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java
index d07675023386..c6c4961e2a61 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java
index 4afab756856b..ea86e0181d18 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java
index e51e5d440b12..c785fe336625 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java
index 797153f0354e..28ce61ecf7e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java
index 07263f9b3bd5..18c9cdaf7950 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java
index 00342d90c43e..d7abd06518e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java
index 31fd662218cb..681910680c22 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java
index 11298f204c91..47c6b4edd658 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java
index 52fd4bbf5444..6c38605b9ac4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java
index 15bb001740f7..c48cbc62d2be 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java
index d9f40ffec231..542d1ae6d535 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java
index b2bd4ff75410..0af12da5d30a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java
index 13c0e7d89bdc..6917840fbc5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java
index 6c805406771a..b4d2dd702cd9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderByAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderByAnnotation.java
index 56c78f6cff03..0de946e055ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderByAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderByAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderBysAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderBysAnnotation.java
index 88f81691026e..3bb0cd1d8aab 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderBysAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenOrderBysAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java
index 2d8adc09f6c0..373904b88b55 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java
index 77a36f219bf4..6b5b6ab7a459 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java
index f9347a8a92f8..3cc60af36eba 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java
index a13d950e8382..405ba905e654 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java
index 9af358df3beb..693df05c0107 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java
index fad1311dc9de..bac1d9c468f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
@@ -13,10 +11,8 @@
 import org.hibernate.boot.models.annotations.spi.RepeatableContainer;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
-import org.jboss.jandex.AnnotationInstance;
 
 import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_INSERTS;
-import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
 import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java
index 61a3be72ffb3..8016a6123a52 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java
index 4a27d460072f..52f2b3feb1e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java
index 5cd5698798b3..183a35b4306b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java
index 24805022e408..0e7266645d58 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java
index 4103c6d2921d..413485a5be26 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java
index 390377b736ce..fdbe3db0f1d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java
index bbd64df7b736..37ff0f268b72 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java
index 1df07656943b..ec7dd9d3c2ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java
index d9ffdfdbc2a9..de4f9bbdc97a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java
index ff69379a7938..96dd94d24f65 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java
index 065f89e3fa47..71f0825cbfc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java
index c9cba33feb4c..19af772c76d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java
index 75845bd02355..82b04d5fe4f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java
index 3a48a62ff123..992ec0fdef91 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java
index c526eefbbfcd..49d5863626b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java
index fa0526d5dc53..c522fe8bba65 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java
index 5f15a520fbee..9e2a71bd914a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java
index 7a42d2feb4d4..b0c672311c5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java
index 4f902aa884ca..01d227e83510 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java
index 5cd59f682a1c..085046322f5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java
index c9cf8493c3be..b86836e36f7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java
index ab48f8dc5d26..f98e585b603a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java
index 841a8138b573..0ec30de33d89 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java
index 76b5b2cdae0f..728a7a314d7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java
index abc44bb4dc69..2a926d01093b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java
index a31656c6c287..3339efda893f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java
index 88c08fdb8c1f..f61d641cb43e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java
index 0f126c119784..baf5520ec328 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java
index 112e51d2f513..a2a78b004a40 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java
index 0bae372b9fed..e0c51fe634e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java
index 8073a38b3870..276da0f8d17a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java
index 1fe6af6f783e..00d6980a4678 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java
index edd8182a657e..bf3acd744930 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java
index 919f1e117cb6..04e353bb92d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java
index 4ea586d0ce18..bfe56acff7cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java
index e36a355f96b0..81d02ca4c0ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java
index eed44a22a5ad..564c08c53ec5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java
index abacefa43968..379b7cb3569e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java
index cc4a4092fddd..0a398c700c68 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java
index c500c373ed48..2131cb0151e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java
index 078604a1090f..f7043c85534e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java
index 41cb91dc56d9..84598a2bcf12 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java
index 06584adf7a83..4d5aea096e9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
@@ -13,12 +11,10 @@
 import org.hibernate.boot.models.annotations.spi.RepeatableContainer;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
-import org.jboss.jandex.AnnotationInstance;
 
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.SequenceGenerators;
 
-import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
 import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue;
 
 @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java
index f7c1091114db..ffc2130c6b26 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java
index 268ea959e0f5..646d43131bf3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java
index 2f9f73fb7695..1bfcb4617130 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java
index 691c078a2afc..ead1880567ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
index f6cf78dd6ff5..aa7a78954733 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java
index 4ebdd1fdbb31..b869f4c728d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java
index c12b0aec34e7..76755496cda7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java
index f01c84eb438e..80eba369df24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java
index 3790d4811065..fa48fd1fa075 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java
index 5c2d300ef635..3f8afb59d890 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java
index d511270906ba..9191c75d5bfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java
index 7c63dc7dd5ad..872fe8b8df71 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java
index 9f8f4e142d2d..74d3721b2e7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java
index 9ae3e3d3439b..6fb0cfa6a853 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java
index 8cd13646ced3..aa92aae8d61d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java
index 6dba8d140c28..9d6b8cfcc47f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java
index 7a0cfc774377..63b0179390a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java
index 78be55264d71..11a759f2c716 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java
index 555736274948..6084e85db5ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java
index 24fb4550b379..0400754df3b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java
index 34e9f3443059..0f36b3e1eb66 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java
index 111055a53bba..eeb6c04a85f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java
index e42e1ad8b391..e4ef3e2983b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java
index 4459b9e995fa..ba929f72ba23 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java
index d6df5a712c74..908afab331dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java
index c4743ce02fd4..abb7c982b741 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java
index 0e7bbfe6a1f6..8d4a9daf6572 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java
index 015c3ccef517..d9b0d49b8d6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java
index 66a76843b7f0..f5a71aa85d73 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java
index 988b6f18e610..f8c4d4a66ad8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java
index d3a95bcd93ee..edf0b52611ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java
index 5fe86985b95a..9055da86cb4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java
index afd4efa3f35a..f8a02ca7a259 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AttributeMarker.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AttributeMarker.java
index 4de8865c118c..23e81a04551a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AttributeMarker.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AttributeMarker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CheckConstraintCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CheckConstraintCollector.java
index 4dfbb7724dfb..dab6e9134f84 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CheckConstraintCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CheckConstraintCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/ColumnDetails.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/ColumnDetails.java
index 62c7592f0540..4896f3b245e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/ColumnDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/ColumnDetails.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.annotations.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Commentable.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Commentable.java
index 1e407863fba7..328c8ec9e3db 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Commentable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Commentable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CommonTableDetails.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CommonTableDetails.java
index 60efbb1b02ea..593d5359cc76 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CommonTableDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CommonTableDetails.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.annotations.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CustomSqlDetails.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CustomSqlDetails.java
index 3037ce676248..72b08747fcb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CustomSqlDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/CustomSqlDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DatabaseObjectDetails.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DatabaseObjectDetails.java
index bcf35cace2e8..7f30871215ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DatabaseObjectDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DatabaseObjectDetails.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.annotations.spi;
 
 import java.lang.annotation.Annotation;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DialectOverrider.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DialectOverrider.java
index 987f271d77a5..0604cebeb8eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DialectOverrider.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/DialectOverrider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/FilterDetails.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/FilterDetails.java
index f9522679f034..2297557d1b34 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/FilterDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/FilterDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/IndexCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/IndexCollector.java
index 6ffc07adc3fa..90c4ce188097 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/IndexCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/IndexCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Named.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Named.java
index a154cad8de9c..8099a9664223 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Named.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/Named.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.annotations.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/RepeatableContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/RepeatableContainer.java
index d8430c2d4440..4522355b0a24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/RepeatableContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/RepeatableContainer.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.annotations.spi;
 
 import java.lang.annotation.Annotation;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/UniqueConstraintCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/UniqueConstraintCollector.java
index cacdcf3c81f7..b3096ed87727 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/UniqueConstraintCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/UniqueConstraintCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.annotations.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/ModelCategorizationLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/ModelCategorizationLogging.java
index 673ebb47a020..5c00e56da286 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/ModelCategorizationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/ModelCategorizationLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractIdentifiableTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractIdentifiableTypeMetadata.java
index de6d10b4387d..8628772a521f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractIdentifiableTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractIdentifiableTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractManagedTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractManagedTypeMetadata.java
index 92706ce80daa..dcd62f6364fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractManagedTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractManagedTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractPersistentAttributeMemberResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractPersistentAttributeMemberResolver.java
index f8a58abffd0b..05b24c1790a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractPersistentAttributeMemberResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AbstractPersistentAttributeMemberResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AggregatedKeyMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AggregatedKeyMappingImpl.java
index d84a6b22c30d..1e4d8799a72e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AggregatedKeyMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AggregatedKeyMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AttributeMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AttributeMetadataImpl.java
index 4f77f9e701b0..216b80d7ae4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AttributeMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/AttributeMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/BasicKeyMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/BasicKeyMappingImpl.java
index fa601e283309..edbb21553e50 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/BasicKeyMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/BasicKeyMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizationHelper.java
index 2add6b089568..f46399f41193 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java
index 1a4f301645e3..742fba412457 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java
index 9f947d5c517f..e57578c8f7fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java
@@ -1,18 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
 import java.net.URL;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-import java.util.Set;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.models.spi.ClassLoading;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyBuilder.java
index a182983d8690..428894049bff 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyImpl.java
index e63bb2c04224..63f30561161a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityHierarchyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityTypeMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityTypeMetadataImpl.java
index 4af6ecc8db54..03aa4a33fb67 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityTypeMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/EntityTypeMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyMetadataCollector.java
index 9b2354a5ffb3..a9ead35d5699 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyMetadataCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyMetadataCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyTypeConsumer.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyTypeConsumer.java
index 4a1f0568d90b..a65f39092faa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyTypeConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/HierarchyTypeConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/LifecycleCallbackCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/LifecycleCallbackCollector.java
index 72d673ebb105..b271f72da7bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/LifecycleCallbackCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/LifecycleCallbackCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/MappedSuperclassTypeMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/MappedSuperclassTypeMetadataImpl.java
index 0cd2c992d73b..79bec1261ccd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/MappedSuperclassTypeMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/MappedSuperclassTypeMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ModelCategorizationContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ModelCategorizationContextImpl.java
index e0a5b5abc1e1..deccb863bf91 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ModelCategorizationContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ModelCategorizationContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/NonAggregatedKeyMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/NonAggregatedKeyMappingImpl.java
index a3441c384997..92178824d727 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/NonAggregatedKeyMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/NonAggregatedKeyMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/StandardPersistentAttributeMemberResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/StandardPersistentAttributeMemberResolver.java
index 3e5d82911343..216216edc8ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/StandardPersistentAttributeMemberResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/StandardPersistentAttributeMemberResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AggregatedKeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AggregatedKeyMapping.java
index d6e4aff28a30..01f26ac3c380 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AggregatedKeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AggregatedKeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AllMemberConsumer.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AllMemberConsumer.java
index ab33a09938ae..ed1594098207 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AllMemberConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AllMemberConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeConsumer.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeConsumer.java
index 2cbc870c34c7..c1564e22475e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeMetadata.java
index 5526d7bc5efe..61ad7680782c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/AttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/BasicKeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/BasicKeyMapping.java
index 221ff7f99d09..8ac13393b0e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/BasicKeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/BasicKeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CacheRegion.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CacheRegion.java
index 6f5b128952ad..50d7ec3d9bba 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CacheRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CacheRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java
index 7c6eea6eaacd..4103c805c45a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ClassAttributeAccessType.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ClassAttributeAccessType.java
index 66e9335fe087..b41a6b5712e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ClassAttributeAccessType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ClassAttributeAccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CompositeKeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CompositeKeyMapping.java
index 56ae15c7d9e3..367360c62316 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CompositeKeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CompositeKeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityHierarchy.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityHierarchy.java
index 557a2c547b4c..b2356793b9b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityHierarchy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityHierarchy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityTypeMetadata.java
index 02e352cbd34f..e64b95c9840e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/EntityTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/IdentifiableTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/IdentifiableTypeMetadata.java
index bc75a4f06e40..e40decfdf562 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/IdentifiableTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/IdentifiableTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/JpaEventListenerStyle.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/JpaEventListenerStyle.java
index 2332060df255..a3ff3aab3f8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/JpaEventListenerStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/JpaEventListenerStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/KeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/KeyMapping.java
index 226bee5b8d9f..dddd9b79639b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/KeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/KeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java
index 767ace47b3c2..b909baf9f779 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedTypeMetadata.java
index 8ce74c140274..fd524a355164 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
@@ -11,7 +9,6 @@
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.models.spi.ClassDetails;
 
-import jakarta.persistence.AccessType;
 
 /**
  * Metadata about a {@linkplain jakarta.persistence.metamodel.ManagedType managed type}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/MappedSuperclassTypeMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/MappedSuperclassTypeMetadata.java
index 9c9bfa5e3a90..608e2a011007 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/MappedSuperclassTypeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/MappedSuperclassTypeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ModelCategorizationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ModelCategorizationContext.java
index bc183b6dbce7..ce36a08251b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ModelCategorizationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ModelCategorizationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NaturalIdCacheRegion.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NaturalIdCacheRegion.java
index 87cf36af93ef..7ec2b91467a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NaturalIdCacheRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NaturalIdCacheRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NonAggregatedKeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NonAggregatedKeyMapping.java
index 395dec6968c9..3da758d80edb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NonAggregatedKeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/NonAggregatedKeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/PersistentAttributeMemberResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/PersistentAttributeMemberResolver.java
index a4b80ce7492b..6ad7213b6e7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/PersistentAttributeMemberResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/PersistentAttributeMemberResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
@@ -11,7 +9,6 @@
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
 
-import jakarta.persistence.AccessType;
 
 /**
  * Contract responsible for resolving the members that identify the persistent
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/SingleAttributeKeyMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/SingleAttributeKeyMapping.java
index d1118d41205a..2b8d7d12cc67 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/SingleAttributeKeyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/SingleAttributeKeyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/TableOwner.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/TableOwner.java
index 35e5fc512e97..f8f26ad72fc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/TableOwner.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/TableOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.categorize.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
index 709092b255b4..eb590b9d894e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
index 146a7f4af341..53bf4a15d6fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
index 2a90c048f956..859f8e2ee56a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
index c7b64abd3614..3930430e4ddb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CollectionTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CollectionTypeRegistration.java
index d499b544b0ed..cd0c327063a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CollectionTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CollectionTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CompositeUserTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CompositeUserTypeRegistration.java
index 1e0b7464f280..358a47ad5269 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CompositeUserTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/CompositeUserTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
index f1f707921534..17d2ed46a613 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.boot.models.spi;
 
 import java.lang.annotation.Annotation;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConverterRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConverterRegistration.java
index b4416f84bacb..844872f96a1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConverterRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConverterRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/EmbeddableInstantiatorRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/EmbeddableInstantiatorRegistration.java
index 35936bdb23c5..f6b96a71c3aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/EmbeddableInstantiatorRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/EmbeddableInstantiatorRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/FilterDefRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/FilterDefRegistration.java
index 834c1d572629..d30f68ef52da 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/FilterDefRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/FilterDefRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GenericGeneratorRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GenericGeneratorRegistration.java
index f70d17449760..4ed60441e710 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GenericGeneratorRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GenericGeneratorRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrar.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrar.java
index 9740c1a007e0..2faec102f345 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrar.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrar.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java
index ba4e5332f398..1a6075ee4d38 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/GlobalRegistrations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JavaTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JavaTypeRegistration.java
index 541dc093b668..80f476a0122c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JavaTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JavaTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JdbcTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JdbcTypeRegistration.java
index aa2ebb0e62fb..eb3f003c8ec1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JdbcTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JdbcTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
index 07773d833bca..e4ac4a445f00 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedNativeQueryRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedNativeQueryRegistration.java
index 3af5aa868ad2..eb5357bb4b29 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedNativeQueryRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedNativeQueryRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedQueryRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedQueryRegistration.java
index 143baf3dadea..eca47c83895e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedQueryRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedQueryRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedStoredProcedureQueryRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedStoredProcedureQueryRegistration.java
index 804482025860..170911bcb025 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedStoredProcedureQueryRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/NamedStoredProcedureQueryRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SequenceGeneratorRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SequenceGeneratorRegistration.java
index 29750e853b70..2dccc0b4f8dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SequenceGeneratorRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SequenceGeneratorRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SqlResultSetMappingRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SqlResultSetMappingRegistration.java
index e14621c78870..3f0ad06cc36f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SqlResultSetMappingRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/SqlResultSetMappingRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/TableGeneratorRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/TableGeneratorRegistration.java
index 3f6d4aa31f84..f85fcbe18323 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/TableGeneratorRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/TableGeneratorRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/UserTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/UserTypeRegistration.java
index 88ca852f0988..3b2d10887b4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/UserTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/UserTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlProcessLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlProcessLogging.java
index c25dd496e080..768d73b52b83 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlProcessLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlProcessLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlResourceException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlResourceException.java
index 2ccffe098e9e..045043c1047d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlResourceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/XmlResourceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AbstractUserTypeCases.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AbstractUserTypeCases.java
index ea2529119add..fd9198f72ebc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AbstractUserTypeCases.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AbstractUserTypeCases.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java
index a8564ee5abde..8d58f23fabd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java
index 60917eabf2f2..55808e5b09c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/FilterProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/FilterProcessing.java
index 5f1105204170..257f51fd54ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/FilterProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/FilterProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
index 96361b1341a3..865cf8e0c7e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
index e642a79f1062..b995a0d90170 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java
index 276284ade447..8daf6d030921 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
@@ -159,7 +157,7 @@ public static void applyNamedNativeQueries(
 		final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext();
 		List namedQueryList = null;
 		List namedJpaQueryList = null;
-		
+
 		for ( int i = 0; i < jaxbEntity.getNamedNativeQueries().size(); i++ ) {
 			final JaxbNamedNativeQueryImpl jaxbNamedQuery = jaxbEntity.getNamedNativeQueries().get( i );
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ResourceStreamLocatorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ResourceStreamLocatorImpl.java
index ddb0f2a3648d..e2d186d63828 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ResourceStreamLocatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ResourceStreamLocatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java
index 927428e874c5..a31193f95b3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
@@ -84,7 +82,7 @@ public enum SimpleTypeInterpretation {
 	DOUBLE( Double.class, DoubleJavaType.class ),
 	FLOAT( Float.class, FloatJavaType.class ),
 	BIG_INTEGER( BigInteger.class, BigIntegerJavaType.class ),
-	BIG_DECIMAL( BigDecimal.class, BigDecimalJavaType.class ),	
+	BIG_DECIMAL( BigDecimal.class, BigDecimalJavaType.class ),
 	CHARACTER( Character.class, CharacterJavaType.class ),
 	STRING( String.class, StringJavaType.class ),
 	INSTANT( Instant.class, InstantJavaType.class ),
@@ -97,7 +95,7 @@ public enum SimpleTypeInterpretation {
 	OFFSET_TIME( OffsetTime.class, OffsetTimeJavaType.class ),
 	ZONED_DATE_TIME( ZonedDateTime.class, ZonedDateTimeJavaType.class ),
 	ZONE_ID( ZoneId.class, ZoneIdJavaType.class ),
-	ZONE_OFFSET( ZoneOffset.class, ZoneOffsetJavaType.class ),	
+	ZONE_OFFSET( ZoneOffset.class, ZoneOffsetJavaType.class ),
 	UUID( UUID .class, UUIDJavaType.class ),
 	URL( java.net.URL.class, UrlJavaType.class ),
 	INET_ADDRESS( InetAddress.class, InetAddressJavaType.class ),
@@ -111,7 +109,7 @@ public enum SimpleTypeInterpretation {
 	JDBC_DATE( Date.class, JdbcDateJavaType.class ),
 	JDBC_TIME( Time.class, JdbcTimeJavaType.class ),
 	CALENDAR( Calendar.class, CalendarJavaType.class ),
-	TIME_ZONE( TimeZone.class, TimeZoneJavaType.class )	
+	TIME_ZONE( TimeZone.class, TimeZoneJavaType.class )
 	;
 
 	SimpleTypeInterpretation(Class javaType, Class> javaTypeDescriptorType) {
@@ -129,7 +127,7 @@ public Class getJavaType() {
 	public Class> getJavaTypeDescriptorType() {
 		return javaTypeDescriptorType;
 	}
-	
+
 	public static SimpleTypeInterpretation interpret(String name) {
 		assert StringHelper.isNotEmpty( name );
 
@@ -187,7 +185,7 @@ public static SimpleTypeInterpretation interpret(String name) {
 				|| Character.class.getName().equalsIgnoreCase( name ) ) {
 			return CHARACTER;
 		}
-		
+
 		if ( name.equalsIgnoreCase( "string" )
 				|| String.class.getName().equalsIgnoreCase( name ) ) {
 			return STRING;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCases.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCases.java
index 7aca3de3324c..6465478d7108 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCases.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCases.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesMapKey.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesMapKey.java
index 8d508fa0185a..badc5829489e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesMapKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
@@ -11,7 +9,6 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbUserTypeImpl;
 import org.hibernate.boot.models.HibernateAnnotations;
 import org.hibernate.boot.models.JpaAnnotations;
-import org.hibernate.boot.models.annotations.internal.JavaTypeAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyJavaTypeAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyTemporalJpaAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyTypeAnnotation;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesStandard.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesStandard.java
index 3c418d890cdc..364c959d0051 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/UserTypeCasesStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
index 619aec16abf9..3a392a82a822 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
@@ -749,7 +747,7 @@ public static void applyAssociationOverrides(
 			transferAssociationOverride( jaxbOverrides.get(i), override, target, xmlDocumentContext );
 		}
 	}
-	
+
 	private static void transferAssociationOverride(
 			JaxbAssociationOverrideImpl jaxbOverride,
 			AssociationOverrideJpaAnnotation overrideUsage,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java
index 1e58b0367273..034fae7cab01 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
 import org.hibernate.boot.internal.RootMappingDefaults;
 import org.hibernate.boot.model.source.internal.OverriddenMappingDefaults;
-import org.hibernate.boot.models.xml.spi.PersistenceUnitMetadata;
 import org.hibernate.boot.models.xml.spi.XmlDocument;
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.boot.spi.BootstrapContext;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentImpl.java
index dd42bc4ddcd1..a63801bb6fd8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlPreProcessingResultImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlPreProcessingResultImpl.java
index 9ea575f4727a..5c08328b4362 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlPreProcessingResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlPreProcessingResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
index 179b846a6949..83c5c5c0aedc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingResultImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingResultImpl.java
index 248b96830ddd..06fffaeeff9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/AnyMappingAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/AnyMappingAttributeProcessing.java
index 73a236dae026..1eab8cfbdcfe 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/AnyMappingAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/AnyMappingAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
index 0e97155e1645..4f5f9a69bdaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicIdAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicIdAttributeProcessing.java
index c702124dc6b7..4d276545a32b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicIdAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicIdAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
index 0746949e6c4d..ab1ebe910c9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java
index 1b945614616d..9526da41716e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ElementCollectionAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ElementCollectionAttributeProcessing.java
index ffbcfa803109..dcd9b49a1e2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ElementCollectionAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ElementCollectionAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedAttributeProcessing.java
index 7dde3e488c73..f9e5a1fc2cd5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedAttributeProcessing.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddedImpl;
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.models.XmlAnnotations;
-import org.hibernate.boot.models.annotations.internal.EmbeddedJpaAnnotation;
 import org.hibernate.boot.models.annotations.internal.TargetXmlAnnotation;
 import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper;
 import org.hibernate.boot.models.xml.internal.XmlProcessingHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedIdAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedIdAttributeProcessing.java
index 000a8837bbef..5887b216a3cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedIdAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedIdAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToManyAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToManyAttributeProcessing.java
index ea7ddcfda89b..6853fa8cc373 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToManyAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToManyAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToOneAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToOneAttributeProcessing.java
index 9039fee7a155..5b50b4b15078 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToOneAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/ManyToOneAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToManyAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToManyAttributeProcessing.java
index 8497744b582d..e28a0c3e3c99 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToManyAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToManyAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToOneAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToOneAttributeProcessing.java
index 993f3010b9c0..5247e4426ad4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToOneAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/OneToOneAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/PluralAnyMappingAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/PluralAnyMappingAttributeProcessing.java
index 1f6b3140fdc6..4a961e627b13 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/PluralAnyMappingAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/PluralAnyMappingAttributeProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.attr;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/ForeignKeyProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/ForeignKeyProcessing.java
index a69c165bf7b1..ff9a727782ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/ForeignKeyProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/ForeignKeyProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/JoinColumnProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/JoinColumnProcessing.java
index 6703e0f72039..ab17c373dbec 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/JoinColumnProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/JoinColumnProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/TableProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/TableProcessing.java
index 50d66966c2f2..aca2903759f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/TableProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/db/TableProcessing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.internal.db;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/PersistenceUnitMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/PersistenceUnitMetadata.java
index 991aef335a66..c2fc964ccfe0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/PersistenceUnitMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/PersistenceUnitMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocument.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocument.java
index 7de6281f2407..f5a050943428 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocument.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocument.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java
index eac3c6937be5..2eef6cccadbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessingResult.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessingResult.java
index a057011416b6..b7b3c1c0fa45 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessingResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessingResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
index 40f4cd598030..535db74216e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessingResult.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessingResult.java
index 95f871961cbf..713c40ec96d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessingResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessingResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
index ce977e9093b5..115b396ef4f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.models.xml.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/AbstractNamedQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/query/AbstractNamedQueryBuilder.java
index c5d9f99a057c..b9674caa53fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/AbstractNamedQueryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/AbstractNamedQueryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/BootQueryLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/query/BootQueryLogging.java
index 9d46983f369b..39fc945b46ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/BootQueryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/BootQueryLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/FetchDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/FetchDescriptor.java
index 7dded26f8a2c..aaa1ec64ee8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/FetchDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/FetchDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
index d949f74c79cf..5c9130bfc939 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/ImplicitHbmResultSetMappingDescriptorBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/query/ImplicitHbmResultSetMappingDescriptorBuilder.java
index b13c4378903b..d2eed186ca1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/ImplicitHbmResultSetMappingDescriptorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/ImplicitHbmResultSetMappingDescriptorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java
index f0b2ce3e01c0..ad9ba9327eb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java
index 45b22fb4ff7c..1b1ce0aa8cc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java
index c75e3db4ded9..2a05ab0d1fd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java
index 7042919d99db..d2eb92de8d54 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedResultSetMappingDescriptor.java
index fe9d33c1a5e5..9105bc1eb2b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedResultSetMappingDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedResultSetMappingDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/ResultDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/ResultDescriptor.java
index 4f9ce0461a2f..decb05e701c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/ResultDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/ResultDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java
index a06d01c7c2fd..35e0fa75cbe6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
index 3f2eacb23d80..80b3e22c06b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
index 4740514a0a0a..d20ea3450e05 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry;
 
@@ -84,7 +82,7 @@ public BootstrapServiceRegistryBuilder applyClassLoader(ClassLoader classLoader)
 
 	/**
 	 * Defines when the lookup in the thread context {@code ClassLoader} is done.
-	 * 
+	 *
 	 * @param precedence The lookup precedence
 	 */
 	public void applyTcclLookupPrecedence(TcclLookupPrecedence precedence) {
@@ -180,7 +178,7 @@ public BootstrapServiceRegistry build() {
 			if ( providedClassLoaders != null )  {
 				classLoaders.addAll( providedClassLoaders );
 			}
-			
+
 			classLoaderService = new ClassLoaderServiceImpl( classLoaders,tcclLookupPrecedence );
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java
index e26c7df629f7..181c26011d73 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java
index 89616e548359..4ca56de1222a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
index 344969d4bcaa..e2d0d320a710 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry;
 
@@ -37,7 +35,7 @@
  * Configuration properties are enumerated by {@link AvailableSettings}.
  *
  * @author Steve Ebersole
- * 
+ *
  * @see StandardServiceRegistryImpl
  * @see BootstrapServiceRegistryBuilder
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedClassLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedClassLoader.java
index 5e214414b1c5..e9469f0e07dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedClassLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedClassLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.internal;
 
@@ -11,7 +9,6 @@
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.Optional;
 
 import org.hibernate.internal.util.ExceptionHelper;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
index 32888ac6277b..392482a913ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/AggregatedServiceLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
index 6b541ecaac01..e281eae445f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/TcclLookupPrecedence.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/TcclLookupPrecedence.java
index 80d2dd6e28e2..5e0e0cd85696 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/TcclLookupPrecedence.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/TcclLookupPrecedence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.internal;
 
@@ -13,7 +11,7 @@
 /**
  * Defines when the lookup in the current thread context {@link ClassLoader} should be
  * done according to the other ones.
- * 
+ *
  * @author Cédric Tabin
  */
 public enum TcclLookupPrecedence {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
index 88af1a78a137..ecfa22ef1109 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.spi;
 
@@ -94,7 +92,7 @@ default  Class classForTypeName(String className) {
 	 *
 	 * @param serviceContract The java type defining the service contract
 	 * @param  The type of the service contract
-	 *     
+	 *
 	 * @return The ordered set of discovered services.
 	 *
 	 * @see org.hibernate.service.JavaServiceLoadable
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java
index c80a4dba9086..4d1e30a92a73 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.classloading.spi;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
index 9b6de3c3e50e..09bd54f8a212 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.internal;
 
@@ -227,7 +225,7 @@ public synchronized void destroy() {
 			}
 		}
 	}
-	
+
 	private synchronized void destroy(ServiceBinding serviceBinding) {
 		serviceBinding.getLifecycleOwner().stopService( serviceBinding );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
index ab7f5546aa19..13b1148a839b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/SimpleStrategyRegistrationImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/SimpleStrategyRegistrationImpl.java
index b01eb1b50eb5..70ffb0254513 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/SimpleStrategyRegistrationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/SimpleStrategyRegistrationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistration.java
index 166e0f3e6477..41fff9838541 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistrationProvider.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistrationProvider.java
index a7b9dcd2397a..ebe9aac61684 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistrationProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/StrategyRegistrationProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/AggregatedDialectSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/AggregatedDialectSelector.java
index 87344a9c5f3f..3c028171749f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/AggregatedDialectSelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/AggregatedDialectSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
index 209921c4bdf5..75993f78e888 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultDialectSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java
index 311d19e351ad..5ff662d7e140 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/LazyServiceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/LazyServiceResolver.java
index 43c6e171fe5e..c855c5b8a694 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/LazyServiceResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/LazyServiceResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
index 8e4f36a0eabf..0dc737194b00 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
index dab4471b77c9..ae7767f317e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/DialectSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/DialectSelector.java
index e7100310fc2d..fc6c97d87f87 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/DialectSelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/DialectSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategyCreator.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategyCreator.java
index 3947251a8fa1..175d20e6e3b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategyCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategyCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java
index f216c618b20f..2c9efd78a256 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java
index f88d60bdeb73..4e6604c8bc6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.registry.selector.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java
index 6b077ecc7c91..80ec3df803cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java
index 0598531510b6..4f2bbc27535d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
index 081e71b245fe..2db486b4c15d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
index 01c1cf54da79..0f978783fdb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilderImplementor.java
index cfb3848502a6..899690d62ec4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
index 93256b10c7a9..820a10c286bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java
index cbc446643337..6bcca75f7fa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AccessType.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AccessType.java
index 541d7542bdb5..e931aa757ed6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AccessType.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributions.java
index 541d407b9f72..982f64a5d62d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributor.java
index 2efaef2d4542..534e0c1742d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalMappingContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BasicTypeRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BasicTypeRegistration.java
index 6f58794f7d6e..73e4be7a626e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BasicTypeRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BasicTypeRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
index 6a1c6938aef2..c22155f35fa1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassLoaderAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassLoaderAccess.java
index fe3e2a3709f1..4821bb5e1ace 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassLoaderAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassLoaderAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/EffectiveMappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/EffectiveMappingDefaults.java
index fe1dfe65409d..af538f097db0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/EffectiveMappingDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/EffectiveMappingDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
index 7c17817b3b9a..0e44f45d6b4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/JpaOrmXmlPersistenceUnitDefaultAware.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/JpaOrmXmlPersistenceUnitDefaultAware.java
index c47d022afeb2..94139c5de800 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/JpaOrmXmlPersistenceUnitDefaultAware.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/JpaOrmXmlPersistenceUnitDefaultAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MappingDefaults.java
index dee9ced24c24..9d3997f44900 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MappingDefaults.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MappingDefaults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
index 24b41751a1b2..283806e7d521 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderFactory.java
index 368096e83467..3b3d62e6e9d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderImplementor.java
index c7a7687698bf..54d83458e585 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderInitializer.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderInitializer.java
index 69f329d040d2..01e59a72489b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
index 81560ce5dbec..a5967799d7c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
index a43b119839d8..560f08854b1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
index 30d25daa4d9c..c6b451cc5285 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataSourcesContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataSourcesContributor.java
index a4677dedf437..f7a3ea304564 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataSourcesContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataSourcesContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/NaturalIdUniqueKeyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/NaturalIdUniqueKeyBinder.java
index dbb109434ca3..6a434aceeb36 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/NaturalIdUniqueKeyBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/NaturalIdUniqueKeyBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/PropertyData.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/PropertyData.java
index 2a89f1cd8589..fc00ce54bd4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/PropertyData.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/PropertyData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SecondPass.java
index 6c407cad067c..0b4d3f030ebd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SecondPass.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SecondPass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderFactory.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderFactory.java
index d78c2e05a8b3..e4e6a687a0e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderImplementor.java
index a26f11ca11ca..d5793e8ed28b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderService.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderService.java
index 2deb121cdfc4..1c64fe9bc0ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderService.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryBuilderService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
index 27d2d4e33568..8b14e9069a45 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java
index 52a923545408..3d7320b9a461 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java
index 099a3ea3ba0f..674057df706e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.xsd;
 
@@ -221,5 +219,5 @@ public static XsdDescriptor getJPA32() {
 			return jpa32;
 		}
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java
index 3a3b49a94a44..938794ab3bf9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.xsd;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java
index 02563969e91f..c4616e3ef1a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.xsd;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdDescriptor.java
index e68529dac559..4eac41a65be8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.xsd;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdHelper.java
index da847568e343..0ba5b7b6834a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/XsdHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.xsd;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeLogging.java
index f78d9b712045..e6f5d42148e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/VersionMismatchException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/VersionMismatchException.java
index 52a104fcc8f4..0c4e144ac097 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/VersionMismatchException.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/VersionMismatchException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
index 7fcb1503a704..0323a9b66668 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
index 5b5c4c246682..46c3acca09bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java
index 619156d8b15c..ed1124720297 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
@@ -11,7 +9,6 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.Hibernate;
 import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.NoopCollectionTracker;
@@ -22,7 +19,6 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CompositeOwner;
-import org.hibernate.engine.spi.CompositeTracker;
 import org.hibernate.engine.spi.ExtendedSelfDirtinessTracker;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.internal.util.collections.ArrayHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
index 87dbc33729d9..d45773342acb 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassLocator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassLocator.java
index 8724026ca5aa..42318f3d315e 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
index e696d1beb802..902031912ed5 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
index 93d4c5489848..d1dae5ea3edf 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
index b1f5c97471e8..e17bd8bd3dc9 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
index dabf4f5643f1..1b2f7b05ce06 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
index d666ae43b10d..282816ea0d94 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
index 098db0b8051a..be80764c23e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
index 4e687362419d..ea6ded64baba 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
 import java.util.Collection;
 import java.util.Objects;
 
-import jakarta.persistence.Embedded;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
index ecbc1ede0fea..c5622e3669cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/OverridingClassFileLocator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/OverridingClassFileLocator.java
index 2f64dabbdd70..42bd2e9760fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/OverridingClassFileLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/OverridingClassFileLocator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
index 5457474a38c9..42b2b464d86f 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
@@ -16,7 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import jakarta.persistence.Embedded;
 
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/UnloadedTypeDescription.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/UnloadedTypeDescription.java
index e2ca1bde11e4..0e024285b61b 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/UnloadedTypeDescription.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/UnloadedTypeDescription.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/CompositeOwnerTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/CompositeOwnerTracker.java
index d7aebf714440..f7538e201b9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/CompositeOwnerTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/CompositeOwnerTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/DirtyTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/DirtyTracker.java
index baabf9ddd0ec..65c9271e9726 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/DirtyTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/DirtyTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java
index 623da2789829..3d316c0bfaec 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleCollectionTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleCollectionTracker.java
index b37f4a35fc3b..2942150fde09 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleCollectionTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleCollectionTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleFieldTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleFieldTracker.java
index 8c432bdaaf1a..c23e8a74a3bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleFieldTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleFieldTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedFieldTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedFieldTracker.java
index c13a364af9ad..a0c1cc1afeab 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedFieldTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedFieldTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java
index 40d2f94b47a9..0e7abd35c1a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java
index 5ea85f65cf2f..49a3f7532a9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
 import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.persistence.Basic;
-import jakarta.persistence.Convert;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java
index 06086c65d2e8..7a68e2bebc66 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContextWrapper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContextWrapper.java
index ebdc531bd277..c7f38e7132d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContextWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContextWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementException.java
index 017e8e79a5dd..fea29356ac60 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementInfo.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementInfo.java
index 7875a5f4518e..36ca93c36eda 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java
index cc20b56a7baa..6c0da943d283 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
index 0cc697efcc68..23b810a7aa3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
index 4e5da5c87d05..07d1c0c35c00 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
@@ -15,7 +13,7 @@
 
 /**
  * Contract for controlling how lazy properties get initialized.
- * 
+ *
  * @author Gavin King
  */
 public interface LazyPropertyInitializer {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedClass.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedClass.java
index 9518d5f4f5a1..90312245d24d 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedField.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedField.java
index 68afe4033880..1a5da6c08d25 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedField.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/UnloadedField.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractInterceptor.java
index 8a15792dc351..1a1b726fcf83 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractLazyLoadInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractLazyLoadInterceptor.java
index b1537f1a6c36..b33c8ea6ed98 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractLazyLoadInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractLazyLoadInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
index de20cc97109a..56b22f868898 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeLazyAttributeInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeLazyAttributeInterceptor.java
index 5ff6b950c8c3..62f4c021279f 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeLazyAttributeInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeLazyAttributeInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java
index 1f54399d177a..debfa490666e 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
index b6adc7443ccd..e09084f2f246 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeDescriptor.java
index 8f0ba8647737..4dd3d2750130 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoadingInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoadingInterceptor.java
index 3555d8d1acca..44b2116efa66 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoadingInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoadingInterceptor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
 import java.util.Collection;
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributesMetadata.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributesMetadata.java
index 8bd5fdbe401b..f98d4305f92c 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributesMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributesMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyFetchGroupMetadata.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyFetchGroupMetadata.java
index f0a468d1f9ea..05a99b1b8ebf 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyFetchGroupMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyFetchGroupMetadata.java
@@ -1,13 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
 /**
-  * Information about a particular bytecode lazy attribute grouping.
+ * Information about a particular bytecode lazy attribute grouping.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/SessionAssociableInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/SessionAssociableInterceptor.java
index 7f60ffddbc19..8c8458d21f39 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/SessionAssociableInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/SessionAssociableInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.enhance.spi.interceptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataNonPojoImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataNonPojoImpl.java
index 172e02e56e2e..513742cb0836 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataNonPojoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataNonPojoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
index 7cf9be90a1d9..019a49c8ec01 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java
index 9f57e04996c3..e50c0a8edf7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/ProxyFactoryFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/ProxyFactoryFactoryInitiator.java
index de56b373bb41..dc77f00f28b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/ProxyFactoryFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/ProxyFactoryFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/SessionFactoryObserverForBytecodeEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/SessionFactoryObserverForBytecodeEnhancer.java
index 360273d70636..cecab74b87fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/SessionFactoryObserverForBytecodeEnhancer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/SessionFactoryObserverForBytecodeEnhancer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
index ad8b9310144c..4aea83519dc5 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
index 5d95379bf862..6438289cc87d 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
index ae9f1900175e..bd99d455d46c 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java
index 5af627d83941..f313eb0860b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PassThroughInterceptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PassThroughInterceptor.java
index 09b108a148e9..a1083e8d9bff 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PassThroughInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PassThroughInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java
index efc0469b4f88..accda36d0f4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ProxyFactoryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ProxyFactoryFactoryImpl.java
index ecb02e2fe128..c081129329c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ProxyFactoryFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ProxyFactoryFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ReflectionOptimizerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ReflectionOptimizerImpl.java
index bd96c181c962..811a424ee28d 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ReflectionOptimizerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ReflectionOptimizerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/BytecodeProviderImpl.java
index 3baa657c6383..f7d7c1fd5cb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/BytecodeProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/BytecodeProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.none;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/DisallowedProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/DisallowedProxyFactory.java
index 0ca4d82ab13b..6b16013f34a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/DisallowedProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/DisallowedProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.none;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoProxyFactoryFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoProxyFactoryFactory.java
index 7713a6db5235..2782d1c5a670 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoProxyFactoryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoProxyFactoryFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.none;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoneBasicProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoneBasicProxyFactory.java
index 4a2e206d5f45..c9d01fbffba1 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoneBasicProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/none/NoneBasicProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.none;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BasicProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BasicProxyFactory.java
index 7cf4f081d7dc..f6be9c137291 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BasicProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BasicProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeEnhancementMetadata.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeEnhancementMetadata.java
index 55cfb0e5a74b..c781835b930b 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeEnhancementMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeEnhancementMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeProvider.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeProvider.java
index 077c9e5869d6..74a764b31805 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/BytecodeProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java
index 8b2652b13233..076a57307344 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/NotInstrumentedException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/NotInstrumentedException.java
index 1c441ddfaa93..be5d6de50cee 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/NotInstrumentedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/NotInstrumentedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ProxyFactoryFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ProxyFactoryFactory.java
index 2c54221142de..e050ccd30fe7 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ProxyFactoryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ProxyFactoryFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ReflectionOptimizer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ReflectionOptimizer.java
index 1e0f1882d25d..8a4c01ac6344 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ReflectionOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ReflectionOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java
index 05012782ca8e..bdb78b1afc84 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache;
 
@@ -39,5 +37,5 @@ public CacheException(String message, Throwable cause) {
 	public CacheException(Throwable cause) {
 		super( cause );
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/MutableCacheKeyBuilder.java b/hibernate-core/src/main/java/org/hibernate/cache/MutableCacheKeyBuilder.java
index 2cb526fe4f9b..84be37086186 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/MutableCacheKeyBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/MutableCacheKeyBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/NoCacheRegionFactoryAvailableException.java b/hibernate-core/src/main/java/org/hibernate/cache/NoCacheRegionFactoryAvailableException.java
index 2263ac1b9cc6..715d5a516098 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/NoCacheRegionFactoryAvailableException.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/NoCacheRegionFactoryAvailableException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java
index 77b039ac0b34..fdde3065170f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache;
 
@@ -11,7 +9,7 @@
  *
  * @author Steve Ebersole
  *
- * @deprecated Moved, but still need this definition for ehcache 
+ * @deprecated Moved, but still need this definition for ehcache
  */
 @Deprecated(since="4")
 public interface RegionFactory extends org.hibernate.cache.spi.RegionFactory {
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/AbstractDomainDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/AbstractDomainDataCachingConfig.java
index 49ef73b326df..6e8ced04e688 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/AbstractDomainDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/AbstractDomainDataCachingConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
index a00451d634c8..7efc97efdcb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
index 512c0c527257..28691b89c9a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
index 23e21eca999d..5905b4f9ee98 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/NaturalIdDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/NaturalIdDataCachingConfigImpl.java
index 03e7c885565e..82d10f3affe5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/NaturalIdDataCachingConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/NaturalIdDataCachingConfigImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
index f690fa8722af..95d76e926012 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataCachingConfig.java
index 5056a7b54d64..cc29b9942e75 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataCachingConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionBuildingContext.java
index c4fa2b29206e..3af0723c448c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionBuildingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionConfig.java
index d6e7be9746d8..56eb827d42ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/DomainDataRegionConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
index 46fa7f2288da..b021d5da1f74 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/NaturalIdDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/NaturalIdDataCachingConfig.java
index d25c63b47c25..949f49a9c58b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/NaturalIdDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/NaturalIdDataCachingConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.cfg.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/BasicCacheKeyImplementation.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/BasicCacheKeyImplementation.java
index 2e0f01526875..7f327b1d4070 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/BasicCacheKeyImplementation.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/BasicCacheKeyImplementation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyImplementation.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyImplementation.java
index 1c0569d37c30..2034eb29013d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyImplementation.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/CacheKeyImplementation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java
index 4bd82d6d0823..2da5fd678e17 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
@@ -40,7 +38,7 @@
  * 
    
  * For this functionality to be used, {@value org.hibernate.cfg.AvailableSettings#AUTO_EVICT_COLLECTION_CACHE} must be
  * enabled.  For performance reasons, it's disabled by default.
- * 
+ *
  * @author Andreas Berger
  */
 public class CollectionCacheInvalidator
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
index c32f1e68353a..529bff43ccfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
index 29cbd8d0f112..08a5a6cb195f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
index 87a8596d627e..b6fb7cebcc93 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java
index 7e37536d4196..324f2dc8af5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
index 2638ba120015..f3063b575c41 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingTransactionSynchronizationImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingTransactionSynchronizationImpl.java
index 3e24e19c9b08..86d18eb910e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingTransactionSynchronizationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingTransactionSynchronizationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java
index 8e06f177c518..5ee4371a98d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
index 718549ced484..581cd8798e8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
@@ -25,7 +23,7 @@
 
 /**
  * Initiator for the {@link RegionFactory} service.
- * 
+ *
  * @author Hardy Ferentschik
  * @author Brett Meyer
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/SimpleCacheKeysFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/SimpleCacheKeysFactory.java
index 6173f8a09d8f..dca13435ad2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/SimpleCacheKeysFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/SimpleCacheKeysFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardTimestampsCacheFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardTimestampsCacheFactory.java
index 2d44b050faa5..d1090f7d1987 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardTimestampsCacheFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardTimestampsCacheFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java
index 1f1c0df71187..624d06ac5f1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheDisabledImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheDisabledImpl.java
index bff0352309c8..0e38169b9c7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheDisabledImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheDisabledImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java
index a27d00f1f937..ad6ee622703b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractCacheTransactionSynchronization.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractCacheTransactionSynchronization.java
index 49c11d29bdf8..e2ad4c4f1360 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractCacheTransactionSynchronization.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractCacheTransactionSynchronization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java
index b8ecfaa62f6b..0a67c2889518 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java
index a0695d1c2d0e..595a02b9c72b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKeysFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKeysFactory.java
index 4c20da998bf9..a442a4888325 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKeysFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKeysFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheTransactionSynchronization.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheTransactionSynchronization.java
index 7f83994e1d93..1cb6c6ccb0b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheTransactionSynchronization.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheTransactionSynchronization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/DirectAccessRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/DirectAccessRegion.java
index 52d8eca49b93..70923689189f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/DirectAccessRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/DirectAccessRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/DomainDataRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/DomainDataRegion.java
index acb781e0ad21..577610ff7278 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/DomainDataRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/DomainDataRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/ExtendedStatisticsSupport.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/ExtendedStatisticsSupport.java
index 672f6c3fd5a2..0d36305710f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/ExtendedStatisticsSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/ExtendedStatisticsSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryKey.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryKey.java
index ba0430cc4ee7..b712870f2f06 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java
index edf6838d8ca5..1b6509cc2a31 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
@@ -26,7 +24,7 @@
  * {@linkplain TimestampsCache#invalidate invalidated} since the result
  * list was read from the database and {@linkplain #put stored} in the
  * query result cache.
- * 
+ *
  * @author Gavin King
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsRegion.java
index 5249e6e675d8..85d4a5128fe3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java
index 8ce1fbb09d34..9c13474bbcbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java
index 27fcf31cc9fb..9ecf3eb0a5ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
@@ -118,9 +116,9 @@ DomainDataRegion buildDomainDataRegion(
 	 */
 	QueryResultsRegion buildQueryResultsRegion(String regionName, SessionFactoryImplementor sessionFactory);
 
-	 /**
-	  * Create a named {@link Region} for holding timestamps used to
-	  * determine when a cached query result set is stale.
-	  */
+	/**
+	 * Create a named {@link Region} for holding timestamps used to
+	 * determine when a cached query result set is stale.
+	 */
 	TimestampsRegion buildTimestampsRegion(String regionName, SessionFactoryImplementor sessionFactory);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
index 8ae58622baf0..119c4910da03 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/StandardCacheTransactionSynchronization.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/StandardCacheTransactionSynchronization.java
index eeab0da19d91..bccdd2946724 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/StandardCacheTransactionSynchronization.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/StandardCacheTransactionSynchronization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCache.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCache.java
index ee1cc47d23c2..8bce6c279968 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCache.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCacheFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCacheFactory.java
index bcd73fe22759..9a5fc77abaef 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCacheFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsCacheFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsRegion.java
index 29663d0972a2..390395c28518 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/TimestampsRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
index 759079e69e86..5b3caec65985 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java
index 9f751adcf1c5..d6927004462d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CollectionDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CollectionDataAccess.java
index 4cd6faae8d9d..789b58d00c48 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CollectionDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CollectionDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
index ed5d5eebaa78..35624240dcb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
index c5a709641562..f8a2202b52f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/SoftLock.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/SoftLock.java
index b37b7d32d094..541bfcc0d49c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/SoftLock.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/SoftLock.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/UnknownAccessTypeException.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/UnknownAccessTypeException.java
index 1989d231e1e8..9e1eb971bfa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/UnknownAccessTypeException.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/UnknownAccessTypeException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.access;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java
index 18e2bbb10fbb..e2fde83dd46d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java
index e8628d58b555..9b26367fc5b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
@@ -40,7 +38,7 @@ public static Serializable[] disassemble(
 			if ( nonCacheable!=null && nonCacheable[i] ) {
 				disassembled[i] = LazyPropertyInitializer.UNFETCHED_PROPERTY;
 			}
-			else if ( row[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY 
+			else if ( row[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY
 					| row[i] == PropertyAccessStrategyBackRefImpl.UNKNOWN ) {
 				disassembled[i] = (Serializable) row[i];
 			}
@@ -67,7 +65,7 @@ public static Object[] assemble(
 			final Object owner) {
 		Object[] assembled = new Object[row.length];
 		for ( int i = 0; i < types.length; i++ ) {
-			if ( row[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY 
+			if ( row[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY
 					|| row[i] == PropertyAccessStrategyBackRefImpl.UNKNOWN ) {
 				assembled[i] = row[i];
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java
index 27f22b93582f..f642fc618b5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java
index 8037f3d3a591..8c846422c592 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java
index b1cca8e3a2b3..c189d5127d8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java
index 1041b9338e6a..e76e34f3b0ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
@@ -12,7 +10,6 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.service.spi.EventListenerGroup;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.PreLoadEvent;
 import org.hibernate.event.spi.PreLoadEventListener;
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
index 743ad20ba8d2..823984385ca6 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
@@ -11,7 +9,6 @@
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
index 83bdb6a9ed14..3fe56664953c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
index 4cd143e17ceb..64382d8797a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
index 8e824307c7f1..f809a3d88f5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.entry;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
index 2d486e0700b4..d016bfb6f762 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCollectionDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCollectionDataAccess.java
index 1556561a73af..e7969a30ac02 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCollectionDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCollectionDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
index 45af4a060c3f..e5b0dd3c92d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractEntityDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractEntityDataAccess.java
index 7370895f7b76..a6a94a3d9cee 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractEntityDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractEntityDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractNaturalIdDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractNaturalIdDataAccess.java
index 8b84cfaca3c1..311327d92ace 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractNaturalIdDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractNaturalIdDataAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
index 45ff80bd82a0..10df20117123 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractRegion.java
index d407da4061ef..0f6b683a8406 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractRegion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
index 458165af6eec..d35f66295707 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CacheUtils.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CacheUtils.java
index b9e92fe2bb22..afd18f9e5089 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CacheUtils.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CacheUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java
index a5bf9aa7e44c..c0ea69ae6bbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java
index d62441fd4238..17e3d4f2d549 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
index c67a024859b3..8d6cd483765b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionTransactionAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionTransactionAccess.java
index 10fd566be7b4..96a2ecf19737 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionTransactionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionTransactionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
@@ -10,8 +8,6 @@
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.cache.spi.DomainDataRegion;
 import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.support.AbstractCollectionDataAccess;
-import org.hibernate.cache.spi.support.DomainDataStorageAccess;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DirectAccessRegionTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DirectAccessRegionTemplate.java
index cc2599316787..2dfbb3eabd92 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DirectAccessRegionTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DirectAccessRegionTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionImpl.java
index 44bda4b3990d..7b6c66b0d0a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
index a21d24e88073..a8a9951a3c19 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataStorageAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataStorageAccess.java
index 06674aaf56fa..0d34ec9e634c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataStorageAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataStorageAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java
index 12ac7ffbd08a..d6ef66121e54 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
index caa498edf95b..650ff08fd27f 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
 import org.hibernate.cache.cfg.spi.EntityDataCachingConfig;
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.cache.spi.DomainDataRegion;
-import org.hibernate.cache.spi.SecondLevelCacheLogger;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.SoftLock;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
index 5d3f2e601703..aa01d99591cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityTransactionalAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityTransactionalAccess.java
index 3aa8aca3e1e0..5fbef76861bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityTransactionalAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityTransactionalAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java
index c749ae88ff61..2154dc4aa4cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java
index 1cb1e6f82ac1..f7aad1f108b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
 import org.hibernate.cache.cfg.spi.NaturalIdDataCachingConfig;
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.cache.spi.DomainDataRegion;
-import org.hibernate.cache.spi.SecondLevelCacheLogger;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.SoftLock;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
index eda3f2ffd07b..895e4e373ad2 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdTransactionalAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdTransactionalAccess.java
index 66cf1a9faebb..3fd624b847fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdTransactionalAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdTransactionalAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
@@ -10,8 +8,6 @@
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.cache.spi.DomainDataRegion;
 import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.support.AbstractNaturalIdDataAccess;
-import org.hibernate.cache.spi.support.DomainDataStorageAccess;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/QueryResultsRegionTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/QueryResultsRegionTemplate.java
index aaa6e2deba43..6f0a414220da 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/QueryResultsRegionTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/QueryResultsRegionTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionFactoryTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionFactoryTemplate.java
index 1f5554a4b80a..134d2c2d65e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionFactoryTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionFactoryTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionNameQualifier.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionNameQualifier.java
index a9ea95ab325e..4508c2410be2 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionNameQualifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/RegionNameQualifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java
index 81e723a6cffd..30513dd683e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/StorageAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/StorageAccess.java
index 36c97cacbc1d..e2f25206428c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/StorageAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/StorageAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/TimestampsRegionTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/TimestampsRegionTemplate.java
index 57482e579867..593688886c85 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/TimestampsRegionTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/TimestampsRegionTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.spi.support;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AgroalSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AgroalSettings.java
index a19ec12a5a08..6aa9a031e667 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/AgroalSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/AgroalSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
index 3ea03b1280cb..025898ee8b73 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java
index 92f5dd671947..603456db05ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BytecodeSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/BytecodeSettings.java
index df5d7801e2da..a7dee97a68e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/BytecodeSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/BytecodeSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/C3p0Settings.java b/hibernate-core/src/main/java/org/hibernate/cfg/C3p0Settings.java
index 7d6f5f3887b6..f032b0a998bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/C3p0Settings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/C3p0Settings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CacheSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/CacheSettings.java
index 6e286c1c551f..a8cc4ec08afa 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/CacheSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/CacheSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
index 0716a2347e01..ad30789be6af 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DialectSpecificSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/DialectSpecificSettings.java
index fe5a2ce80e40..2aa683eb5b4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/DialectSpecificSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/DialectSpecificSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
index 56911b54d2f6..e11094ba7e62 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
@@ -166,8 +164,8 @@ public final class Environment implements AvailableSettings {
 
 		try {
 			Properties systemProperties = System.getProperties();
-		    // Must be thread-safe in case an application changes System properties during Hibernate initialization.
-		    // See HHH-8383.
+			// Must be thread-safe in case an application changes System properties during Hibernate initialization.
+			// See HHH-8383.
 			synchronized (systemProperties) {
 				GLOBAL_PROPERTIES.putAll(systemProperties);
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/EnvironmentSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/EnvironmentSettings.java
index 4c60e0aadecf..ebd0946ac18a 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/EnvironmentSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/EnvironmentSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
index 9c919550cc0e..131bc97b467d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/HikariCPSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/HikariCPSettings.java
index 75be367506c9..b3e120da4967 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/HikariCPSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/HikariCPSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
index 4aa64ef79afa..5cb640aabe69 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/JpaComplianceSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/JpaComplianceSettings.java
index 8375a4060b12..8fd6aa17d59b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/JpaComplianceSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/JpaComplianceSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ManagedBeanSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/ManagedBeanSettings.java
index c5bef3962a26..d94464530aa3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/ManagedBeanSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/ManagedBeanSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
index 98f8692713fd..cf66a8e79034 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
index 619d1f3a2709..42935db7f6e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceSettings.java
index a92821e13772..6039dd56dc2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ProxoolSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/ProxoolSettings.java
index 5d4aeb36f353..90b51eb6a7e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/ProxoolSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/ProxoolSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
index bf0fc9571831..90f29a5643e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java
index 86f7a9153076..f240b723ae7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SessionEventSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/SessionEventSettings.java
index 5dfeb935b21b..adad86ddf5dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/SessionEventSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/SessionEventSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
index 13cf0f9d123d..0a64d3515842 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
index 94d284499b23..4f928ba16ffa 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ValidationSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/ValidationSettings.java
index c20e51d62930..99421ab1a46b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/ValidationSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/ValidationSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cfg;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java b/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java
index e61aedc018aa..68db4fe33ab5 100644
--- a/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java
+++ b/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.classic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/CustomCollectionTypeSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/CustomCollectionTypeSemantics.java
index 40630473d04f..19c5cbef5aa6 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/CustomCollectionTypeSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/CustomCollectionTypeSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java
index 5998c21a72cf..331abf5420f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardArraySemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardBagSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardBagSemantics.java
index 3a03a0de403b..55a125ca40a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardBagSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardBagSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardCollectionSemanticsResolver.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardCollectionSemanticsResolver.java
index 05cf628ecf34..1e1f8aa6ad2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardCollectionSemanticsResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardCollectionSemanticsResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java
index 04a53776a37f..42d2c7f1a079 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java
index 8af17bf24039..f54706a6d08e 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardListSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardMapSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardMapSemantics.java
index c7554af60c22..eb39c450ea49 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardMapSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardMapSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedMapSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedMapSemantics.java
index 3f05ba1c78b2..606594ac572d 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedMapSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedMapSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedSetSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedSetSemantics.java
index cfae3e3c4d92..31ea86e23cb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedSetSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardOrderedSetSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSetSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSetSemantics.java
index c191fae6055f..34772b443382 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSetSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSetSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedMapSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedMapSemantics.java
index 2c68a25a9e6b..2ccc6b42595a 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedMapSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedMapSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedSetSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedSetSemantics.java
index a59ebce09739..80a975652300 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedSetSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardSortedSetSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractBagSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractBagSemantics.java
index 75bdfec672ca..23b7e0b5c086 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractBagSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractBagSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractMapSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractMapSemantics.java
index d9210ff8feaf..5a4a92469efc 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractMapSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractMapSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
index e281f5e34467..1b243e209539 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
@@ -285,10 +283,8 @@ else if ( !session.isConnected() ) {
 				}
 			}
 			else {
-				/*
-				 Whenever the collection lazy loading is triggered during the loading process,
-				 closing the connection will cause an error when RowProcessingStateStandardImpl#next() will be called.
-				 */
+				// Whenever the collection lazy loading is triggered during the loading process,
+				// closing the connection will cause an error when RowProcessingStateStandardImpl#next() will be called.
 				final PersistenceContext persistenceContext = session.getPersistenceContext();
 				if ( !session.isTransactionInProgress()
 						&& ( !persistenceContext.hasLoadContext()
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractSetSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractSetSemantics.java
index e50087cd0751..f4d34a771d6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractSetSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractSetSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/BagSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/BagSemantics.java
index 86110f14b89f..e0f973b3a25d 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/BagSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/BagSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
@@ -13,4 +11,3 @@
  */
 public interface BagSemantics, E> extends CollectionSemantics {
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionInitializerProducer.java
index 533788caa267..724fc79a4940 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java
index ae5da5e470b6..bb0f517f850b 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemanticsResolver.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemanticsResolver.java
index 3c0d9a899ca7..f85e3e6062f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemanticsResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/CollectionSemanticsResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/InitializerProducerBuilder.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/InitializerProducerBuilder.java
index 518aa3ddb08c..601bf51555f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/InitializerProducerBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/InitializerProducerBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/LazyInitializable.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/LazyInitializable.java
index 60b9c1417507..3976ba97012c 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/LazyInitializable.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/LazyInitializable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
@@ -24,7 +22,7 @@
  * 
  • the method {@link org.hibernate.Hibernate#initialize(Object)} to
  *     force it to be fetched.
  * 
- * 
+ *
  * @author Fabricio Gregorio
  */
 @Incubating
@@ -38,7 +36,7 @@ public interface LazyInitializable {
 	 * @see org.hibernate.Hibernate#isInitialized(Object)
 	 */
 	boolean wasInitialized();
-	
+
 	/**
 	 * To be called internally by the session, forcing immediate initialization.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/MapSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/MapSemantics.java
index cc5f6e18227f..58c749d60002 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/MapSemantics.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/MapSemantics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java
index e470e7ef5369..4ade676b929a 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentArrayHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java
index 1f3253e33a81..0c3d65512f70 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
index 0c07f69e3c85..68df77b5aab1 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentIdentifierBag.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentIdentifierBag.java
index 6e5754365754..a76ccdc8841b 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentIdentifierBag.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentIdentifierBag.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
index 76978d5ca4ed..7906038a1fde 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
index e8d95595c7cd..e6b481826109 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSet.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSet.java
index 270f45f9e1f8..8bc5e6778998 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedMap.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedMap.java
index 0693f54586aa..a80da8c9ea08 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedSet.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedSet.java
index b1d78e34446b..fb17318ed7d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentSortedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.collection.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/TenantIdentifierMismatchException.java b/hibernate-core/src/main/java/org/hibernate/context/TenantIdentifierMismatchException.java
index b8b89cd11900..f34263a24608 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/TenantIdentifierMismatchException.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/TenantIdentifierMismatchException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
index a60b963880a7..0cdd0b0f8e81 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java
index 3efb1d52afb0..6d279086f571 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java
index 45df8088d88f..ebf65c956b69 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/AbstractCurrentSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/spi/AbstractCurrentSessionContext.java
index bdef2bdbac90..840ce3748438 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/spi/AbstractCurrentSessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/AbstractCurrentSessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentSessionContext.java
index 579238236a1b..584885e87393 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentSessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentSessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentTenantIdentifierResolver.java b/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentTenantIdentifierResolver.java
index fdfef9720cd3..b9059eda4989 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentTenantIdentifierResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/CurrentTenantIdentifierResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.context.spi;
 
@@ -32,7 +30,7 @@ public interface CurrentTenantIdentifierResolver {
 	 * Should we validate that the tenant identifier of a "current sessions" that
 	 * already exists when {@link CurrentSessionContext#currentSession()} is called
 	 * matches the value returned here from {@link #resolveCurrentTenantIdentifier()}?
-	 * 
+	 *
 	 * @return {@code true} indicates that the extra validation will be performed;
 	 *                      {@code false} indicates it will not.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLJsonPGObjectType.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLJsonPGObjectType.java
index 3641204bdbea..f59b9da37d68 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLJsonPGObjectType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLJsonPGObjectType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java
index 76b67da320fa..42951379e98e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
index 46bdfd6ab162..1a1228821b04 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
index deb53a0dac5a..4dd14c837bf7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/BooleanDecoder.java b/hibernate-core/src/main/java/org/hibernate/dialect/BooleanDecoder.java
index 6dcb72299072..a180d1a630f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/BooleanDecoder.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/BooleanDecoder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
index 87dc14037108..0af831ba5a04 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
index db84982d6ec0..e21f8f2f47c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.dialect;
 
 import org.hibernate.internal.util.StringHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java
index 44d32e7cb482..6db8e1f7c8b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/ColumnAliasExtractor.java b/hibernate-core/src/main/java/org/hibernate/dialect/ColumnAliasExtractor.java
index 35b4464b36a0..4a7d9ee251e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/ColumnAliasExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/ColumnAliasExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
index 8b58326f883d..c414465e7962 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2GetObjectExtractor.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2GetObjectExtractor.java
index 189b53352d60..b04590bc1db1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2GetObjectExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2GetObjectExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
index 7612266186d4..f2919b223455 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2StructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2StructJdbcType.java
index ff4f138e2955..230654a15ce0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2StructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2StructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
index e52bf220646d..77b96de1f6aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java
index 3abf55648652..1699d8ec28e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
index 3726cc5a9492..8db74f6ce112 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java
index 86e7bfa76109..85a2a328109a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
index 74c30d0dc59b..40f1d5e1be18 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DatabaseVersion.java b/hibernate-core/src/main/java/org/hibernate/dialect/DatabaseVersion.java
index 2068b60082f0..2086c8bc8596 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DatabaseVersion.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DatabaseVersion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
index c5c94647c8ac..a7efa68d55bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -1646,7 +1644,6 @@ private boolean sameColumnType(int typeCode1, int typeCode2) {
 	 * 
    
 	 * An implementation may set configuration properties from
 	 * {@link #initDefaultProperties()}, though it is discouraged.
-	 the
 	 * @return the Hibernate configuration properties
 	 *
 	 * @see #initDefaultProperties()
@@ -1893,7 +1890,7 @@ public LobMergeStrategy getLobMergeStrategy() {
 
 
 	// native identifier generation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	
+
 	/**
 	 * The name identifying the "native" id generation strategy for this dialect.
 	 * 
    
@@ -2355,7 +2352,7 @@ public String getBeforeDropStatement() {
 	 * @param tableName The name of the table to drop
 	 *
 	 * @return The {@code drop table} statement as a string
-	 * 
+	 *
 	 * @deprecated No longer used
 	 *
 	 * @see StandardTableExporter#getSqlDropStrings
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
index 42c21aedcb47..f8fbedd30163 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -124,7 +122,7 @@ public static Dialect extractRealDialect(Dialect dialect) {
 		}
 	}
 
-    /**
+	/**
 	 * Exposed so to allow code needing to know the implementation.
 	 * @return the wrapped Dialect
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
index 0a3613f28248..fadbb62c8432 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DmlTargetColumnQualifierSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/DmlTargetColumnQualifierSupport.java
index 04394812d13c..abe63990d678 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DmlTargetColumnQualifierSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DmlTargetColumnQualifierSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupport.java
index 9325ca701db0..9fd73d05d0fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupportImpl.java
index 63a39662d4c6..7e2fba08edd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupportImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/FunctionalDependencyAnalysisSupportImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/GroupByConstantRenderingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/GroupByConstantRenderingStrategy.java
index 867194056ea5..a30699d79868 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/GroupByConstantRenderingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/GroupByConstantRenderingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/GroupBySummarizationRenderingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/GroupBySummarizationRenderingStrategy.java
index 88030005d173..e9ff8963b86d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/GroupBySummarizationRenderingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/GroupBySummarizationRenderingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
index 92011616a55a..d74c6d36e968 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -343,11 +341,11 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 	}
 
 	/**
-     * H2 requires a very special emulation, because {@code unnest} is pretty much useless,
-     * due to issue 1815.
-     * This emulation uses {@code array_get}, {@code array_length} and {@code system_range} functions to roughly achieve the same,
-     * but requires that {@code system_range} is fed with a "maximum array size".
-     */
+	 * H2 requires a very special emulation, because {@code unnest} is pretty much useless,
+	 * due to issue 1815.
+	 * This emulation uses {@code array_get}, {@code array_length} and {@code system_range} functions to roughly achieve the same,
+	 * but requires that {@code system_range} is fed with a "maximum array size".
+	 */
 	protected int getMaximumArraySize() {
 		return 1000;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java
index 1147a311876f..9baf99f8c975 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2DurationIntervalSecondJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -12,7 +10,6 @@
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.Duration;
-import java.time.Instant;
 
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.ValueBinder;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
index b1816ee8cf2f..c6a70e312f39 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java
index 093530fd5bf9..8dd6df252d28 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -43,7 +41,6 @@
 import org.hibernate.sql.model.internal.TableUpdateStandard;
 
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
-import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
 
 /**
  * A SQL AST translator for H2.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
index f755dd545196..71fad2b71c89 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
index 8acf73219004..5a44de60a7c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java
index cc73e8ff7bb6..c9e1e3c2a315 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
index 68b7e4eb0204..5ff07f9d2a77 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLSqlAstTranslator.java
index aac2ecdc232a..cd3431c69c97 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InnoDBStorageEngine.java b/hibernate-core/src/main/java/org/hibernate/dialect/InnoDBStorageEngine.java
index b576b0fe148f..a54825ec3527 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/InnoDBStorageEngine.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/InnoDBStorageEngine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
index 4e377ccde77a..578d56fb40f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/LobMergeStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/LobMergeStrategy.java
index ef088413e94f..d7782bad5819 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/LobMergeStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/LobMergeStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
index a4ca109f3252..6eb4b6252db6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
index 78272afe716e..08c24d6d988d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MyISAMStorageEngine.java b/hibernate-core/src/main/java/org/hibernate/dialect/MyISAMStorageEngine.java
index d62e3fe0a1b5..bac3f35c9593 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MyISAMStorageEngine.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MyISAMStorageEngine.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
 /**
  * Represents the MyISAM storage engine.
- * 
+ *
  * @author Vlad Mihalcea
  */
 public class MyISAMStorageEngine implements MySQLStorageEngine{
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLCastingJsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLCastingJsonJdbcType.java
index ac500b651549..39b0d2e5355c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLCastingJsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLCastingJsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
index 5ccacaa7afe6..698669d86128 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
index 548840ef7f25..ccd9de6c591f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
index 44256d3a9c9d..bee9c4bd74a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLStorageEngine.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLStorageEngine.java
index 7f8f7c920f7c..a9ae70478965 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLStorageEngine.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLStorageEngine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -12,7 +10,7 @@
  * @author Vlad Mihalcea
  */
 public interface MySQLStorageEngine {
-	
+
 	boolean supportsCascadeDelete();
 
 	String getTableTypeString(String engineKeyword);
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/NationalizationSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/NationalizationSupport.java
index 2832d79c415a..f01db6f6e2b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/NationalizationSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/NationalizationSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/NullOrdering.java b/hibernate-core/src/main/java/org/hibernate/dialect/NullOrdering.java
index aaa27abe893a..652b21c9b742 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/NullOrdering.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/NullOrdering.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
index fbfef65f31ff..da66ea545d2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -294,4 +292,3 @@ public String toString() {
 		return "OracleArrayTypeDescriptor(" + typeName + ")";
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcTypeConstructor.java
index 4bfaac4cf5c0..cc117bbd6f4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcTypeConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleBaseStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleBaseStructJdbcType.java
index e8db81222ede..2f34f0e0056f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleBaseStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleBaseStructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -11,23 +9,18 @@
 import java.sql.SQLException;
 import java.util.Locale;
 
-import org.hibernate.HibernateException;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.UserDefinedObjectType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.SelectableMapping;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 
-import oracle.sql.TIMESTAMPTZ;
 
 /**
  * @author Christian Beikov
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleBooleanJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleBooleanJdbcType.java
index 0e2621158c5d..8a315de8f064 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleBooleanJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleBooleanJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
index 3bfc63b02b02..74508089fde9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -48,8 +46,6 @@
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
-import org.hibernate.internal.util.JdbcExceptionHelper;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.mapping.UserDefinedType;
 import org.hibernate.mapping.CheckConstraint;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java
index 276002bf6bdd..175c6d17d4d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleEnumJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJdbcHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJdbcHelper.java
index b443072bdbd3..2b2db0495b80 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJdbcHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJdbcHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonJdbcType.java
index c5a040163cb3..d4cbc8fb2d23 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcType.java
index 7c4e4269cdad..bed9692f1fc4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -44,4 +42,3 @@ public String toString() {
 		return "OracleNestedTableTypeDescriptor(" + getSqlTypeName() + ")";
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcTypeConstructor.java
index 75f3685b6e0f..36f717887055 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleNestedTableJdbcTypeConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOrdinalEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOrdinalEnumJdbcType.java
index 1b036768a3fd..06ea5ac89809 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOrdinalEnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOrdinalEnumJdbcType.java
@@ -1,34 +1,24 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
 import jakarta.persistence.EnumType;
-import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.NamedAuxiliaryDatabaseObject;
-import org.hibernate.engine.jdbc.Size;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 import org.hibernate.type.descriptor.jdbc.BasicExtractor;
-import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.Arrays;
 
-import static java.util.Collections.emptySet;
 import static org.hibernate.type.SqlTypes.NAMED_ORDINAL_ENUM;
-import static org.hibernate.type.descriptor.converter.internal.EnumHelper.getEnumeratedValues;
 
 /**
  * Represents a named {@code enum} type on Oracle 23ai+.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleReflectionStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleReflectionStructJdbcType.java
index 3e732daa0415..6a99522529a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleReflectionStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleReflectionStructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.mapping.UserDefinedObjectType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.type.descriptor.WrapperOptions;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
index d16a30b75ff6..32a188a9e5b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -66,7 +64,7 @@ public OracleServerConfiguration(
 			int driverMinorVersion) {
 		this(autonomous, extended, false, driverMajorVersion, driverMinorVersion);
 	}
-		
+
 	public OracleServerConfiguration(
 			boolean autonomous,
 			boolean extended,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java
index 00558358553b..5a5c1034618e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleStructJdbcType.java
index 3a0309679fa3..95ffddc6a508 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleStructJdbcType.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.mapping.UserDefinedObjectType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.type.descriptor.WrapperOptions;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleTypes.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleTypes.java
index 940903685336..84cc08d4d0c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleTypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
index 8312070373dc..d7910246b166 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlJdbcType.java
index d05b87006bba..3010c39d5a59 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PgJdbcHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/PgJdbcHelper.java
index 6ad591ca07de..746af3e85342 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PgJdbcHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PgJdbcHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcType.java
index bb8814794938..d9845d7e1383 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -95,4 +93,3 @@ public String toString() {
 		return "PostgreSQLArrayTypeDescriptor(" + getElementJdbcType().toString() + ")";
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcTypeConstructor.java
index 4888294bd68d..059e62962f0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLArrayJdbcTypeConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingInetJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingInetJdbcType.java
index 0221d437a31b..b861a479113e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingInetJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingInetJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingIntervalSecondJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingIntervalSecondJdbcType.java
index 5be4dc1bf508..af3d00e5e9bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingIntervalSecondJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingIntervalSecondJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingJsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingJsonJdbcType.java
index e9168110be23..255ade451148 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingJsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLCastingJsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
index 2cc8f3ba8b60..e656257d2c7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDriverKind.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDriverKind.java
index 26fbd4b49cac..843bbccc90ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDriverKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDriverKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java
index 7b66e13edfa7..5df1a60ec464 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLEnumJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLInetJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLInetJdbcType.java
index fef32f81b9f7..e135b039a10f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLInetJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLInetJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java
index c9ee4fe7272d..61e1c5e4c058 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLIntervalSecondJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonType.java
index 65ce0ec37227..c216ae0d975b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonbType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonbType.java
index ed0236e52170..d43abe8dc7d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonbType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLJsonPGObjectJsonbType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLOrdinalEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLOrdinalEnumJdbcType.java
index c7348cedf2b8..d3ad726cac60 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLOrdinalEnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLOrdinalEnumJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
index 57552d2704d5..7bf9cfa51b3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructCastingJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructCastingJdbcType.java
index defe72f81196..6d623906798f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructCastingJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructCastingJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructPGObjectJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructPGObjectJdbcType.java
index df78b6c9493f..5540bd4b99a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructPGObjectJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLStructPGObjectJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -11,7 +9,6 @@
 import java.sql.SQLException;
 
 import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.mapping.UserDefinedObjectType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.type.descriptor.ValueBinder;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLUUIDJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLUUIDJdbcType.java
index 8d342222098a..2007ddfb90ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLUUIDJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLUUIDJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
index fdb01f593c87..31dfed72be95 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Replacer.java b/hibernate-core/src/main/java/org/hibernate/dialect/Replacer.java
index 7c028b9c6585..c808893ff248 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Replacer.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Replacer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java
index 5fd249f0f00e..4cee3573757a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/RowLockStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/RowLockStrategy.java
index c52946eaf398..b094d582309b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/RowLockStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/RowLockStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
index 2e6a68f5aff2..4935b4137929 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -53,9 +51,7 @@
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
-import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
index e300ae7f4136..9865b7c1cfdd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SelectItemReferenceStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/SelectItemReferenceStrategy.java
index aa19d0c91af1..2e31958dd9f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SelectItemReferenceStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SelectItemReferenceStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java b/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
index 6903fa0016e9..a3869d9a76a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
index d390f039f18f..45613930eb90 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -913,4 +911,3 @@ public String getAlterTableToDropUniqueKeyCommand(UniqueKey uniqueKey, Metadata
 		}
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
index 5e734f31be8f..9acac44989a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java
index 14d22f193178..298cdd2b51a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithMerge.java b/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithMerge.java
index 7cc400ff66a6..3c705216410d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithMerge.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithMerge.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithUpsert.java b/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithUpsert.java
index 3ef5de3526f0..1cde74264c83 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithUpsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithUpsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/StructAttributeValues.java b/hibernate-core/src/main/java/org/hibernate/dialect/StructAttributeValues.java
index 3d98154ba16f..b0a4c3ef6ef8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/StructAttributeValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/StructAttributeValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/StructHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/StructHelper.java
index 1b9ab7c6369e..625c5de53044 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/StructHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/StructHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
@@ -29,7 +27,6 @@
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 
 /**
  * A Helper for serializing and deserializing struct, based on an {@link EmbeddableMappingType}.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/StructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/StructJdbcType.java
index 2ae5ed01f137..3198ccaf13fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/StructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/StructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
index 52d320a52b4f..a8fd7ecf6fc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
index eee92fa20b04..0dae944d69c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
index b3f00857cd19..03a38fa20311 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
index fcd762b5164a..679b50b66a7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
index fad5c38caf9c..46cdcf5a6a1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java
index f514c4751af9..731a8cdb5019 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqmToSqlAstConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java
index fd5f83066f3d..477ad9dc5a95 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
index 1a4320239020..a858dd4b2e19 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TimeZoneSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/TimeZoneSupport.java
index 483004f8715f..4eacad3696a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TimeZoneSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TimeZoneSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/VarcharUUIDJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/VarcharUUIDJdbcType.java
index 8cf4e2ca6ee4..c1d39113c2de 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/VarcharUUIDJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/VarcharUUIDJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
index f363feeb2fe8..1f005b7df142 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
index 3b122a5934ed..6629a6ce17ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.aggregate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
index dc0aabba92d9..d76991acef5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.aggregate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
index c2b91377f80a..27c6b9f59329 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.aggregate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
index e6b685fe2467..86596595208c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.aggregate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
index 74f0adf4f529..0f469b20487e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.aggregate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java
index d3d653ee4008..090f765f9655 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java
index 41362b15eff0..d7248bb13b45 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
@@ -14,7 +12,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.sqm.SqmExpressible;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java
index 2f2d3a2b44ac..70fc952f5586 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java
index fe065ff5f3b3..31f01448e6de 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java
index 80bc764cb3de..872c9112594c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java
index 70868be5451e..070288470ae5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java
index 9abcda551380..32414e951834 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java
index 9ca82fc5f78f..150abeb1803f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
index 0fc7902c1f08..eed38c929c8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java
index f74f2f4f238b..b8074d2426d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
index 99507f574e92..335911110d25 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java
index 703d55650515..84e248bb1a7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java
index 1e8537cf6d2e..c3494c49fe15 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java
index 16d5a7b2f2d6..e5560bf929d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
index 977a55aea1aa..7fc5c9205c12 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java
index f2f3ca3a6795..5dafaa537f82 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java
index c5ff66f3d67c..e47c6d820785 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java
index 73e703a7be4e..40a5c97a2c74 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
index dd4cae71dfaf..65f26d86f2aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
index 5a7c1418da3b..302bd8940a26 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.TemporalUnit;
 import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor;
-import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
 import org.hibernate.query.sqm.function.FunctionRenderer;
 import org.hibernate.query.sqm.function.MultipatternSqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java
index 8cb3ad0f96a3..af2f66ebd480 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java
index 691fbdd62c49..7a7b9dd1be48 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java
index ef17e6879260..4ca0f5df450c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java
index 727f8599249b..2b1a28ad2db9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java
index 07f75beeeeb6..bb6276b6039f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java
index d480adabcddc..098fd91291ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java
index 3c8b65382046..a9732373d72b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java
index e248974b58d0..59920bee6a04 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java
index ca1698f76e56..ef5b9cd9bb1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java
index 158e5a342424..d63e5ab297a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java
index 9762955ee172..23cf5a5ada72 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java
index 98f69537cad6..6444552d4f58 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java
index fa8ca2e234d6..a8d7ae36705c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java
index ce8ef0f1b029..976f895bd7c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java
index f794bea750e8..676c19692278 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
index 0aea2a6c0d5e..25597474cbf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java
index 4937b23cd999..3ce1e9798f0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
index ccc32b0b7321..bd20540f59c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
index d51c09b4e65b..ed6eacb32524 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java
index e9f98adbedc2..a17374dda699 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java
index 9e3aca2f8e15..11fbdc0fe928 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java
index 8374b8284c7f..aba439a2492b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java
index 7e511bb82768..65ea0c014152 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java
index f2454a15c84d..641a50461a17 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java
index 3c7053a54f71..75b096bbe2ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java
index 6b80b8d3ecc3..e75086422c2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
index 908188d97b43..742be53f9da4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java
index 05fcd1e159ca..bbf9f7437d93 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java
index 6c1a4566c5ff..88ac74aa2367 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java
index f10148d9bdfb..854720e8625c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
index 5dffaffc9caf..d1688580f726 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
index ddc95241975d..f78cd9bc8b37 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
index b1be2af649a0..9f328eaef83b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
index cbf3347a2fec..737231c55dcd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java
index 73f9cb4ee508..cf7def9758f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIncludesFunction.java
index 524a7600c71e..e9d0bf34d062 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIncludesFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIncludesFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIntersectsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIntersectsFunction.java
index 0dd73625d1e2..add604c46509 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIntersectsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayIntersectsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionFunction.java
index 527c05419b84..f62f5dad597b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionsFunction.java
index 1ce45a46366b..37929dbf23ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayPositionsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayRemoveFunction.java
index 0f8eed62f7d8..b8d61aa3f2ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayRemoveFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayRemoveFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayTrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayTrimFunction.java
index 40c6f9695c07..ebf4f4a8f5c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayTrimFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayTrimFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java
index 153b2c9f0b26..6e409201daeb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java
index 3dd759167a60..5096615eab26 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentValidator.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentValidator.java
index 398bdf5feb19..98c2f76e5950 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayArgumentValidator.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayArgumentValidator.java
index 3ae3b05b6165..7d978b2bed8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayArgumentValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java
index a9cfc0f61c6d..989c65419cb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java
index 60c8cf3dfe20..45d31b1dda3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java
index b7a658008f5f..8e7617bc4ee3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java
index af076cb3aa58..8b283444ff31 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentTypeResolver.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.DomainType;
-import org.hibernate.query.ReturnableType;
-import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentValidator.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentValidator.java
index 773d7cb26f4b..702448fd8172 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java
index 4375223f356b..841849513ade 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java
index 762aaed3aa03..a83b168da48a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
index 0211709efe41..71e4c8e3acab 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayHelper.java
index 96a993990a7a..aa59c21936c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java
index 6b763107bc69..8208bb3f5cb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentTypeResolver.java
@@ -1,19 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.expression.SqmFunction;
-import org.hibernate.type.BasicPluralType;
 
 /**
  * A {@link FunctionArgumentTypeResolver} that resolves the argument types for the {@code array_includes} function.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentValidator.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentValidator.java
index 0cb01fab2ad9..d7e510fd8ebb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java
index 616f2faac457..63369bc58e5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java
index 9b89f43db0e1..4dff3ad7e9a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java
@@ -1,22 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
 import java.util.List;
 
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java
index d3786af9eb18..b81ba52aa11c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java
index e1e612772cd9..020705ce7f51 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
index 33cec0d7f05c..e52020754bee 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java
index df5397a4af66..226af1836fa1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java
index f9bf22e6fb7e..a04538fe0d3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
index 365930736abd..f364c1718fec 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java
index 18e06e88093d..ff4ef67d8597 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java
index 2eec562297ea..24c8425b7709 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java
index d55a8d2a3108..321504fce761 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraysOfSameTypeArgumentValidator.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraysOfSameTypeArgumentValidator.java
index ef03537c0d26..b402b4e02cfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraysOfSameTypeArgumentValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraysOfSameTypeArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java
index e126670df1f0..9f226ca9ffd5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
index 8c7a86830bfc..b4d1a6a73523 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java
index 5e2f993703c1..0944a7bf75df 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java
index fbde361331bd..feaeb84b304e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java
index 4b3fc7a71c92..8a60bff964cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java
index 83d48118e232..28d44f9f1bc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java
@@ -1,22 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
 import java.util.List;
 
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java
index 94f2f731c20d..24be083e37a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java
index ff0e07945f7c..628cfe15f3a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java
index 084680234bca..e71815f00692 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java
index feda5a041d61..720ca7661579 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java
index 8b28f46cf0c5..d8b7e32d1b5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java
index 62d46a4824a5..987cb9ce3d2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java
index 5c570afcec5c..02008fed9f5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java
index 5e02c2a67765..3b3d1bec2c67 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java
index b6900e04a889..1c71ce901068 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java
index c86970f74dff..114edfedbe7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java
index e936a19ac0df..171c26914587 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java
index 85149b6378d4..c761170b8338 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
index 3416b8abcebf..67073a12663a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java
index 0fff4d508b00..5ff5a60b8253 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java
index 2b0149f70d2e..ff9ef8e54480 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
index 3c0284f83e01..ff6422bc91db 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java
index 7de117b855ca..71ff6e0cd4ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java
index 1d48cabef41e..922d6d25c964 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java
index 6a11bb1c03ef..4a4ec142b03a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java
index 0c8f0ee2458a..b4898c2dafd2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java
index 73b49f80568b..1f2653b44210 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java
index 11ea0b1ebde2..4678ba67b942 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
@@ -12,7 +10,6 @@
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.SqlAstNode;
-import org.hibernate.sql.ast.tree.expression.Expression;
 
 /**
  * Oracle array_fill function.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
index dc202f41f9fe..85d61205508a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java
index 818f61cc1825..aa66dd8882fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java
@@ -1,21 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
 import java.util.List;
 
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 public class OracleArrayIncludesFunction extends AbstractArrayIncludesFunction {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java
index 95fdad4de81c..c3e5ef7730df 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java
index 85c639e52ae8..65ca8e53ddb7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java
index 2dd453d99b60..82c65d27ae97 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java
index 687505953bcb..cc0ca1dea96b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java
index 80452440923f..d48428135d82 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java
index 1c5d757a53b6..15e5f658c2f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java
index 9e77fc9a01a5..5edd7c85e959 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java
index c065fba812b8..1d2caef88357 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java
index c12e51051005..4fbca51767be 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java
index 4013b6a55f1e..5e69b13de88a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java
index 8145bad41838..15e72dc58a1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java
index 175530ee304f..cf87901d314d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
@@ -19,7 +17,6 @@
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
 import org.hibernate.type.BasicPluralType;
-import org.hibernate.type.BottomType;
 
 /**
  * PostgreSQL variant of the function to properly return {@code null} when the array argument is null.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java
index e3beb3d2c315..546204143500 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java
index cd48881a62dc..a35c014c234c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java
index 17e3a954b813..d222afc5246d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java
index 6761ae08fb8c..8d0dde8dda73 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java
index 962dbef26bdb..77fe4ec32f11 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java
index 11e891365b41..0aff08a94dd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.function.array;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
index 9a70d556786c..b50d1811b36c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/hint/IndexQueryHintHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.hint;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/hint/QueryHintHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/hint/QueryHintHandler.java
index 4067fcdad957..ac6e2b56443e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/hint/QueryHintHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/hint/QueryHintHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.hint;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/AbstractTransactSQLIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/AbstractTransactSQLIdentityColumnSupport.java
index 8b540f7cb140..1e61f025e916 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/AbstractTransactSQLIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/AbstractTransactSQLIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/CockroachDBIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/CockroachDBIdentityColumnSupport.java
index a676845e7619..a70d077f328c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/CockroachDBIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/CockroachDBIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java
index ebbf7c60b568..4f767b701a84 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2IdentityColumnSupport.java
index 3966e2011fa4..e1ca83a04e6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2IdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2IdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2zIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2zIdentityColumnSupport.java
index 01623e371cf3..8280f630ff6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2zIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2zIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java
index 6df2882f0aa4..38a4839d7064 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java
index 8b6f1bf33bd9..b88d84935ce4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
@@ -42,7 +40,7 @@ public String getIdentitySelectString(String table, String column, int type) {
 	public String getIdentityInsertString() {
 		return "default";
 	}
-	
+
 	@FunctionalInterface
 	public interface InsertValuesHandler {
 		void renderInsertValues();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/HANAIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/HANAIdentityColumnSupport.java
index 9722668c9abf..53bf6a37a26d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/HANAIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/HANAIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
@@ -21,11 +19,11 @@ public boolean supportsIdentityColumns() {
 	public String getIdentitySelectString(String table, String column, int type) throws MappingException {
 		return "select current_identity_value() from " + table;
 	}
-	
+
 	@Override
 	public String getIdentityColumnString(int type) {
 		// implicitly start with 1 increment by 1
 		return "generated by default as identity";
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/HSQLIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/HSQLIdentityColumnSupport.java
index 0dd799ef725f..47d4e94d63c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/HSQLIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/HSQLIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java
index e0460fc7ccf6..fa21aeb75f8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java
index 4880c39e47cb..e809f6cea944 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupportImpl.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
 import org.hibernate.MappingException;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.generator.EventType;
 import org.hibernate.id.insert.GetGeneratedKeysDelegate;
 import org.hibernate.persister.entity.EntityPersister;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java
index af76fdbe3290..42ea09a6afef 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/MySQLIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/MySQLIdentityColumnSupport.java
index 66ad3a3c6211..339cfe041045 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/MySQLIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/MySQLIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java
index d3fcc20ec222..a5967f714134 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/Oracle12cIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/PostgreSQLIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/PostgreSQLIdentityColumnSupport.java
index 9e98c0eb5416..b51240844e1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/PostgreSQLIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/PostgreSQLIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/SQLServerIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SQLServerIdentityColumnSupport.java
index 8cfc2b7d6734..1aacfa071d3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/SQLServerIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SQLServerIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/SybaseJconnIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SybaseJconnIdentityColumnSupport.java
index 9474f242a563..ae1ffd111d3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/SybaseJconnIdentityColumnSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SybaseJconnIdentityColumnSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.identity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
index a73918f305ad..41d30585013a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java
index 8f19b1f6f290..5f10b83e1f5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategyException.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategyException.java
index 5c3615fd72ee..29302f31f4a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategyException.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategyException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticEntityLockException.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticEntityLockException.java
index e66824779a96..389d98a07d18 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticEntityLockException.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticEntityLockException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
index fe5837f2d83a..947a8906b242 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
index 88c6d6cccedf..ee0cf4634fb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
index 0669890b9cfb..a1bb6725de78 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
index 615a890378fd..95414c695984 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java
index 020d9fdad65d..007fe29065db 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
index 62c32e9416e9..430019387a71 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java
index 212c575659d7..4e3ad47f93d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
index dfa8aebc1e83..349679ae1c2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java
index 90a240b32cfb..f22e38bc38f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
@@ -12,9 +10,9 @@
 import org.hibernate.LockOptions;
 import org.hibernate.persister.entity.EntityPersister;
 
- /**
+/**
  * A locking strategy where an optimistic lock is obtained via a select
-  * statement.
+ * statement.
  * 
    
  * Differs from {@link PessimisticWriteSelectLockingStrategy} and
  * {@link PessimisticReadSelectLockingStrategy} in throwing
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
index c4f39e6a7274..cbe910916a3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.lock;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
index 820ea337c0be..7f65dcc402ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
@@ -18,7 +16,7 @@
 import static java.util.regex.Pattern.compile;
 
 /**
- * Default implementation of {@link LimitHandler} interface. 
+ * Default implementation of {@link LimitHandler} interface.
  *
  * @author Lukasz Antoniak
  */
@@ -120,7 +118,7 @@ public boolean forceLimitUsage() {
 	 * Does this dialect require a one-based offset to be specified in the offset clause?
 	 *
 	 * @implNote The value passed into {@link AbstractLimitHandler#processSql(String, Limit)}
-     *           has a zero-based offset. Handlers which do not {@link #supportsVariableLimit}
+	 *           has a zero-based offset. Handlers which do not {@link #supportsVariableLimit}
 	 *           should take care to perform any needed first-row-conversion calls prior to
 	 *           injecting the limit values into the SQL string.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractNoOffsetLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractNoOffsetLimitHandler.java
index d831800aaf01..1cb5f8dd60d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractNoOffsetLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractNoOffsetLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractSimpleLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractSimpleLimitHandler.java
index 87cb0dcb22f8..43bd9e21c828 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractSimpleLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractSimpleLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/DB2LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/DB2LimitHandler.java
index 4cb143b083b4..f74f285f4198 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/DB2LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/DB2LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/FetchLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/FetchLimitHandler.java
index c899fb1b52ea..6ee3a332f1f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/FetchLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/FetchLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyDB2LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyDB2LimitHandler.java
index a478b0c65b0e..5f5fa6635378 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyDB2LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyDB2LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyHSQLLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyHSQLLimitHandler.java
index 9cce355353b0..634e5ec691ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyHSQLLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyHSQLLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyOracleLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyOracleLimitHandler.java
index 1921d1378466..43c2e75fe79d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyOracleLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyOracleLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitHandler.java
index 0eab81514512..78f9e46ca67d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java
index c57154a2f4d5..0a6a10fee1f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java
index 33b706d28c69..70213aa03a48 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/NoopLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/NoopLimitHandler.java
index cbcf7b94ba78..1885a0536838 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/NoopLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/NoopLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.query.spi.Limit;
 
-import static java.util.regex.Pattern.compile;
 
 /**
  * Handler not supporting query LIMIT clause. JDBC API is used to set maximum number of returned rows.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java
index 374c0fd19aab..bf9f2487bc77 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Oracle12LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Oracle12LimitHandler.java
index 16a772b7d3ae..52d6a0f198ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Oracle12LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Oracle12LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
index c4d0994dd936..d328f23d92e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2012LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2012LimitHandler.java
index 985208a1cec4..fa14ad5aa819 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2012LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2012LimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
@@ -24,7 +22,7 @@ public class SQLServer2012LimitHandler extends OffsetFetchLimitHandler {
 	// ORDER BY ...
 	// [
 	//   OFFSET m {ROW|ROWS}
-    //   [FETCH {FIRST|NEXT} n {ROW|ROWS} ONLY]
+	//   [FETCH {FIRST|NEXT} n {ROW|ROWS} ONLY]
 	// ]
 
 	public static final SQLServer2012LimitHandler INSTANCE = new SQLServer2012LimitHandler();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/TopLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/TopLimitHandler.java
index 263285fd8b8f..863b48aa9039 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/TopLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/TopLimitHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.pagination;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/ANSISequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/ANSISequenceSupport.java
index 0c29902cafb9..66423868caa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/ANSISequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/ANSISequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2SequenceSupport.java
index f15a1f89f328..f6942ed94ca9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2iSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2iSequenceSupport.java
index b77830a720b5..7eb0f0b359e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2iSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2iSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2zSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2zSequenceSupport.java
index 763bd6f8d722..d125cde00361 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2zSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/DB2zSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V1SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V1SequenceSupport.java
index af182702033e..1b28404e813b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V1SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V1SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V2SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V2SequenceSupport.java
index e649d38d6983..373382b0ab4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V2SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/H2V2SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HANASequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HANASequenceSupport.java
index 692b362aad36..7cf2e8618bdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HANASequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HANASequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HSQLSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HSQLSequenceSupport.java
index e201ac6bc6ff..814e42c7d500 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HSQLSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/HSQLSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java
index 50c2e8142c77..bdff0fc874ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/MariaDBSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/MariaDBSequenceSupport.java
index cd8d3291b237..78cdf913b33a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/MariaDBSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/MariaDBSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NextvalSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NextvalSequenceSupport.java
index 02262284540c..918a5c24ccbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NextvalSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NextvalSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NoSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NoSequenceSupport.java
index ec3147966a56..d6f79b01216b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NoSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/NoSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/OracleSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/OracleSequenceSupport.java
index eb9095c3735f..02c8232d6f16 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/OracleSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/OracleSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/PostgreSQLSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/PostgreSQLSequenceSupport.java
index 76f985d386a3..b922e44af9a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/PostgreSQLSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/PostgreSQLSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServer16SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServer16SequenceSupport.java
index 6bf1d5c8cd31..92253e01ebc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServer16SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServer16SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServerSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServerSequenceSupport.java
index 17acc517ed34..332644d866a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServerSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SQLServerSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SequenceSupport.java
index be273de84b47..890c30e5092f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/TiDBSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/TiDBSequenceSupport.java
index 2cb8484a5638..9b194854c6cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/TiDBSequenceSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/TiDBSequenceSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.sequence;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
index f0e395da3598..1947db2dfbcd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
index 02f0f22d6c59..7c831f663844 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableColumn.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableColumn.java
index b46c49faa07a..bc2cc94da6de 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableExporter.java
index 82f84ff8ae5d..1337fe525ec0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
index 1f1c6e93f2f4..83f36e68630b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableKind.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableKind.java
index 959ff402f561..a4a2922a7ce7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableSessionUidColumn.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableSessionUidColumn.java
index c14d43878fd4..c852ec6330a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableSessionUidColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTableSessionUidColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
index fe8cf41b7aa1..a539873627e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
@@ -18,7 +16,7 @@
 /**
  * A {@link UniqueDelegate} which uses {@code alter table} commands to create and drop
  * the unique constraint. When possible, prefer {@link CreateTableUniqueDelegate}.
- * 
+ *
  * @author Brett Meyer
  */
 public class AlterTableUniqueDelegate implements UniqueDelegate {
@@ -101,4 +99,3 @@ else if ( dialect.supportsIfExistsAfterConstraintName() ) {
 	}
 
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
index 9252339fd8c6..c38ccbb4bb00 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
@@ -28,7 +26,7 @@
  *     are that two null values are non-unique. So here we need to jump through hoops with the
  *     {@code create unique nonclustered index ... where ...} command.
  * 
- * 
+ *
  * @author Brett Meyer
  */
 public class AlterTableUniqueIndexDelegate extends AlterTableUniqueDelegate {
@@ -73,7 +71,7 @@ public String getAlterTableToAddUniqueKeyCommand(UniqueKey uniqueKey, Metadata m
 			return super.getAlterTableToAddUniqueKeyCommand( uniqueKey, metadata, context );
 		}
 	}
-	
+
 	@Override
 	public String getAlterTableToDropUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata,
 			SqlStringGenerationContext context) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
index 3840bb1731a9..aea5cbccb3a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
index 85142a12ae47..275c2f66e122 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/SkipNullableUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/SkipNullableUniqueDelegate.java
index 46f6f264a968..71fb899dc4d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/SkipNullableUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/SkipNullableUniqueDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
index aeef88490715..a2ae40ec154c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect.unique;
 
@@ -53,7 +51,7 @@ public interface UniqueDelegate {
 	 * 
    
 	 * This is for handling single columns explicitly marked {@linkplain Column#isUnique() unique},
 	 * not for dealing with {@linkplain UniqueKey unique keys}.
-	 * 
+	 *
 	 * @param column The column to which to apply the unique
 	 * @param context A context for SQL string generation
 	 * @return The fragment (usually "unique"), empty string indicates the uniqueness will be
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/FetchStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/FetchStyle.java
index 0cf7a3e28c24..a5f9789f7f42 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/FetchStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/FetchStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/FetchTiming.java b/hibernate-core/src/main/java/org/hibernate/engine/FetchTiming.java
index e8184559efeb..4b8dd9c70a97 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/FetchTiming.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/FetchTiming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine;
 
@@ -10,7 +8,7 @@
 
 /**
  * Enumeration of values describing when fetching should occur.
- * 
+ *
  * @author Steve Ebersole
  * @see FetchStyle
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/OptimisticLockStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/OptimisticLockStyle.java
index 527bc126dd52..acd90502b651 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/OptimisticLockStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/OptimisticLockStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
index 2b8355ba1283..82985326ea97 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.config.internal;
 
@@ -14,7 +12,6 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java
index 258f463aaffa..22a56f4b78a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.config.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
index 6e9ecd5b4bf6..90c770b8af63 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.config.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java
index b2684fe25d97..dadad8b51fb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.config.spi;
 
 
-import org.checkerframework.checker.nullness.qual.PolyNull;
 
 import static org.hibernate.engine.config.spi.ConfigurationService.Converter;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
index 15f6c8e7c03d..8530fb193aec 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java
index 994109f08f0b..f9b94e912c91 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java
index 2f21b5eddd97..112a4559c85a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
index 488e3f3a3d28..42ff34629de1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/CascadePoint.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/CascadePoint.java
index f040764c983b..5576c1781d02 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/CascadePoint.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/CascadePoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
index a48d65a45be9..756f016ed3ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
@@ -61,7 +59,7 @@ private static void processDereferencedCollection(PersistentCollection coll,
 		if ( loadedPersister != null && LOG.isDebugEnabled() ) {
 			LOG.debugf(
 					"Collection dereferenced: %s",
-					MessageHelper.collectionInfoString( loadedPersister, 
+					MessageHelper.collectionInfoString( loadedPersister,
 							coll, entry.getLoadedKey(), session
 					)
 			);
@@ -118,7 +116,7 @@ private static void processNeverReferencedCollection(PersistentCollection col
 		if ( LOG.isDebugEnabled() ) {
 			LOG.debugf(
 					"Found collection with unloaded owner: %s",
-					MessageHelper.collectionInfoString( 
+					MessageHelper.collectionInfoString(
 							entry.getLoadedPersister(),
 							coll,
 							entry.getLoadedKey(),
@@ -134,14 +132,14 @@ private static void processNeverReferencedCollection(PersistentCollection col
 
 	}
 
-    /**
-     * Initialize the role of the collection.
-     *
-     * @param collection The collection to be updated by reachability.
-     * @param type The type of the collection.
-     * @param entity The owner of the collection.
+	/**
+	 * Initialize the role of the collection.
+	 *
+	 * @param collection The collection to be updated by reachability.
+	 * @param type The type of the collection.
+	 * @param entity The owner of the collection.
 	 * @param session The session from which this request originates
-     */
+	 */
 	public static void processReachableCollection(
 			PersistentCollection collection,
 			CollectionType type,
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
index 44af9f16910c..316583a24339 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
index b65383dd2e28..7bff60bafda3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
index cdb07cb2d1f9..8e1cef2adc63 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java
index 59c6b6cfd2fe..f9b3770ff892 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java
index bcc9053ea51d..3c65339615dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.engine.internal;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java
index 5c849ad63d2a..f64c240f80f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
@@ -226,8 +224,8 @@ public static void processIfManagedEntity(final Object entity, final ManagedEnti
 		}
 	}
 
-	 // Not using Consumer because of JDK-8180450:
-	 // use a custom functional interface with explicit type.
+	// Not using Consumer because of JDK-8180450:
+	// use a custom functional interface with explicit type.
 	@FunctionalInterface
 	public interface SelfDirtinessTrackerConsumer {
 		void accept(SelfDirtinessTracker tracker);
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java
index 326d8123a146..031141246d71 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java
index 425f18615c1f..cee6af634513 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.engine.internal;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
index 77e51f2e3dda..e5ea7f9abd21 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
@@ -529,11 +527,11 @@ public boolean sameAsCached(EntityPersister persister, Object pk, Object natural
 	}
 
 	/**
-	 * It is only valid to define natural ids at the root of an entity hierarchy.  This method makes sure we are 
+	 * It is only valid to define natural ids at the root of an entity hierarchy.  This method makes sure we are
 	 * using the root persister.
 	 *
 	 * @param persister The persister representing the entity type.
-	 * 
+	 *
 	 * @return The root persister.
 	 */
 	protected EntityPersister locatePersisterForKey(EntityPersister persister) {
@@ -797,7 +795,7 @@ public boolean cache(Object pk, Object naturalIdValues) {
 			final Resolution cachedNaturalId = new ResolutionImpl( getEntityDescriptor(), naturalIdValues, persistenceContext );
 			pkToNaturalIdMap.put( pk, cachedNaturalId );
 			naturalIdToPkMap.put( cachedNaturalId, pk );
-			
+
 			return true;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
index 75d039a8423a..8d53a3f49034 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Nullability.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Nullability.java
index 33cf8067ae1a..4d4e7f98ad2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Nullability.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Nullability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
@@ -24,7 +22,7 @@
 
 /**
  * Implements the algorithm for validating property values for illegal null values
- * 
+ *
  * @author Gavin King
  */
 public final class Nullability {
@@ -74,22 +72,22 @@ public void checkNullability(
 		 */
 		if ( checkNullability ) {
 			/*
-			  * Algorithm
-			  * Check for any level one nullability breaks
-			  * Look at non-null components to
-			  *   recursively check next level of nullability breaks
-			  * Look at Collections containing components to
-			  *   recursively check next level of nullability breaks
-			  *
-			  *
-			  * In the previous implementation, not-null stuffs where checked
-			  * filtering by level one only updatable
-			  * or insertable columns. So setting a subcomponent as update="false"
-			  * has no effect on not-null check if the main component had good checkability
-			  * In this implementation, we keep this feature.
-			  * However, I never see any documentation mentioning that, but it's for
-			  * sure a limitation.
-			  */
+			 * Algorithm
+			 * Check for any level one nullability breaks
+			 * Look at non-null components to
+			 *   recursively check next level of nullability breaks
+			 * Look at Collections containing components to
+			 *   recursively check next level of nullability breaks
+			 *
+			 *
+			 * In the previous implementation, not-null stuffs where checked
+			 * filtering by level one only updatable
+			 * or insertable columns. So setting a subcomponent as update="false"
+			 * has no effect on not-null check if the main component had good checkability
+			 * In this implementation, we keep this feature.
+			 * However, I never see any documentation mentioning that, but it's for
+			 * sure a limitation.
+			 */
 
 			final boolean[] nullability = persister.getPropertyNullability();
 			final boolean[] checkability = checkType == NullabilityCheckType.CREATE
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionEventListenerManagerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionEventListenerManagerImpl.java
index 4c1e9f5c6408..2d32afc0a753 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionEventListenerManagerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionEventListenerManagerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
index b696303ae1c8..deb84e13c243 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
@@ -777,7 +775,7 @@ private void reassociateProxy(LazyInitializer li, HibernateProxy proxy) {
 					session.getFactory().getMappingMetamodel()
 							.getEntityDescriptor( li.getEntityName() );
 			final EntityKey key = session.generateEntityKey( li.getInternalIdentifier(), persister );
-		  	// any earlier proxy takes precedence
+			// any earlier proxy takes precedence
 			final Map entityHolderMap = getOrInitializeEntitiesByKey();
 			final EntityHolderImpl oldHolder = entityHolderMap.get( key );
 			if ( oldHolder != null ) {
@@ -1463,7 +1461,7 @@ public Object getOwnerId(String entityName, String propertyName, Object childEnt
 		final EntityPersister persister = mappingMetamodel.getEntityDescriptor( entityName );
 		final CollectionPersister collectionPersister = mappingMetamodel.getCollectionDescriptor( collectionRole );
 
-	    // try cache lookup first
+		// try cache lookup first
 		final Object parent = getParentsByChild( childEntity );
 		if ( parent != null ) {
 			final EntityEntry entityEntry = entityEntryContext.getEntityEntry( parent );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
index 8a6b06744112..6b56f0fa119b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatisticalLoggingSessionEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
index 1e6c5109348b..61427bc9733b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java
index d4ece7f90cb0..33059dd026c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java
index 96b0ebf898ab..64aea5d0d91f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java
index 16f21bbd2e1e..718a685f91b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 import java.sql.Blob;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BinaryStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BinaryStream.java
index 9a57f0c2ea4e..86afb101012c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BinaryStream.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BinaryStream.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java
index e180fe9719f4..2e26dcf81a57 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java
index fa70329ce446..c69eb7450806 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
@@ -33,8 +31,8 @@
  */
 @Internal
 public final class BlobProxy implements Blob, BlobImplementer {
-    // In previous versions this used to be implemented by using a java.lang.reflect.Proxy to deal with
-    // incompatibilities across various JDBC versions, hence the class name, but using a real Proxy is
+	// In previous versions this used to be implemented by using a java.lang.reflect.Proxy to deal with
+	// incompatibilities across various JDBC versions, hence the class name, but using a real Proxy is
 	// no longer necessary. The class name could be updated to reflect this but that would break APIs.
 
 	private final BinaryStream binaryStream;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/CharacterStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/CharacterStream.java
index 62e29c86adff..5b273aab3e44 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/CharacterStream.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/CharacterStream.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java
index 460ecbbe36de..2e92a10d1bf7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java
index c61623a4823f..06de3077d37d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
index 1a6149b5ebe0..abfa42772ca6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java
index 3012afe5a31c..9dde238abbcd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 import java.sql.Connection;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java
index 8d3c404e6f1d..5a32d8ffdd9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java
index b303a4ce9f3a..fdb0e71d02ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java
index edc62b263f28..12150af01d46 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java
index 3a58a6550856..a419633850dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java
index ce63f9aec9df..6e64ad6e5659 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
@@ -12,7 +10,7 @@
 
 /**
  * Exposes a {@link Reader} as an {@link InputStream}.
- * 
+ *
  * @author Gavin King
  */
 public class ReaderInputStream extends InputStream {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
index ecaca07659fd..5f6428b70b82 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java
index d7bbb405a3ff..394522cde566 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java
index 2e2622bab180..02538b5ca3ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/Size.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/Size.java
index 5ba5cc251234..7dc26260044c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/Size.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/Size.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java
index c7b28dae323e..a929564a8d80 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java
index 3af0d52f1111..3aa26f5d2fca 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedNClob.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedNClob.java
index fe3f1167c19a..99749286cda5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedNClob.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedNClob.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
index 08e0519e5088..9f0744d65337 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java
index aa49cb5ee723..f09269396c65 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.internal;
 
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
-import org.hibernate.jdbc.Expectation;
 import org.hibernate.jdbc.Expectations;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java
index 1bf48d0b166c..ca75864a38e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
index 90e9d9b61e78..9f4bb1438031 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.internal;
 
@@ -10,9 +8,7 @@
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.BatchSettings;
-import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.spi.ServiceException;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
index 37a6e71ad142..2aa41fe10a8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java
index 607d5b17ed67..e19d30b818bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.spi;
 
@@ -26,7 +24,7 @@
  * A batch is usually associated with a {@link org.hibernate.engine.jdbc.spi.JdbcCoordinator}.
  *
  * @author Steve Ebersole
- * 
+ *
  * @see org.hibernate.engine.jdbc.spi.JdbcCoordinator#getBatch(BatchKey, Integer, Supplier)
  */
 @Incubating
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java
index 07663c861c74..3e7fd7df6575 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java
index cfc7b64003da..ef849c0a958a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java
index db18c141f9c2..72a9b387deb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.batch.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java
index 84d1b1fe42ae..95d2fc28620b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreator.java
index c5e620d0497a..22f02df473da 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactory.java
index 3da7ce944a79..0f1b23f1b6af 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactoryImpl.java
index 0d80bb17a774..011c043e99ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionCreatorFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
index f5920352b90a..055a91461cd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionValidator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionValidator.java
index f13a96e21cf8..04a55cad2c6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java
index f2bfc5e4ccc3..2e9fcc1e3d38 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatabaseConnectionInfoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
index aa88e37d9d0a..5f3172e453b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverConnectionCreator.java
index 1f273c368d8f..bd7b03468e3f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverConnectionCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverConnectionCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionCreator.java
index fe28c88d4352..bbb3e147245d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
index 4123a5848608..51292cab2e7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
index 379783eb5d5d..b1f5d80d1cd2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
index 68349a336c3f..582eabfcbd44 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
index 69afaf5deb4c..5d98635ba172 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
index 9e1a074e5ce1..c8a81d8815af 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
index c0c2d1614851..8914a957cb1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 import java.sql.Connection;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
index 519b9b85e66c..4d5357a63831 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java
index f3a17779d3f2..5d38ead15dfa 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DatabaseConnectionInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java
index e27dbde3c761..1a243aebf49e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java
index 2082a2605e6a..7f4adc484a54 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.connections.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java
index 0f00bff757b8..a88b13f6b45d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.cursor.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java
index 15618fd05fed..35d75741018e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.cursor.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
index 1a3b1833b2ff..91f19c9fb7ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.cursor.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java
index 40180d241f3c..30937a883160 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.cursor.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
index de6908fc88f8..1573eee335ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java
index 1f607b2c9149..29432b27d399 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java
index a5c8a2635b7c..036ddc2a3142 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java
index 0e112f38ed08..1f934be422e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
index 2b51d98644c6..6826f88b98de 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicDialectResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicDialectResolver.java
index 2870ae76701c..1d3c295e5f67 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicDialectResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicDialectResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java
index 72d0287bd45f..fd3a880e60b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DatabaseMetaDataDialectResolutionInfoAdapter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DatabaseMetaDataDialectResolutionInfoAdapter.java
index 2bd080e78325..401b88e7af77 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DatabaseMetaDataDialectResolutionInfoAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DatabaseMetaDataDialectResolutionInfoAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java
index 8c669711f487..868d18cbc10a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfo.java
index 1e48724a6f66..78e0d3279192 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfoSource.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfoSource.java
index 65de46fe4b55..75a5df72c64e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfoSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolutionInfoSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java
index d3a429526e1d..a1037ede1f80 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.dialect.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/BlobAndClobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/BlobAndClobCreator.java
index 1aa615c8e6cc..83531c7590ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/BlobAndClobCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/BlobAndClobCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java
index 43f949dbcea7..ef73d49c1a2e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
index 191947a5afc0..6d271c7c4e02 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
index 71d6f47a16fd..1b7468b6afa5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java
index b28c3b8714a9..2e021ff0bf00 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationHelper.java
index 64a04b05a9ce..739f3cebb07a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
index e19c9166ddcc..ed36ae9f8882 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
index 3f3a65a6cd49..e08f4d373dde 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java
index 3cfa6cae7f81..59dc9079b7d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
index fd0ab2e0287c..85b4eeeb0c1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java
index 8a1a2f2e21a6..be74a513a4cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/StandardLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/StandardLobCreator.java
index e430986277c7..0f05c61790b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/StandardLobCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/StandardLobCreator.java
@@ -1,15 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
-import java.io.InputStream;
 import java.io.Reader;
-import java.sql.Blob;
-import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.NClob;
 import java.sql.SQLException;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/AnsiSqlKeywords.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/AnsiSqlKeywords.java
index d07a6bf9e018..d5d31b0f41a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/AnsiSqlKeywords.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/AnsiSqlKeywords.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java
index c8818ebd0ffa..11b140fde1bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierCaseStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierCaseStrategy.java
index 62e641181075..3911bbcf1b70 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierCaseStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierCaseStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
index 89a7a0fcea65..8c365cbc02eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
index 6bd1b7563da1..ba8af0a124b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
index 7188e17611be..7937e8f7b56c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java
index 35cbfc84a8bc..0664f5f7d688 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/NameQualifierSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/NameQualifierSupport.java
index 30c5aefadd6c..8a63cb88c8da 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/NameQualifierSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/NameQualifierSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameFormatter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameFormatter.java
index bf865ca14ab2..e9bf5b10ddff 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java
index 864ed7de3d81..f7245b1c0a42 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java
index 00df347f76b7..bcaeebe30e30 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
index f7cf8777ada3..80ccf9fde098 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BinaryStreamImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BinaryStreamImpl.java
index ce1077e73094..bba8f3daa6eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BinaryStreamImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BinaryStreamImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/CharacterStreamImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/CharacterStreamImpl.java
index 6b72e73589c4..3bbf6c35e424 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/CharacterStreamImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/CharacterStreamImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java
index 2954cd0a28fc..85c8aef1e501 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java
index 720b76e654c7..009082037f9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/Formatter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/Formatter.java
index 81b30178d23b..8bf4ca4c5cf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/Formatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/Formatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/HighlightingFormatter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/HighlightingFormatter.java
index 26a5de5c9810..6198380781fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/HighlightingFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/HighlightingFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
index d68323809bd6..eb12ba57d6fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
@@ -141,7 +139,7 @@ public void flushEnding() {
 		if ( flushDepth == 0 ) {
 			releasesEnabled = true;
 		}
-		
+
 		afterStatementExecution();
 	}
 
@@ -351,7 +349,7 @@ private SqlExceptionHelper safeSqlExceptionHelper() {
 	public void enableReleases() {
 		releasesEnabled = true;
 	}
-	
+
 	@Override
 	public void disableReleases() {
 		releasesEnabled = false;
@@ -360,7 +358,7 @@ public void disableReleases() {
 	@SuppressWarnings("unchecked")
 	protected void close(Statement statement) {
 		LOG.tracev( "Closing prepared statement [{0}]", statement );
-		
+
 		// Important for Statement caching -- some DBs (especially Sybase) log warnings on every Statement under
 		// certain situations.
 		sqlExceptionHelper().logAndClearWarnings( statement );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
index 5df395fba4e0..95672939634b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
index 7e044cb6c41e..877821bc50c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java
index d0567401855a..b7451c5a8744 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
index 0d108b3ce6c8..b0245e430273 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java
index 5e3218275cb4..f010412907b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
index 2add0a4c6bc4..f13b87b79f40 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.internal;
 
@@ -63,7 +61,7 @@ protected final LogicalConnectionImplementor logicalConnection() {
 	protected final SqlExceptionHelper sqlExceptionHelper() {
 		return jdbcServices.getSqlExceptionHelper();
 	}
-	
+
 	@Override
 	public Statement createStatement() {
 		try {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java
index 93bea00791db..286832adb8ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/JdbcValueBindings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java
index ec941aadf287..68ec9d8082e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/MutationExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java
index 58c8e4eadfe7..d5b0349302e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/OperationResultChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java
index 301989a2cba5..2fee081838f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/ParameterUsage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java
index 5b09d4323971..977d253fc5ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/TableInclusionChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java
index 897baa25aaa0..a924d90c03ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.group;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java
index 1c62f678fda6..6af82f116826 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/PreparedStatementGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.group;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java
index 984269f43e99..5a7aaf8ba497 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.group;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
index 42b9c792a454..bbb78d0e33b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java
index 6a617079f4b5..3e54beb39659 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractSingleMutationExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
index d64d8eebb474..5a7e8c214bfd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java
index d01282aa0483..6d401e40cae6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueDescriptorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
index f75701d84ace..873769b85b9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java
index 9b700b5b35f9..f1649a08df17 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java
index 09c0f9de18af..15f3010b783d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java
index 0fa1af301fcc..58668f38573e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleNonBatched.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java
index 4c1dfb70b9b2..b70f5d033e58 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleSelfExecuting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java
index 927306f3ecd6..b9f29f3f557c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java
index 2c83944d0193..3cc7e495b7f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationQueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/NoBatchKeyAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/NoBatchKeyAccess.java
index a6c8dde6d352..69d030283f68 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/NoBatchKeyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/NoBatchKeyAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
index 1732484d5694..8d8cbd4c68d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java
index a70e49ac0c5f..0dd5f6bd7a8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupNone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java
index 32058fe6db9c..59682d403d3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupSingleTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java
index a8d75f4d2e8c..820b72f98954 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementGroupStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java
index 91c629ebac31..84d18371e0a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/StandardMutationExecutorService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BatchKeyAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BatchKeyAccess.java
index 0821058745c6..44b509e48fbe 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BatchKeyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BatchKeyAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java
index d5da8649cbdf..09b63d23c097 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/Binding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java
index ab5d2932155c..42d0d4503a7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/BindingGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java
index a76222a2aaf6..d85374f62fe8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/spi/MutationExecutorService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java
index f6f647af106c..3aced3c75628 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
index 42fd973cf0a1..341ba8800cb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
@@ -136,7 +134,7 @@ Batch getBatch(
 	 */
 	void cancelLastQuery();
 
-    /**
+	/**
 	 * Calculate the amount of time, in seconds, still remaining before transaction timeout occurs.
 	 *
 	 * @return The number of seconds remaining until a transaction timeout occurs.  A negative value indicates
@@ -158,7 +156,7 @@ Batch getBatch(
 
 	/**
 	 * Register a query statement as being able to be cancelled.
-	 * 
+	 *
 	 * @param statement The cancel-able query statement.
 	 */
 	void registerLastQuery(Statement statement);
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
index 41d5dd20179c..dc90cd25b28d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
@@ -71,7 +69,7 @@ public interface JdbcServices extends Service {
 	 * Obtain information about supported behavior reported by the JDBC driver.
 	 * 
    
 	 * Yuck, yuck, yuck! Much prefer this to be part of a "basic settings" type object.
-	 * 
+	 *
 	 * @return The extracted database metadata, oddly enough :)
 	 */
 	ExtractedDatabaseMetaData getExtractedMetaDataSupport();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java
index 5686f8756616..8c037d682e52 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java
index 6d7b50ae72d7..dcf89e784ff2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/MutationStatementPreparer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java
index e3a3479fede2..209afda3428d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
@@ -42,7 +40,7 @@ public interface ResultSetReturn {
 	 * @return The resulting {@link ResultSet}
 	 */
 	ResultSet extract(Statement statement, String sql);
-	
+
 	/**
 	 * Execute the {@link PreparedStatement} return its first {@link ResultSet}, if any.
 	 * If there is no {@link ResultSet}, returns {@code null}
@@ -64,7 +62,7 @@ public interface ResultSetReturn {
 	 * @return The extracted {@link ResultSet}, or {@code null}
 	 */
 	ResultSet execute(Statement statement, String sql);
-	
+
 	/**
 	 * Execute the {@link PreparedStatement}, returning its "affected row count".
 	 *
@@ -74,7 +72,7 @@ public interface ResultSetReturn {
 	 * @return The {@link PreparedStatement#executeUpdate()} result
 	 */
 	int executeUpdate(PreparedStatement statement, String sql);
-	
+
 	/**
 	 * Execute the given SQL statement returning its "affected row count".
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
index 84bc56f1cd61..e4f65d108761 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
index 1a39827446f9..1d4b64f0f798 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java
index 5707dd1e0780..c6bcc5e4d786 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java
index a59485c5d8bc..80c13d65a33a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
@@ -29,7 +27,7 @@ public interface StatementPreparer {
 	 * @return the statement
 	 */
 	Statement createStatement();
-	
+
 	/**
 	 * Prepare a statement.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java
index 47d6c7870fe1..a6fc1994c99d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeNullability.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeNullability.java
index 0f41608989fe..4d1a03de26c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeNullability.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeNullability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java
index 6358e0f7155a..84f1f0a89190 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java
index d18076e59698..6b24f3ebb173 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jndi;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java
index 56b80d56bd8a..1fa2cdcc70f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jndi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
index 13e82ce8270f..1a43e8b80015 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jndi.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java
index 5bd91b5ab0ec..6de1499cc2de 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jndi.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java
index 27ebf30161b5..52abde202bd8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jndi.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java
index dc82eb44b950..da932e98aad4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.profile;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/DefaultFetchProfile.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/DefaultFetchProfile.java
index 858ac701bfaa..f876555ebe8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/profile/DefaultFetchProfile.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/DefaultFetchProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.profile;
 
@@ -12,7 +10,6 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.results.graph.FetchOptions;
-import org.hibernate.tuple.NonIdentifierAttribute;
 
 import java.util.Map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java
index c2dbd0653b3f..cb04db223954 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.profile;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java
index d0df922f5863..6fd20f4a715a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.profile;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/internal/FetchProfileAffectee.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/internal/FetchProfileAffectee.java
index f771f0e48fd3..547fa01e393b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/profile/internal/FetchProfileAffectee.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/internal/FetchProfileAffectee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.profile.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterRecognitionException.java b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterRecognitionException.java
index ca8d156f8fe1..e3e1c6598667 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterRecognitionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterRecognitionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java
index 1c3a1727887f..a8ebadfbf158 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java
index eccd25bb730e..9390c779b986 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java
index 78cb9dbc5282..d36e19dc3ade 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java
index a45cbe564254..a459e90fbcc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreterInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreterInitiator.java
index b19776a320fe..0cbed1f50212 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreterInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreterInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java
index 423898fb1959..d1cc1aa57777 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
index 42f2765e3ab1..5c43daa69ed2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilderImplementor.java
index e1b9ab480bcf..dfb525bec6cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
index 7c1577269b90..6e85c4df88bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingWrapperOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingWrapperOptions.java
index 983065286d3a..6f03420654e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingWrapperOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingWrapperOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
index bb6a5bc7d139..67a7b0d73e7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java
index d9966d38ca5e..923ff62a5bc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -14,7 +12,7 @@
  * Identifies a named association belonging to a particular
  * entity instance. Used to record the fact that an association
  * is null during loading.
- * 
+ *
  * @author Gavin King
  */
 public final class AssociationKey implements Serializable {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
index 95e2ee7758f9..dca546caa6b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CacheInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CacheInitiator.java
index 40eb71123ac6..2f0ae6400ea0 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CacheInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CacheInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CachedNaturalIdValueSource.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CachedNaturalIdValueSource.java
index 4f8f54a6b52a..deda8ed244e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CachedNaturalIdValueSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CachedNaturalIdValueSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java
index ee7bef2eede9..d54300e29fb7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
index c172d6339eaf..7c0f75e3cfb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyles.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java
index 36cbc840fdf9..edbfc8409da9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java
index 2f2b4afffd7f..57371f90a6c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
index 428a2c43c9b4..0d28cee07676 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -264,9 +262,9 @@ public void afterAction(PersistentCollection collection) {
 	private boolean fromMerge;
 
 	/**
-	 * Reset the stored snapshot for both the persistent collection and this collection entry. 
+	 * Reset the stored snapshot for both the persistent collection and this collection entry.
 	 * Used during the merge of detached collections.
-	 * 
+	 *
 	 * @param collection the persistentcollection to be updated
 	 * @param storedSnapshot the new stored snapshot
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java
index d34bcc40cb2c..556af57d26c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ComparableExecutable.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ComparableExecutable.java
index 81398f9d9522..934f60fd85cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ComparableExecutable.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ComparableExecutable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeOwner.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeOwner.java
index 515fe402371d..88b9753cbb6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeOwner.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeTracker.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeTracker.java
index 2a3c9e5b90f0..19f2d980cfe7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CompositeTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
index 1656e3e1d7f0..2bb2e865d41e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EffectiveEntityGraph.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
index f1d456bd03d1..ba422d2d11bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -122,7 +120,7 @@ public interface EntityEntry {
 	 * 
  • if the current status is {@link Status#DELETED},
 	 *     then the entity was not read-only when it was deleted.
 	 * 
-	 * 
+	 *
 	 * @return {@code true}, if the entity is modifiable;
 	 *         {@code false}, otherwise,
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java
index 4024a41400bd..5cc64299b0ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.engine.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java
index e295838f493e..b7314f390cb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityHolder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityHolder.java
index 8502197cfb49..0ff0ade15054 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
index e71ac6763375..9b4270a4acef 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java
index 475140acc896..7becad7f75bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -14,8 +12,6 @@
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
 
-import org.checkerframework.checker.initialization.qual.UnderInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExceptionConverter.java
index 6abff1dcd8f1..a0fbcdaa22b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExceptionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExceptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java
index 2a81126739ab..c4ac7f207c7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -146,7 +144,7 @@ public boolean isEmpty() {
 
 	/**
 	 * Removes the entry at position index in the list.
-	 * 
+	 *
 	 * @param index The index of the element to remove
 	 *
 	 * @return the entry that was removed
@@ -179,7 +177,7 @@ public void clear() {
 
 	/**
 	 * Removes the last n entries from the list.
-	 * 
+	 *
 	 * @param n The number of elements to remove.
 	 */
 	public void removeLastN(int n) {
@@ -198,7 +196,7 @@ public void removeLastN(int n) {
 
 	/**
 	 * Add an {@link Executable} to this list.
-	 * 
+	 *
 	 * @param executable the executable to add to the list
 	 *
 	 * @return true if the object was added to the list
@@ -271,7 +269,7 @@ public E get(int index) {
 
 	/**
 	 * Returns an iterator for the list. Wraps the list just in case something tries to modify it.
-	 * 
+	 *
 	 * @return an unmodifiable iterator
 	 */
 	@Override
@@ -281,7 +279,7 @@ public Iterator iterator() {
 
 	/**
 	 * Write this list out to the given stream as part of serialization
-	 * 
+	 *
 	 * @param oos The stream to which to serialize our state
 	 */
 	@Override
@@ -310,7 +308,7 @@ public void writeExternal(ObjectOutput oos) throws IOException {
 	/**
 	 * Read this object state back in from the given stream as part of
 	 * the deserialization process.
-	 * 
+	 *
 	 * @param in The stream from which to read our serial state
 	 */
 	@Override
@@ -344,7 +342,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
 	/**
 	 * Allow the {@link Executable}s to reassociate themselves with the
 	 * session after deserialization.
-	 * 
+	 *
 	 * @param session The session with which to associate the {@code Executable}s
 	 */
 	public void afterDeserialize(EventSource session) {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java
index 1c93ca67f0fd..8eee2159b307 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecuteUpdateResultCheckStyle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExtendedSelfDirtinessTracker.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExtendedSelfDirtinessTracker.java
index e2165c11acbf..9894541e4c2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExtendedSelfDirtinessTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExtendedSelfDirtinessTracker.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
 import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker;
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
-import org.hibernate.engine.spi.SelfDirtinessTracker;
 
 /**
  * A self dirtiness tracker that declares additional methods that are intended for
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/FilterDefinition.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/FilterDefinition.java
index 26046dd0d7bf..1e92483a54cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/FilterDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/FilterDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java
index ff22bcaaa373..dc6fe7262cc3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
index b5c4d7ca2829..39398b61ba08 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
index 125970356764..4beaad7a993e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
index ac3aff50b718..59fc8c16ddb7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
index f239f1b48763..6380a0f19c8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
index cedc9a631457..88b4b6719449 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
index 4a9109c81aa3..59a2fc9a0ca6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/NaturalIdResolutions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/NaturalIdResolutions.java
index 19c945fa6c39..9fd221ac7d55 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/NaturalIdResolutions.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/NaturalIdResolutions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -69,11 +67,11 @@ void manageSharedResolution(
 	 * Removes any cross-reference from the L2 cache
 	 */
 	void removeSharedResolution(Object id, Object naturalId, EntityMappingType entityDescriptor, boolean delayToAfterTransactionCompletion);
-	
+
 	default void removeSharedResolution(Object id, Object naturalId, EntityMappingType entityDescriptor) {
 		removeSharedResolution( id, naturalId, entityDescriptor, false );
 	}
-	
+
 	/**
 	 * Find the cached natural-id for the given identifier
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
index b90fb52e9347..215a7c7c4085 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptable.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptable.java
index 6a21b4e2f4c2..6925f228ad0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptable.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptor.java
index c984e4ce520b..0142995b6eb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistentAttributeInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PrimeAmongSecondarySupertypes.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PrimeAmongSecondarySupertypes.java
index 691aa45a2e3b..4520af330709 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PrimeAmongSecondarySupertypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PrimeAmongSecondarySupertypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Resolution.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Resolution.java
index 6e3f974471fb..5f9b48e0f179 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Resolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Resolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java
index ec63ec48b215..5cf174784e59 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java
index 6b7cd4d06203..18e778992e5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
index da5d081bed49..a2929c370672 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionEventListenerManager.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionEventListenerManager.java
index 79e0f3d73383..48aedc46842e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionEventListenerManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionEventListenerManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
index 7ea19fc69e51..576bd8d36efd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
index 2885ce118982..86a0b8981be3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
index 9b4ee4b32d3f..797650a555be 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
index c6986ee6325e..473eea1ebb8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
index 09c8c7d6de09..d2d6d5d358fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -242,7 +240,7 @@ default void checkTransactionNeededForUpdateOperation(String exceptionMessage) {
 	 * This method is primarily for internal or integrator use.
 	 *
 	 * @return the {@link Transaction}
-     */
+	 */
 	Transaction accessTransaction();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
index 6165e372673e..7c9c42ab834d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Status.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Status.java
index 5c929fb4fdce..3a39ff575626 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Status.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Status.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java
index bbebfc5383e8..57fcd79ca205 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
index 0a0db20b6ce4..478360944c5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
@@ -18,7 +16,7 @@
 
 /**
  * An ordered pair of a value and its Hibernate type.
- * 
+ *
  * @see Type
  * @author Gavin King
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/UnsavedValueStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/UnsavedValueStrategy.java
index 6b5eee58d8cd..9c6a9dd4c52f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/UnsavedValueStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/UnsavedValueStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ValueInclusion.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ValueInclusion.java
index 375e1a4fe980..8790609dd81f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ValueInclusion.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ValueInclusion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java
index 27a7571ff819..9497431d044d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java
index 38c93af72244..a94e81cf4aa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java
index 202e7207257e..4d186efc43dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.internal.jta;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java
index a889801bd7c6..42ade53e7c23 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java
index 31865b084013..4ac98459474b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java
index 4060385582c2..3a993a228cec 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
index 79bcde121597..6fac084a759e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java
index 126d98eb5a09..e0784228fe1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java
index 0fcad0e01688..56fdac665cb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java
index 49ee8814121e..e038df6c6816 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java
index 3239514a9da4..0c824ecc1892 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java
index ab3eadbf09ef..0eae843016a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
index 55475374bf1f..431b486e1c04 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
index 02330a6885bd..3f4f4ce65d6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformResolverInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
@@ -12,7 +10,6 @@
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver;
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import org.jboss.logging.Logger;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java
index 028e1c732f9c..b019f2afc75a 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java
index da0386ba4a1d..e1e505cfb463 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java
index 515412abf6fa..9a0117101515 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java
index eb739c7c198c..44acc93437d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java
index 0ae8e16236b4..9676e6ab7f44 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java
index f0519e10d8c1..49e27459fd26 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
index 559f4efb5315..63c2c7c131b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
@@ -13,7 +11,6 @@
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformProvider;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver;
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import org.jboss.logging.Logger;
@@ -114,7 +111,7 @@ public JtaPlatform resolveJtaPlatform(Map configurationValues, ServiceRegistryIm
 		}
 		catch (ClassLoadingException ignore) {
 		}
-		
+
 		// WebSphere Liberty ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		try {
 			classLoaderService.classForName(WebSphereLibertyJtaPlatform.TMF_CLASS_NAME);
@@ -122,7 +119,7 @@ public JtaPlatform resolveJtaPlatform(Map configurationValues, ServiceRegistryIm
 		}
 		catch (ClassLoadingException ignore) {
 		}
-		
+
 		// WebSphere traditional ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		for ( WebSphereJtaPlatform.WebSphereEnvironment webSphereEnvironment
 				: WebSphereJtaPlatform.WebSphereEnvironment.values() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java
index 91a439b180aa..a5cf93639f6f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java
index 1a10f55effac..85d352708360 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
index d08bd9600a33..2c13d5abc1f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java
index c897c7e13209..23eb1ce523de 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
index 4f0ad48dcc68..84bdedfb3e60 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java
index 056f8c6b9579..9e55586a4dca 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
 import java.lang.reflect.Method;
 import jakarta.transaction.TransactionManager;
 import jakarta.transaction.UserTransaction;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
 import org.hibernate.internal.util.NullnessUtil;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java
index ac0d91448fec..13adfb89df16 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
@@ -25,11 +23,11 @@
  * @author Nathan Rauh
  */
 public class WebSphereLibertyJtaPlatform extends AbstractJtaPlatform {
-	
+
 	public static final String TMF_CLASS_NAME = "com.ibm.tx.jta.TransactionManagerFactory";
-	
+
 	public static final String UT_NAME = "java:comp/UserTransaction";
-	
+
 	@Override
 	protected TransactionManager locateTransactionManager() {
 		try {
@@ -52,7 +50,7 @@ protected UserTransaction locateUserTransaction() {
 	public boolean canRegisterSynchronization() {
 		try {
 			return getCurrentStatus() == Status.STATUS_ACTIVE;
-		} 
+		}
 		catch (SystemException x) {
 			throw new RuntimeException(x);
 		}
@@ -72,7 +70,7 @@ public Object getTransactionIdentifier(Transaction transaction) {
 	public void registerSynchronization(Synchronization synchronization) {
 		try {
 			NullnessUtil.castNonNull( retrieveTransactionManager() ).getTransaction().registerSynchronization(synchronization);
-		} 
+		}
 		catch ( RollbackException | SystemException x ) {
 			throw new RuntimeException(x);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java
index 443f2e8ed758..7eda50ab57e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java
index 91c8cc1e4f37..ecae358dea95 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java
index 7cb8c2d25b2d..6b81fdd2bdc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java
index f012ea04c091..f7d57d2a96cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformProvider.java
index b345dc162119..a6a839bc5e97 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformResolver.java
index 501c0804ce63..2595eb14dce4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.jta.platform.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java
index 034c0dc86da1..34069ef198c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
index eda4a8817a2e..1e1dd72749e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -421,7 +419,7 @@ protected void postFlush(SessionImplementor session) throws HibernateException {
 
 		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
 		persistenceContext.clearCollectionsByKey();
-		
+
 		// the database has changed now, so the subselect results need to be invalidated
 		// the batch fetching queues should also be cleared - especially the collection batch fetching one
 		persistenceContext.getBatchFetchQueue().clear();
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
index cf71cc2b90a1..305c3aa67066 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractVisitor.java
index f9e5bff67794..4f8288db5639 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -44,7 +42,7 @@ void processValues(Object[] values, Type[] types) throws HibernateException {
 			}
 		}
 	}
-	
+
 	/**
 	 * Dispatch each property value to processValue().
 	 *
@@ -56,15 +54,15 @@ public void processEntityPropertyValues(Object[] values, Type[] types) throws Hi
 			}
 		}
 	}
-	
+
 	void processValue(int i, Object[] values, Type[] types) {
 		processValue( values[i], types[i] );
 	}
-	
+
 	boolean includeEntityProperty(Object[] values, int i) {
 		return includeProperty(values, i);
 	}
-	
+
 	boolean includeProperty(Object[] values, int i) {
 		return values[i]!= LazyPropertyInitializer.UNFETCHED_PROPERTY;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java
index 3fcccb781ea2..5e2aeb135b38 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -35,7 +33,7 @@ public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener
 
 	/**
 	 * Handle the given auto-flush event.
-	 * 
+	 *
 	 * @param event The auto-flush event to be handled.
 	 */
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
index 12dd11f70554..dcd857ebcee5 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDirtyCheckEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDirtyCheckEventListener.java
index 28d6c2cc94f0..8c92a9cab41e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDirtyCheckEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDirtyCheckEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -25,7 +23,7 @@ public class DefaultDirtyCheckEventListener extends AbstractFlushingEventListene
 
 	/**
 	 * Handle the given dirty-check event.
-	 * 
+	 *
 	 * @param event The dirty-check event to be handled.
 	 */
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
index 9b6f9714552e..756917d00ace 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -127,7 +125,7 @@ protected void doEvict(
 		// EntityEntry to take precedence
 		// This is now handled by removeEntity()
 		//session.getPersistenceContext().removeDatabaseSnapshot(key);
-		
+
 		persistenceContext.removeEntityHolder( key );
 		persistenceContext.removeEntry( object );
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
index 59d2739ef589..8a80bae75755 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java
index af3882f44753..ffa7518db297 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -16,7 +14,7 @@
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 /**
- * Defines the default flush event listeners used by hibernate for 
+ * Defines the default flush event listeners used by hibernate for
  * flushing session state in response to generated flush events.
  *
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java
index 2790308dedac..3e1d5339091e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
index cfd84bccd7b0..bd2695271d37 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
index 29050735f234..f91106da5426 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -73,7 +71,7 @@ public void onLock(LockEvent event) throws HibernateException {
 		final Object entity = persistenceContext.unproxyAndReassociate( event.getObject() );
 		//TODO: if object was an uninitialized proxy, this is inefficient,
 		//      resulting in two SQL selects
-		
+
 		EntityEntry entry = persistenceContext.getEntry( entity );
 		if ( entry == null ) {
 			final EntityPersister persister = source.getEntityPersister( event.getEntityName(), entity );
@@ -88,7 +86,7 @@ public void onLock(LockEvent event) throws HibernateException {
 
 		upgradeLock( entity, entry, event.getLockOptions(), event.getSession() );
 	}
-	
+
 	private void cascadeOnLock(LockEvent event, EntityPersister persister, Object entity) {
 		final EventSource source = event.getSession();
 		final PersistenceContext persistenceContext = source.getPersistenceContextInternal();
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
index 5da9c32577f2..4ccea081149f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
index 2149a573f31f..cfeff3d31585 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistOnFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistOnFlushEventListener.java
index f83521e3d0e4..11b469654ebe 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistOnFlushEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistOnFlushEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
index 1c8aea5d5b3a..92a1236293d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPreLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPreLoadEventListener.java
index 009e78ddb305..458eb358a662 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPreLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPreLoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -29,5 +27,5 @@ public void onPreLoad(PreLoadEvent event) {
 				persister.getPropertyTypes()
 		);
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
index ab98da97e499..ce7e1dc06185 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
index b219a315b5de..ab60854306af 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java
index 4be09180c826..f5f0d9bcc4a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DirtyCollectionSearchVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DirtyCollectionSearchVisitor.java
index 75ad08c0e023..c106726a2f38 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DirtyCollectionSearchVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DirtyCollectionSearchVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventManager.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventManager.java
index 135e29dc57a6..c18f21dd26b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java
index c3772533e643..3d350376a126 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
index b507701b3540..07a20b9ad5ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java
index af6740ef9952..9ba0ba64c411 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java
index 666ef26ec493..ea17f6755d00 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserverFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java
index 94a2e591dfdb..e833ac163afc 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EventUtil.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EventUtil.java
index 3ea7b26d2a92..efb9f31fac49 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EventUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EventUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
index 9dfab05f9fab..053c29e9fc07 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -29,7 +27,7 @@
  */
 public class EvictVisitor extends AbstractVisitor {
 	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EvictVisitor.class );
-	
+
 	private final Object owner;
 
 	public EvictVisitor(EventSource session, Object owner) {
@@ -44,7 +42,7 @@ Object processCollection(Object collection, CollectionType type) throws Hibernat
 		}
 		return null;
 	}
-	
+
 	public void evictCollection(Object value, CollectionType type) {
 		final EventSource session = getSession();
 		final PersistentCollection collection;
@@ -91,7 +89,7 @@ private void evictCollection(PersistentCollection collection) {
 			}
 		}
 	}
-	
+
 	@Override
 	boolean includeEntityProperty(Object[] values, int i) {
 		return true;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
index 0bbb765637ee..63ddacff83f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java
index 88be88fa0c31..d6ab23ebab6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
index 7c66c827748d..e05b7dbf7e7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
index 13f5cb3abdf5..fb51752109db 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/PostDeleteEventListenerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/event/internal/PostDeleteEventListenerStandardImpl.java
index 3ee1082248ac..54c3bc38fb8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/PostDeleteEventListenerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/PostDeleteEventListenerStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/PostInsertEventListenerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/event/internal/PostInsertEventListenerStandardImpl.java
index 36f189db6464..642ef1d0460b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/PostInsertEventListenerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/PostInsertEventListenerStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
index 09c71e7b5b44..f8e651e6348b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpsertEventListenerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpsertEventListenerStandardImpl.java
index 664ef602e477..f75721f4edc9 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpsertEventListenerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpsertEventListenerStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
index 0a1497e6819d..ec5c49f74e3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
@@ -49,7 +47,7 @@ private static boolean isCollectionSnapshotValid(PersistentCollection snapsho
 			&& snapshot.getRole() != null
 			&& snapshot.getKey() != null;
 	}
-	
+
 	/**
 	 * Reattach a detached (disassociated) initialized or uninitialized
 	 * collection wrapper, using a snapshot carried with the collection
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
index c5b22344684b..e4fcc51760be 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
index fb04a8c945e6..b709790ee1f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
index 9ccf6025f9d0..840516bba6e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
index baca145a2336..0f31df941a52 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
index 9b20980291b1..341eaf6a9085 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/DuplicationStrategy.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/DuplicationStrategy.java
index 46dadcc1e94e..aa3769c0286b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/DuplicationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/DuplicationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventActionWithParameter.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventActionWithParameter.java
index e685b5293bee..f9f040e58e41 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventActionWithParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventActionWithParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java
index 9f8270f5e732..127d0bdc7e26 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistrationException.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistrationException.java
index 4ad09fdcf0c2..25ee633c8068 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistrationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistrationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
@@ -10,7 +8,7 @@
 
 /**
  * Indicates a problem registering an event listener.
- * 
+ *
  * @author Steve Ebersole
  */
 public class EventListenerRegistrationException extends HibernateException {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistry.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistry.java
index 0fa1166fe33c..3f38e400679f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/JpaBootstrapSensitive.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/JpaBootstrapSensitive.java
index 2862fba284a3..3635ac135142 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/JpaBootstrapSensitive.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/JpaBootstrapSensitive.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
index d46f0e46e1df..0614ddd74cc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractEvent.java
index a070b1071177..307e70810037 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -19,21 +17,21 @@ public abstract class AbstractEvent implements Serializable {
 
 	private final EventSource session;
 
-    /**
-     * Constructs an event from the given event session.
-     *
-     * @param source The session event source.
-     */
+	/**
+	 * Constructs an event from the given event session.
+	 *
+	 * @param source The session event source.
+	 */
 	public AbstractEvent(EventSource source) {
 		this.session = source;
 	}
 
-    /**
-     * Returns the session event source for this event. This is the underlying
-     * session from which this event was generated.
-     *
-     * @return The session event source.
-     */
+	/**
+	 * Returns the session event source for this event. This is the underlying
+	 * session from which this event was generated.
+	 *
+	 * @return The session event source.
+	 */
 	public final EventSource getSession() {
 		return session;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java
index 6d4f931d3f65..6de40593973c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -76,4 +74,3 @@ public SessionFactoryImplementor getFactory() {
 		return persister.getFactory();
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEvent.java
index 7207aef36711..6b318b839a01 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEventListener.java
index dd7f5fcb33a8..c7d705657fc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AutoFlushEventListener.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 import org.hibernate.HibernateException;
-import org.hibernate.SharedSessionContract;
 
 /**
  * Defines the contract for handling of session auto-flush events.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEvent.java
index 962aa29b4226..e6b26f1c6242 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEventListener.java
index 1cb77ac33525..972faff8bc43 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ClearEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteContext.java b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteContext.java
index 1c1548eaccc1..526e7619003e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEvent.java
index 46e6ec198399..0e4d953bec1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -55,10 +53,10 @@ public DeleteEvent(String entityName, Object object, boolean cascadeDeleteEnable
 	}
 
 	/**
-     * Returns the encapsulated entity to be deleted.
-     *
-     * @return The entity to be deleted.
-     */
+	 * Returns the encapsulated entity to be deleted.
+	 *
+	 * @return The entity to be deleted.
+	 */
 	public Object getObject() {
 		return object;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEventListener.java
index 6375f5fa136a..c7e26f274785 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/DeleteEventListener.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
-import java.util.Set;
 
 import org.hibernate.HibernateException;
 
@@ -17,11 +14,11 @@
  */
 public interface DeleteEventListener {
 
-    /**
+	/**
 	 * Handle the given delete event.
-     *
-     * @param event The delete event to be handled.
-     */
+	 *
+	 * @param event The delete event to be handled.
+	 */
 	void onDelete(DeleteEvent event) throws HibernateException;
 
 	void onDelete(DeleteEvent event, DeleteContext transientEntities) throws HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEvent.java
index eb7cbbc2614f..6d034e7bc398 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEventListener.java
index 7e680b5d325d..b69391c75977 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/DirtyCheckEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
index f9db794080f7..15ca27c2b1af 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserverFactory.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserverFactory.java
index f2752a8eb227..a9fe2c66ae90 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserverFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserverFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngine.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngine.java
index 14636e3e0358..c525377aa988 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngine.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributions.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributions.java
index 8dbefe73836b..9f126d1b2bf3 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributions.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributor.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributor.java
index 505be95edf69..6eec8c110b25 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventEngineContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java
index fef29c5db5d6..d7aef740ba40 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
index 8f7f7862fbe6..2e9fd517e983 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -17,7 +15,7 @@
  * @author Gavin King
  */
 public interface EventSource extends SessionImplementor {
-	
+
 	/**
 	 * Get the ActionQueue for this session
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java
index e071534c4555..55a5ad587b85 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEvent.java
index 80a218ee063c..271f2bfd9e24 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEventListener.java
index aa395b429c73..4267c9635775 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EvictEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -15,7 +13,7 @@
  */
 public interface EvictEventListener {
 
-	/** 
+	/**
 	 * Handle the given evict event.
 	 *
 	 * @param event The evict event to be handled.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java
index d20e3c3718a6..caadd6638223 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java
index a011e9fc21f2..06c8c9fa8218 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEvent.java
index c3c82a119600..d2b4837c62f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEventListener.java
index fb77ed011d9d..53c2464d9a1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -14,10 +12,10 @@
  * @author Steve Ebersole
  */
 public interface FlushEventListener {
-    /**
+	/**
 	 * Handle the given flush event.
-     *
-     * @param event The flush event to be handled.
-     */
+	 *
+	 * @param event The flush event to be handled.
+	 */
 	void onFlush(FlushEvent event) throws HibernateException;
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java
index eae9dd087f8b..b45d12d8247c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
index c9a52e62952c..1c0188746b2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -11,7 +9,7 @@
 /**
  * An event that occurs when a collection wants to be
  * initialized
- * 
+ *
  * @author Gavin King
  */
 public class InitializeCollectionEvent extends AbstractCollectionEvent {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java
index c1b9242ed07f..487d8904fb4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java
@@ -1,15 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 import org.hibernate.HibernateException;
 
 /**
- * Defines the contract for handling of collection initialization events 
+ * Defines the contract for handling of collection initialization events
  * generated by a session.
  *
  * @author Gavin King
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
index e12370baf354..3e0162f6c287 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEventListener.java
index 602fdc1f7307..ec9425a25ae3 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java
index 0ba58b582068..84027241f579 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/LockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/LockEventListener.java
index bacf4e16d551..34bf37b41321 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/LockEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/LockEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
index c9a83e3e45ab..4384a1d45f83 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -90,8 +88,8 @@ public class MergeContext implements Map {
 	// TODO: merge mergeEntityToOperatedOnFlagMap into mergeToManagedEntityXref, since they have the same key.
 	//       need to check if this would hurt performance.
 	private final Map mergeEntityToOperatedOnFlagMap = new IdentityHashMap<>( 10 );
-	    // key is a merge entity;
-	    // value is a flag indicating if the merge entity is currently in the merge process.
+		// key is a merge entity;
+		// value is a flag indicating if the merge entity is currently in the merge process.
 
 	public MergeContext(EventSource session, EntityCopyObserver entityCopyObserver){
 		this.session = session;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java
index aac739ac50d0..6fe49cb557bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java
index e0b564c22a72..5dd78343fd80 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -15,14 +13,14 @@
  */
 public interface MergeEventListener {
 
-	/** 
+	/**
 	 * Handle the given merge event.
 	 *
 	 * @param event The merge event to be handled.
 	 */
 	void onMerge(MergeEvent event) throws HibernateException;
 
-	/** 
+	/**
 	 * Handle the given merge event.
 	 *
 	 * @param event The merge event to be handled.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistContext.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistContext.java
index 25919509d43a..5b302fc302ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java
index 208115344bcc..51c902d74b77 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java
index 44fb03418939..a1a029aea3a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -15,14 +13,14 @@
  */
 public interface PersistEventListener {
 
-	/** 
+	/**
 	 * Handle the given create event.
 	 *
 	 * @param event The create event to be handled.
 	 */
 	void onPersist(PersistEvent event) throws HibernateException;
 
-	/** 
+	/**
 	 * Handle the given create event.
 	 *
 	 * @param event The create event to be handled.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostActionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostActionEventListener.java
index 3df4c6c099b4..35ef000d0e4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostActionEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostActionEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
index 4be7bd9a547c..c49b7ff0ed1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEventListener.java
index e9ea095a5216..7933debf7be8 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
index 0e69d7b64eb4..a6e94e4f201f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEventListener.java
index 1e815bf06d70..06569651015e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
index 22b40a5407d6..cb573f369f4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEventListener.java
index 41b4a9c0ed47..58d58601de17 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitDeleteEventListener.java
index 0119581556bf..a406c7f62e09 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitDeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitDeleteEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -14,7 +12,7 @@
 public interface PostCommitDeleteEventListener extends PostDeleteEventListener {
 	/**
 	 * Called when a commit fails and an entity was scheduled for deletion
-	 * 
+	 *
 	 * @param event the delete event to be handled
 	 */
 	void onPostDeleteCommitFailed(PostDeleteEvent event);
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitInsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitInsertEventListener.java
index 679c755d6324..2ad75fbe5934 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitInsertEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitInsertEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -14,7 +12,7 @@
 public interface PostCommitInsertEventListener extends PostInsertEventListener {
 	/**
 	 * Called when a commit fails and an entity was scheduled for insertion
-	 * 
+	 *
 	 * @param event the insert event to be handled
 	 */
 	void onPostInsertCommitFailed(PostInsertEvent event);
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitUpdateEventListener.java
index 987d4f889698..f52ad325a097 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitUpdateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCommitUpdateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -14,7 +12,7 @@
 public interface PostCommitUpdateEventListener extends PostUpdateEventListener {
 	/**
 	 * Called when a commit fails and an entity was scheduled for update
-	 * 
+	 *
 	 * @param event the update event to be handled
 	 */
 	void onPostUpdateCommitFailed(PostUpdateEvent event);
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEvent.java
index 3d458d1756d0..1d07890f4e18 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Occurs after deleting an item from the datastore
- * 
+ *
  * @author Gavin King
  */
 public class PostDeleteEvent extends AbstractEvent {
@@ -19,7 +17,7 @@ public class PostDeleteEvent extends AbstractEvent {
 	private final EntityPersister persister;
 	private final Object id;
 	private final Object[] deletedState;
-	
+
 	public PostDeleteEvent(
 			Object entity,
 			Object id,
@@ -32,7 +30,7 @@ public PostDeleteEvent(
 		this.persister = persister;
 		this.deletedState = deletedState;
 	}
-	
+
 	public Object getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEventListener.java
index 7df5d932e40c..22b7660d4388 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostDeleteEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called after deleting an item from the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PostDeleteEventListener extends PostActionEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEvent.java
index 35d8f0a8a4ec..904ed5449829 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Occurs after inserting an item in the datastore
- * 
+ *
  * @author Gavin King
  */
 public class PostInsertEvent extends AbstractEvent {
@@ -19,7 +17,7 @@ public class PostInsertEvent extends AbstractEvent {
 	private EntityPersister persister;
 	private Object[] state;
 	private Object id;
-	
+
 	public PostInsertEvent(
 			Object entity,
 			Object id,
@@ -32,7 +30,7 @@ public PostInsertEvent(
 		this.state = state;
 		this.persister = persister;
 	}
-	
+
 	public Object getEntity() {
 		return entity;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEventListener.java
index 930a3c904817..86ef4f7d872b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostInsertEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEvent.java
index 7a5b988849ab..118bbfddc437 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -31,11 +29,11 @@ public void reset() {
 	public Object getEntity() {
 		return entity;
 	}
-	
+
 	public EntityPersister getPersister() {
 		return persister;
 	}
-	
+
 	public Object getId() {
 		return id;
 	}
@@ -44,7 +42,7 @@ public PostLoadEvent setEntity(Object entity) {
 		this.entity = entity;
 		return this;
 	}
-	
+
 	public PostLoadEvent setId(Object id) {
 		this.id = id;
 		return this;
@@ -54,5 +52,5 @@ public PostLoadEvent setPersister(EntityPersister persister) {
 		this.persister = persister;
 		return this;
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEventListener.java
index 4a2d22f2e7f3..a142bb34c4f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostLoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEvent.java
index 361afa206837..866ce7d89e35 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Occurs after the datastore is updated
- * 
+ *
  * @author Gavin King
  */
 public class PostUpdateEvent extends AbstractEvent {
@@ -22,7 +20,7 @@ public class PostUpdateEvent extends AbstractEvent {
 	private Object id;
 	//list of dirty properties as computed by Hibernate during a FlushEntityEvent
 	private final int[] dirtyProperties;
-	
+
 	public PostUpdateEvent(
 			Object entity,
 			Object id,
@@ -40,7 +38,7 @@ public PostUpdateEvent(
 		this.dirtyProperties = dirtyProperties;
 		this.persister = persister;
 	}
-	
+
 	public Object getEntity() {
 		return entity;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEventListener.java
index aab33f0697e8..dd5494800166 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpdateEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called after updating the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PostUpdateEventListener extends PostActionEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEvent.java
index 9600bc2e54ed..e51c04307014 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Occurs after the datastore is updated
- * 
+ *
  * @author Gavin King
  */
 public class PostUpsertEvent extends AbstractEvent {
@@ -37,7 +35,7 @@ public PostUpsertEvent(
 		this.dirtyProperties = dirtyProperties;
 		this.persister = persister;
 	}
-	
+
 	public Object getEntity() {
 		return entity;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEventListener.java
index 6b1cf82a821d..cfaa65f6edff 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostUpsertEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called after updating the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PostUpsertEventListener extends PostActionEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
index 0c4bd8396019..f5ea8aa0061e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEventListener.java
index 243c32d0e6d2..4ceb93db28b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
index c55171252fde..b742c2ed0588 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEventListener.java
index 1134fc1f024e..f1bbf793fe7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
index 01082591fdec..e3bbc6b3ff92 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEventListener.java
index ad2ecb3e2a44..c0c268ab9c42 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java
index 53094b780ef4..93129190be92 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEventListener.java
index 9113f5fc6c02..a1995cc1b65a 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called before deleting an item from the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PreDeleteEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java
index e67b1b88b475..0c4db784c8e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEventListener.java
index 00ae3f1821a8..935bc80fa4d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called before inserting an item in the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PreInsertEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java
index 41c292f1c67e..c838854f5dc4 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -37,11 +35,11 @@ public Object getEntity() {
 	public Object getId() {
 		return id;
 	}
-	
+
 	public EntityPersister getPersister() {
 		return persister;
 	}
-	
+
 	public Object[] getState() {
 		return state;
 	}
@@ -50,7 +48,7 @@ public PreLoadEvent setEntity(Object entity) {
 		this.entity = entity;
 		return this;
 	}
-	
+
 	public PreLoadEvent setId(Object id) {
 		this.id = id;
 		return this;
@@ -60,7 +58,7 @@ public PreLoadEvent setPersister(EntityPersister persister) {
 		this.persister = persister;
 		return this;
 	}
-	
+
 	public PreLoadEvent setState(Object[] state) {
 		this.state = state;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEventListener.java
index fcc21f7fbe5b..05ed136d09ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java
index 940fd90bdc55..f1c6de8fcaf9 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -25,7 +23,7 @@ public class PreUpdateEvent extends AbstractPreDatabaseOperationEvent {
 	 * @param id The id of the entity to use for updating.
 	 * @param state The state to be updated.
 	 * @param oldState The state of the entity at the time it was loaded from
-     *                 the database.
+	 *                 the database.
 	 * @param persister The entity's persister.
 	 * @param source The session from which the event originated.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEventListener.java
index a02f0b687a67..01a2099eb0b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called before updating the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PreUpdateEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEvent.java
index 522930465334..60cb4d2a16e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEventListener.java
index e8871fbb286e..03f59e62318e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpsertEventListener.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 /**
  * Called before updating the datastore
- * 
+ *
  * @author Gavin King
  */
 public interface PreUpsertEventListener {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshContext.java b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshContext.java
index 5ecd4614c122..8e8898db8e11 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEvent.java
index 109a2c3c1085..39ca09e63834 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEventListener.java
index 7b6557d1f732..e68c098ce6f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/RefreshEventListener.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
-import java.util.Map;
 
 import org.hibernate.HibernateException;
 
@@ -17,13 +14,13 @@
  */
 public interface RefreshEventListener {
 
-    /** 
-     * Handle the given refresh event.
-     *
-     * @param event The refresh event to be handled.
-     */
+	/**
+	 * Handle the given refresh event.
+	 *
+	 * @param event The refresh event to be handled.
+	 */
 	void onRefresh(RefreshEvent event) throws HibernateException;
-	
+
 	void onRefresh(RefreshEvent event, RefreshContext refreshedAlready) throws HibernateException;
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEvent.java
index dccec88b9651..2e74a1e089c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -21,7 +19,7 @@ public class ReplicateEvent extends AbstractEvent {
 	public ReplicateEvent(Object object, ReplicationMode replicationMode, EventSource source) {
 		this(null, object, replicationMode, source);
 	}
-	
+
 	public ReplicateEvent(String entityName, Object object, ReplicationMode replicationMode, EventSource source) {
 		super(source);
 		this.entityName = entityName;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEventListener.java
index 660611237438..993baf040e2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ReplicateEventListener.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 import org.hibernate.HibernateException;
-import org.hibernate.ReplicationMode;
 
 /**
  * Defines the contract for handling of replicate events generated from a session.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java
index f3dda94c23b3..73e407779cad 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -16,7 +14,7 @@
 
 /**
  * Defines an event class for the resolving of an entity id from the entity's natural-id
- * 
+ *
  * @author Eric Dalquist
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java
index 5683f6a2c656..19855f2df9d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
@@ -10,7 +8,7 @@
 
 /**
  * Defines the contract for handling of resolve natural id events generated from a session.
- * 
+ *
  * @author Eric Dalquist
  * @author Steve Ebersole
  */
@@ -18,7 +16,7 @@ public interface ResolveNaturalIdEventListener {
 
 	/**
 	 * Handle the given resolve natural id event.
-	 * 
+	 *
 	 * @param event The resolve natural id event to be handled.
 	 *
 	 * @throws HibernateException Indicates a problem resolving natural id to primary key
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java
index 5b49fb329a09..74de92074ccb 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.spi;
 
 import org.hibernate.engine.spi.EntityEntry;
 
-/** 
+/**
  * An event class for saveOrUpdate()
  *
  * @author Steve Ebersole
@@ -74,15 +72,15 @@ public void setEntityName(String entityName) {
 	public Object getEntity() {
 		return entity;
 	}
-	
+
 	public void setEntity(Object entity) {
 		this.entity = entity;
 	}
-	
+
 	public EntityEntry getEntry() {
 		return entry;
 	}
-	
+
 	public void setEntry(EntityEntry entry) {
 		this.entry = entry;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java b/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java
index 45401c3b3ad1..1ab581d186e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 import java.sql.SQLException;
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java
index a39f3c0aefa0..c77a9e8b2320 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java b/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java
index 401232585b25..bf1772dd0ecc 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 import java.sql.SQLException;
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java b/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java
index 96059baae93d..4c68b06c6189 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 import java.sql.SQLException;
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java b/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java
index 2f495cc176f1..d7b784ba87c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/LockTimeoutException.java b/hibernate-core/src/main/java/org/hibernate/exception/LockTimeoutException.java
index 1ca26583c41d..129adab3ab94 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/LockTimeoutException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/LockTimeoutException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java b/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java
index a01d49d8c46e..4cb9be726508 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception;
 import java.sql.SQLException;
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java
index 93cf6bfbdbff..7365ed222a85 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java
index 9dd1f4393ad5..ee52df5fbea1 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/StandardSQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/StandardSQLExceptionConverter.java
index e3b5f91f03dd..5a4e8db7ce04 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/internal/StandardSQLExceptionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/StandardSQLExceptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java
index 799023709d85..7d2c5513d3d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java
index ff82ca74c71e..078db162c218 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java
index 59a98d5f6f86..404566545752 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java
index 8a08f7face55..07478434765b 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/TemplatedViolatedConstraintNameExtractor.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/TemplatedViolatedConstraintNameExtractor.java
index 89b4e805f8a3..defc82da3e96 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/TemplatedViolatedConstraintNameExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/TemplatedViolatedConstraintNameExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/ViolatedConstraintNameExtractor.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/ViolatedConstraintNameExtractor.java
index f99dda52331e..884c302f7ac9 100644
--- a/hibernate-core/src/main/java/org/hibernate/exception/spi/ViolatedConstraintNameExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/ViolatedConstraintNameExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.exception.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java b/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
index 5ead40d6b881..f2d45117bf16 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/Assigned.java b/hibernate-core/src/main/java/org/hibernate/generator/Assigned.java
index c1efdf99d8a0..3d4b52a111f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/Assigned.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/Assigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/BeforeExecutionGenerator.java b/hibernate-core/src/main/java/org/hibernate/generator/BeforeExecutionGenerator.java
index 82dbf0da9bbb..49f76a0783c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/BeforeExecutionGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/BeforeExecutionGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/EventType.java b/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
index 0c9f1e0d10f7..3d230d8de1af 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/EventTypeSets.java b/hibernate-core/src/main/java/org/hibernate/generator/EventTypeSets.java
index 8c83925a3ae9..47a9a943b19a 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/EventTypeSets.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/EventTypeSets.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/Generator.java b/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
index 50a52ce9c10b..447ca1ea054e 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java b/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
index bd72b162145f..410c6d17b277 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java b/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
index 778a16195b58..b977f0d29af5 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
index 6c1efc06cae2..b44e0422811a 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedAlwaysGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedAlwaysGeneration.java
index b1e6411ce550..0089179bd148 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedAlwaysGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedAlwaysGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedGeneration.java
index aab21ae16dd2..03a456ec7699 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/GeneratedGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
@@ -63,4 +61,3 @@ public boolean writePropertyValue() {
 		return writable && sql==null;
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/NaturalIdHelper.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/NaturalIdHelper.java
index d460d068ccc7..c02564492a07 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/NaturalIdHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/NaturalIdHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
index 140c9b8566c3..37ba90dd1d8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
index 7feb4a05d932..6df304f61972 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/VersionGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/VersionGeneration.java
index 03cf4b093f00..5a51b5c54e6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/VersionGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/VersionGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/AbstractGeneratedValuesMutationDelegate.java b/hibernate-core/src/main/java/org/hibernate/generator/values/AbstractGeneratedValuesMutationDelegate.java
index 57351e19d914..93e2178ec2f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/AbstractGeneratedValuesMutationDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/AbstractGeneratedValuesMutationDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java
index 5d87eef4a606..776d7c20d9bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValues.java b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValues.java
index 633b7a7572db..112b6927a667 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValuesMutationDelegate.java b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValuesMutationDelegate.java
index 83ca11905c22..8f5cd6b1f940 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValuesMutationDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/GeneratedValuesMutationDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
index 56dc60c6a2ce..28775eaf5be8 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesImpl.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesImpl.java
index 836b2e6d94e4..4d6f8e4d1949 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java
index 9af06d67f36e..5d6f2f523623 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/TableUpdateReturningBuilder.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/TableUpdateReturningBuilder.java
index 0d2536b587f1..5e0e33d65ba3 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/TableUpdateReturningBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/TableUpdateReturningBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.generator.values.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
index 4e2c72be93c4..e1767bc1b13d 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java
index 0e07aab858ec..8ff818ce6f1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/CannotContainSubGraphException.java b/hibernate-core/src/main/java/org/hibernate/graph/CannotContainSubGraphException.java
index 1ad813009248..134d40d9990a 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/CannotContainSubGraphException.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/CannotContainSubGraphException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
index ee0aabebafc6..15e6fe64623b 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
@@ -25,20 +23,20 @@
  * A collection of {@link EntityGraph} utilities.
  *
  * @apiNote These methods really belong inside other classes that we cannot modify.
- * 
+ *
  * @author asusnjar
  */
 public final class EntityGraphs {
 	/**
 	 * Merges multiple entity graphs into a single graph that specifies the
 	 * fetching/loading of all attributes the input graphs specify.
-	 * 
+	 *
 	 * @param       Root entity type of the query and graph.
-	 * 
+	 *
 	 * @param em       EntityManager to use to create the new merged graph.
 	 * @param rootType Root type of the entity for which the graph is being merged.
 	 * @param graphs   Graphs to merge.
-	 * 
+	 *
 	 * @return         The merged graph.
 	 */
 	@SuppressWarnings("unchecked")
@@ -179,11 +177,11 @@ public static  List executeList(TypedQuery query, EntityGraph graph)
 	/**
 	 * Compares two entity graphs and returns {@code true} if they are equal,
 	 * ignoring attribute order.
-	 * 
+	 *
 	 * @param   Root entity type of BOTH graphs.
 	 * @param a    Graph to compare.
 	 * @param b    Graph to compare.
-	 * 
+	 *
 	 */
 	public static  boolean areEqual(EntityGraph a, EntityGraph b) {
 		if ( a == b ) {
@@ -291,7 +289,7 @@ public static boolean areEqual(@SuppressWarnings("rawtypes") Subgraph a, @Suppre
 		if ( aNodes.size() != bNodes.size() ) {
 			return false;
 		}
-		
+
 		for ( AttributeNode aNode : aNodes ) {
 			String attributeName = aNode.getAttributeName();
 			AttributeNode bNode = null;
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java
index a59b51098662..41f06e1c2a19 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
 import java.util.List;
 
-import jakarta.persistence.Subgraph;
 import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.MapAttribute;
 import jakarta.persistence.metamodel.PluralAttribute;
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphNode.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphNode.java
index ff8e89cae877..d90556ffb726 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/GraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
index 0034eb0cbcba..21666ee07706 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
@@ -46,7 +44,7 @@ public final class GraphParser {
 	 * @param rootType The root entity type
 	 * @param graphText The textual representation of the graph
 	 * @param entityManager The EntityManager
-	 * 
+	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
 	public static  RootGraph parse(
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
index a3c06af4f26a..da113e2e6687 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/InvalidGraphException.java b/hibernate-core/src/main/java/org/hibernate/graph/InvalidGraphException.java
index c5551194ddab..37cd4cc2aba2 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/InvalidGraphException.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/InvalidGraphException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
@@ -10,7 +8,7 @@
 
 /**
  * Thrown by {@link GraphParser} to indicate textual entity graph representation parsing errors.
- * 
+ *
  * @author asusnjar
  *
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java
index f11ee5a05916..e3047d075cd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java
index 1e517b33dded..ffee6efb75ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraph.java
index 96a6f983da8d..689d99aaff5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraph.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraphNode.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraphNode.java
index af727d647be6..f8d632b94e53 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
index 36f4b5aa2cb6..37e641e0fd7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphParserLogging.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphParserLogging.java
index 82287065a4ed..d85c7133c0ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphParserLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphParserLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java
index f08424885671..fa586080f8e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java
index 73b60740c599..1a3b53c4a0f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
index bd98b0f36ef3..2c8d463a8a5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal.parse;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
index a7bdc1f946dd..a3b1468a89f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal.parse;
 
@@ -10,7 +8,6 @@
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
-import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
 
 import static org.hibernate.metamodel.model.domain.internal.DomainModelHelper.resolveSubType;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
index 4ee417943f96..094858dcfa88 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.internal.parse;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/AppliedGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/AppliedGraph.java
index 6b8c36bba6c1..4929036b5cf3 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/AppliedGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/AppliedGraph.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
index e86f5df6e7f9..449d7a000718 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphHelper.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphHelper.java
index 2c24d455321c..dc667c9069d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
index 9d8b0d2a90a7..6d5d8b4b48f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphNodeImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphNodeImplementor.java
index 0d6c457cf741..4c6b2d987aa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphNodeImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphNodeImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/RootGraphImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/RootGraphImplementor.java
index 0001a00b2f3d..b4542e8e9cdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/RootGraphImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/RootGraphImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/SubGraphImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/SubGraphImplementor.java
index 336a5c482809..a90a9285612d 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/SubGraphImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/SubGraphImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graph.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java
index b2eac33d0023..2274de83cc46 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java
index 8507f8b9bf74..9b21b65e1a0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/Assigned.java b/hibernate-core/src/main/java/org/hibernate/id/Assigned.java
index ad0cae33aa1a..61272dea326f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/Assigned.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/Assigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/BulkInsertionCapableIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/BulkInsertionCapableIdentifierGenerator.java
index a07400f191b6..aab49530e577 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/BulkInsertionCapableIdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/BulkInsertionCapableIdentifierGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
index 83d813220fbc..110ade9791e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -24,7 +22,7 @@
  * need to happen to "fill" the identifier property(s).
  * 
    
  * This generator is used implicitly for all composite identifier scenarios if an
- * explicit generator is not in place.  So it make sense to discuss the various 
+ * explicit generator is not in place.  So it make sense to discuss the various
  * potential scenarios:
      
  * 
    • 
  * "embedded" composite identifier - this is possible only in HBM mappings
diff --git a/hibernate-core/src/main/java/org/hibernate/id/Configurable.java b/hibernate-core/src/main/java/org/hibernate/id/Configurable.java
index 457d264bb27b..88acaeeab0c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/Configurable.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/Configurable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java
index 36da5ee91697..29a038b4ecb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
index 89559f813656..a6759158ab8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java
index 219d11be192a..20f360e5a56a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -11,8 +9,6 @@
 import org.hibernate.MappingException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.GeneratorCreationContext;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 import static org.hibernate.id.IdentifierGeneratorHelper.getForeignId;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
index e3d7a571a8ed..775997ed1c25 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java
index 49a0bdee69f0..d1ae308c91d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
index ce28daf48039..513ccfd1e17d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -17,7 +15,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.generator.Generator;
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.generator.BeforeExecutionGenerator;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java
index cf6179fcf1c6..fe7c13dd6381 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
index 5bf9d45abc28..61150b5bfcc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
index 401ddde0c338..a8c12305deea 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
index ab837c339203..5325df5dbc9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -25,8 +23,6 @@
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHolder;
 import static org.hibernate.id.PersistentIdentifierGenerator.CATALOG;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java b/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java
index b5ffe8f77afa..79c1aabfbf1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 import java.io.Serializable;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/OptimizableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/OptimizableGenerator.java
index 956fad6cb4b2..e1f693de5b76 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/OptimizableGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/OptimizableGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
index 7043d2d58cc0..c1c21096a73d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
 import java.util.Properties;
 
 import org.hibernate.generator.GeneratorCreationContext;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 /**
  * An {@link IdentifierGenerator} that requires creation of database objects.
diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
index d192980d27c1..2622a3394a7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.Type;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
index 500b18ed6818..93601fdc285b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -12,7 +10,6 @@
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.type.Type;
 
 import static org.hibernate.generator.internal.NaturalIdHelper.getNaturalIdPropertyNames;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceMismatchStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceMismatchStrategy.java
index 80a58a368cdd..34f4b1630d3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/SequenceMismatchStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceMismatchStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java
index f1a24832cd2a..106d0fb66bbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
index abc20ac499cc..15fdfe1f8868 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
index fa0ba8c60142..033d16374eba 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id;
 
@@ -13,7 +11,6 @@
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.type.Type;
 
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AbstractOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AbstractOptimizer.java
index 7d37481f0b0e..6a26c55d8309 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AbstractOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AbstractOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java
index 307ab0ec3edb..43bfa137f747 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java
@@ -1,31 +1,29 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.id.enhanced;
-
-import org.hibernate.id.IntegralDataTypeHolder;
-
-/**
- * Contract for providing callback access to a {@link DatabaseStructure},
- * typically from the {@link Optimizer}.
- *
- * @author Steve Ebersole
- */
-public interface AccessCallback {
-	/**
-	 * Retrieve the next value from the underlying source.
-	 *
-	 * @return The next value.
-	 */
-	IntegralDataTypeHolder getNextValue();
-
-	/**
-	 * Obtain the tenant identifier (multi-tenancy), if one, associated with this callback.
-	 *
-	 * @return The tenant identifier
-	 */
-	String getTenantIdentifier();
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.id.enhanced;
+
+import org.hibernate.id.IntegralDataTypeHolder;
+
+/**
+ * Contract for providing callback access to a {@link DatabaseStructure},
+ * typically from the {@link Optimizer}.
+ *
+ * @author Steve Ebersole
+ */
+public interface AccessCallback {
+	/**
+	 * Retrieve the next value from the underlying source.
+	 *
+	 * @return The next value.
+	 */
+	IntegralDataTypeHolder getNextValue();
+
+	/**
+	 * Obtain the tenant identifier (multi-tenancy), if one, associated with this callback.
+	 *
+	 * @return The tenant identifier
+	 */
+	String getTenantIdentifier();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/CustomOptimizerDescriptor.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/CustomOptimizerDescriptor.java
index 409c33215f6b..d9b9c8847433 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/CustomOptimizerDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/CustomOptimizerDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java
index 7e2640ef0a57..a577184f700f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
index 0c4e84e59584..b045dbc6d17f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ImplicitDatabaseObjectNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ImplicitDatabaseObjectNamingStrategy.java
index 50375f1abbc0..4dfca9916f5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ImplicitDatabaseObjectNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ImplicitDatabaseObjectNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/InitialValueAwareOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/InitialValueAwareOptimizer.java
index 53e1ac001c9e..8fcfb3ee97a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/InitialValueAwareOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/InitialValueAwareOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
index fe775c42cfc3..a2e3c178526e 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
index f26dfc607386..a8de4d25f65d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java
index 3766d57ca013..f3a948ee3c1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java
index 98b3ef2d71f8..1c045261493b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerDescriptor.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerDescriptor.java
index 9a971e64e7a9..340635246417 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
index 48daf0e005b0..b266cc4368b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java
index 00e261190346..f6d4a2b903bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java
index 6c8dfc6cb86c..f9f8bf5d0cba 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java
index 0cc4dafb8ec0..01788366c6b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
index 049bacfcddc8..a60d95cbb676 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
index 5dc637241191..b257cc7cf298 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SingleNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SingleNamingStrategy.java
index 7596940c6ee1..f4fd122ff5e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SingleNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SingleNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
index f09ef1f6af97..2771ed00ea83 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardOptimizerDescriptor.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardOptimizerDescriptor.java
index 1ac0e72781e6..53749e71072f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardOptimizerDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardOptimizerDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
index b620768b829b..7989bc50cfba 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
@@ -44,7 +42,6 @@
 import org.hibernate.id.IntegralDataTypeHolder;
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.jdbc.AbstractReturningWork;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PrimaryKey;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
index 1bcf4ec1d84e..df3bdf824c86 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.enhanced;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
index 816c791093b6..1484a492dcb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
index e0aeb9444895..487633a1f6d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java
index 7d40c1a0fbfb..7299d0df5c0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/BasicSelectingDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java b/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java
index 8558e794237c..87f0c39ac0ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java
@@ -1,17 +1,15 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.id.insert;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Steve Ebersole
- */
-public interface Binder {
-	void bindValues(PreparedStatement ps) throws SQLException;
-	Object getEntity();
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.id.insert;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface Binder {
+	void bindValues(PreparedStatement ps) throws SQLException;
+	Object getEntity();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
index 89aa73c8a64e..8287aeb17866 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java
index 4904427db70c..b1faa7d547d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
@@ -58,7 +56,7 @@ default String prepareIdentifierGeneratingInsert(String insertSQL) {
 	 * @param insertSQL The {@code insert} statement string
 	 * @param session The session in which we are operating
 	 * @param binder The parameter binder
-	 * 
+	 *
 	 * @return The generated identifier value
 	 */
 	GeneratedValues performInsertReturning(String insertSQL, SharedSessionContractImplementor session, Binder binder);
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
index 2e78d1ac2348..93f7bbe17046 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
index 8386948a5ca2..6a72a2056187 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
@@ -24,7 +22,7 @@
  * Specialized {@link GetGeneratedKeysDelegate} which appends the database
  * specific clause which signifies to return generated {@code IDENTITY} values
  * to the end of the insert statement.
- * 
+ *
  * @author Christian Beikov
  */
 public class SybaseJConnGetGeneratedKeysDelegate extends GetGeneratedKeysDelegate {
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java b/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java
index 862af2a9b293..6ce8b13cb0c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/TableInsertReturningBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
index 0277ff796665..6b1dbe728238 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java
index 208d4228dcee..caaaf9c950ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java
index d5ae9f92c541..d80a6883c74d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/LocalObjectUuidHelper.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/LocalObjectUuidHelper.java
index 0971a4e0f438..81749e24f10d 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/LocalObjectUuidHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/LocalObjectUuidHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java
index 86eb8269dac4..17ba2ce1bb6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
index 029212a38c6d..380606c390e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidValueGenerator.java
index 8d6431c850a5..8cc2f3593963 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidValueGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidValueGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.id.uuid;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
index 711a3fb6bdeb..107b4f17ad13 100644
--- a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.integrator.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/integrator/spi/Integrator.java b/hibernate-core/src/main/java/org/hibernate/integrator/spi/Integrator.java
index 8b5da2c0eb45..b7281b7014c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/integrator/spi/Integrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/integrator/spi/Integrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.integrator.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/integrator/spi/IntegratorService.java b/hibernate-core/src/main/java/org/hibernate/integrator/spi/IntegratorService.java
index faffcf1d6701..ef17f71ce8d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/integrator/spi/IntegratorService.java
+++ b/hibernate-core/src/main/java/org/hibernate/integrator/spi/IntegratorService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.integrator.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
index 79a33cefe13b..6acdbc506ae1 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
index edf4df172412..fc4f024dc86f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
@@ -80,7 +78,6 @@
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.spi.HqlInterpretation;
-import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sql.internal.NativeQueryImpl;
 import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
@@ -110,7 +107,6 @@
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
 
 import jakarta.persistence.FlushModeType;
-import jakarta.persistence.NamedNativeQuery;
 import jakarta.persistence.TransactionRequiredException;
 import jakarta.persistence.Tuple;
 import jakarta.persistence.TypedQueryReference;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/BaselineSessionEventsListenerBuilder.java b/hibernate-core/src/main/java/org/hibernate/internal/BaselineSessionEventsListenerBuilder.java
index 0a4619bd1a32..d550c9b30e57 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/BaselineSessionEventsListenerBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/BaselineSessionEventsListenerBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java
index bbb5baf791a5..3e8ca060421d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
index 2ba0bfb3e1c4..82a3728d255a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java
index 8a33b6a83936..a493160046d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
index 9874316dff8f..0cfde0473dd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
index 1697e56c27a0..3f4ede42c772 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/internal/EmptyInterceptor.java
index 7a21ecfacae2..5aade9e9d47b 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/EmptyInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/EmptyInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java
index addb1f2ddc85..7f164ed35658 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
index 279784259dc9..995d58dd083f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java
index 8138e3609b52..5be64475048b 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java
index f29788751549..8880bc35862d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java
index 50dabfaaf384..3942209ee9f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
index 964774c79619..c72ad9e1269f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterAliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterAliasGenerator.java
index 82679d1fe239..c2e7928c716f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterAliasGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterAliasGenerator.java
@@ -1,12 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 /**
- * 
+ *
  * @author Rob Worsnop
  *
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
index 2b24751267f6..d764a4d4ee7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
index 5d374c57f9d2..459d5aa492cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
index 85bffc4e11a3..ff69d7c99f96 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterJdbcParameter.java
index 41ea957dec5d..573559065450 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterJdbcParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterJdbcParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/JdbcSessionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/JdbcSessionContextImpl.java
index 9d5d9cdb8fe5..9b90c7c1db4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/JdbcSessionContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/JdbcSessionContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/LockOptionsHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/LockOptionsHelper.java
index 11f04c530f42..ff77eb3f8bec 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/LockOptionsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/LockOptionsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
index e5c4fececa62..35ac407f81fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
index 93f596761d79..55c98ecb1ed6 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
index 3f8e9e8db37f..40fa4295c2ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/QueryParameterBindingTypeResolverImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/QueryParameterBindingTypeResolverImpl.java
index 53db7aea2d33..b36edeace43e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/QueryParameterBindingTypeResolverImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/QueryParameterBindingTypeResolverImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
index c3a642d0b2d6..eb1285373af3 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionCreationOptions.java
index dffccc7edf49..9b522fb511b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionCreationOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionCreationOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
index 724b8711bb6b..78798a290540 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObserverChain.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObserverChain.java
index e9a14ab3dfa6..a991ae1cab3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObserverChain.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObserverChain.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
index abd4d288a688..0fb1287a2f75 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
index b52754467993..1d8e7f06a1e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactorySettings.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactorySettings.java
index 71a7274027c2..dc57a4592015 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactorySettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactorySettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
index a97ef42a8dcb..23515083d9df 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionOwnerBehavior.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionOwnerBehavior.java
index b86500893c5f..c2393b640bd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionOwnerBehavior.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionOwnerBehavior.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SharedSessionCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/internal/SharedSessionCreationOptions.java
index 3595a3b099c0..1b2b828c79a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SharedSessionCreationOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SharedSessionCreationOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
index 30667c1b0040..cee185023185 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StaticFilterAliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/internal/StaticFilterAliasGenerator.java
index 98e86b5e73c1..87e6ec807b15 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/StaticFilterAliasGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/StaticFilterAliasGenerator.java
@@ -1,19 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
 
 /**
- * 
+ *
  * @author Rob Worsnop
  *
  */
 public class StaticFilterAliasGenerator implements FilterAliasGenerator{
-	
+
 	private final String alias;
 
 	public StaticFilterAliasGenerator(String alias) {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/TableGroupFilterAliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/internal/TableGroupFilterAliasGenerator.java
index 74e89a7842ed..86105c57adb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/TableGroupFilterAliasGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/TableGroupFilterAliasGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/TransactionManagement.java b/hibernate-core/src/main/java/org/hibernate/internal/TransactionManagement.java
index d9df5ba51a9b..64d7c65d8d94 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/TransactionManagement.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/TransactionManagement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowNonPortable.java b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowNonPortable.java
index b562abb64673..a76ea3f93189 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowNonPortable.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowNonPortable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.build;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowPrintStacktrace.java b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowPrintStacktrace.java
index 2edb4560d5aa..d989d40f4dff 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowPrintStacktrace.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowPrintStacktrace.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.build;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowSysOut.java b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowSysOut.java
index 68c730a53ae1..6ad980a1f586 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/build/AllowSysOut.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/build/AllowSysOut.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.build;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
index 0a062209f9bf..6b30bad6a8ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
index 8d43bf7023a1..642f829b3eae 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
index bd6f6052c0c8..a89b2f0d93dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
index c0eaa923a491..3e5f777fb740 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java
index 00fdb6b9664a..93ff71cd76bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/SubSystemLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/log/SubSystemLogging.java
index 331974f5b985..5729c7cc406a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/SubSystemLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/SubSystemLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
index 7d1e09d47b42..64379da23cce 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.log;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
index 18eaa0268dd4..f7767f96b37f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
@@ -77,7 +75,7 @@ public static byte[] fromLong(long longValue) {
 	 *
 	 * @param longValue The long to interpret to binary
 	 * @param dest the destination array.
-     * @param destPos starting position in the destination array.
+	 * @param destPos starting position in the destination array.
 	 */
 	public static void fromLong(long longValue, byte[] dest, int destPos) {
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java
index ff66c8844d42..da20ef3cdc1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
index e618f8b44143..2869715221e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
index 12ccc44062e5..8eda904731a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ExceptionHelper.java
index d3ae83d02ef0..a7a41fb3061c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ExceptionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ExceptionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
index b7d4b5226ecd..48adb8205db4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java
index 0a1c01fdade1..c9c195cbb443 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.internal.util;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedBiConsumer.java b/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedBiConsumer.java
index e8abd5ddcb4b..ed4ff11b08fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedBiConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedBiConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedConsumer.java b/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedConsumer.java
index 6cec34e1a5f5..02970fc31ba5 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/IndexedConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/JdbcExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/JdbcExceptionHelper.java
index 1e56acff69bb..f02744f6013a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/JdbcExceptionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/JdbcExceptionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/KeyedConsumer.java b/hibernate-core/src/main/java/org/hibernate/internal/util/KeyedConsumer.java
index 5d1b3ec2ad9f..8b7357a51b03 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/KeyedConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/KeyedConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java
index 233b4b31bf96..89f56be2d2fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LazyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
index 25338dd55d67..cb029aeb294d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
index a503aefd15df..4aa1c8940fef 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MathHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MathHelper.java
index 69561bba1d45..73b009c1b87e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MathHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MathHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java
index c1e79d854157..b3825239a321 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java
index 41a9c736c6c3..2e32f6c0c042 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java
index 9122f57f12a2..cc1861e5bffc 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java
index 5b86146584dc..64aae0921e18 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java
index a697bbe29b9a..7c9480b3c053 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java
index a40e72ddd9b6..a39ea872a428 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java
@@ -1,26 +1,6 @@
 /*
- * Checker Framework utilities
- * Copyright 2004-present by the Checker Framework developers
- *
- * MIT License:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/PropertiesHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/PropertiesHelper.java
index cf0a61f65762..1a11026c0ea6 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/PropertiesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/PropertiesHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/QuotingHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/QuotingHelper.java
index 695d866248e7..472613b4144e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/QuotingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/QuotingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
index 5bc378ac3a11..235882028aad 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
index 640200f507ef..f0ca5b43954d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
index fd683ccced14..71831e74c8c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
index 3ab5d62a191a..ff80c33b51ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java
index 02e11b867b1f..a6a68f052af1 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java
@@ -1,15 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
 /**
  * Represents a "final" value that is initialized either {@link #ValueHolder(Object) up front} or once at some point
  * {@linkplain #ValueHolder(DeferredInitializer) after} declaration.
- * 
+ *
  * Note: If a Serializable class has a {@link ValueHolder} property, that property should be declared transient!
  *
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ZonedDateTimeComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ZonedDateTimeComparator.java
index 11858d3e9aed..0356602192da 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ZonedDateTimeComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ZonedDateTimeComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
index af7e12c63470..68a5d6ea34a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.beans;
 import java.beans.BeanInfo;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
index 1f2493b3b982..176eecae4610 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.beans;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
index bf2f47174844..35f5c64e143f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
index 727ef56207ae..3370d0a68446 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
@@ -1,19 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
- *
- * Modified for https://jira.jboss.org/jira/browse/ISPN-299
- * Includes ideas described in http://portal.acm.org/citation.cfm?id=1547428
- *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.internal.util.collections;
 
 import java.io.IOException;
@@ -1075,41 +1063,41 @@ public HashEntry createNewEntry(K key, int hash, HashEntry next, V v
 	 */
 	static final class Segment extends ReentrantLock {
 		/*
-			   * Segments maintain a table of entry lists that are ALWAYS
-			   * kept in a consistent state, so can be read without locking.
-			   * Next fields of nodes are immutable (final).  All list
-			   * additions are performed at the front of each bin. This
-			   * makes it easy to check changes, and also fast to traverse.
-			   * When nodes would otherwise be changed, new nodes are
-			   * created to replace them. This works well for hash tables
-			   * since the bin lists tend to be short. (The average length
-			   * is less than two for the default load factor threshold.)
-			   *
-			   * Read operations can thus proceed without locking, but rely
-			   * on selected uses of volatiles to ensure that completed
-			   * write operations performed by other threads are
-			   * noticed. For most purposes, the "count" field, tracking the
-			   * number of elements, serves as that volatile variable
-			   * ensuring visibility.  This is convenient because this field
-			   * needs to be read in many read operations anyway:
-			   *
-			   *   - All (unsynchronized) read operations must first read the
-			   *     "count" field, and should not look at table entries if
-			   *     it is 0.
-			   *
-			   *   - All (synchronized) write operations should write to
-			   *     the "count" field after structurally changing any bin.
-			   *     The operations must not take any action that could even
-			   *     momentarily cause a concurrent read operation to see
-			   *     inconsistent data. This is made easier by the nature of
-			   *     the read operations in Map. For example, no operation
-			   *     can reveal that the table has grown but the threshold
-			   *     has not yet been updated, so there are no atomicity
-			   *     requirements for this with respect to reads.
-			   *
-			   * As a guide, all critical volatile reads and writes to the
-			   * count field are marked in code comments.
-			   */
+			* Segments maintain a table of entry lists that are ALWAYS
+			* kept in a consistent state, so can be read without locking.
+			* Next fields of nodes are immutable (final).  All list
+			* additions are performed at the front of each bin. This
+			* makes it easy to check changes, and also fast to traverse.
+			* When nodes would otherwise be changed, new nodes are
+			* created to replace them. This works well for hash tables
+			* since the bin lists tend to be short. (The average length
+			* is less than two for the default load factor threshold.)
+			*
+			* Read operations can thus proceed without locking, but rely
+			* on selected uses of volatiles to ensure that completed
+			* write operations performed by other threads are
+			* noticed. For most purposes, the "count" field, tracking the
+			* number of elements, serves as that volatile variable
+			* ensuring visibility.  This is convenient because this field
+			* needs to be read in many read operations anyway:
+			*
+			*   - All (unsynchronized) read operations must first read the
+			*     "count" field, and should not look at table entries if
+			*     it is 0.
+			*
+			*   - All (synchronized) write operations should write to
+			*     the "count" field after structurally changing any bin.
+			*     The operations must not take any action that could even
+			*     momentarily cause a concurrent read operation to see
+			*     inconsistent data. This is made easier by the nature of
+			*     the read operations in Map. For example, no operation
+			*     can reveal that the table has grown but the threshold
+			*     has not yet been updated, so there are no atomicity
+			*     requirements for this with respect to reads.
+			*
+			* As a guide, all critical volatile reads and writes to the
+			* count field are marked in code comments.
+			*/
 
 		private static final long serialVersionUID = 2249069246763182397L;
 
@@ -1525,14 +1513,14 @@ public BoundedConcurrentHashMap(int capacity, int concurrencyLevel) {
 	public boolean isEmpty() {
 		final Segment[] segments = this.segments;
 		/*
-			   * We keep track of per-segment modCounts to avoid ABA
-			   * problems in which an element in one segment was added and
-			   * in another removed during traversal, in which case the
-			   * table was never actually empty at any point. Note the
-			   * similar use of modCounts in the size() and containsValue()
-			   * methods, which are the only other methods also susceptible
-			   * to ABA problems.
-			   */
+			* We keep track of per-segment modCounts to avoid ABA
+			* problems in which an element in one segment was added and
+			* in another removed during traversal, in which case the
+			* table was never actually empty at any point. Note the
+			* similar use of modCounts in the size() and containsValue()
+			* methods, which are the only other methods also susceptible
+			* to ABA problems.
+			*/
 		int[] mc = new int[segments.length];
 		int mcsum = 0;
 		for ( int i = 0; i < segments.length; ++i ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CaseInsensitiveDictionary.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CaseInsensitiveDictionary.java
index c476ad72466b..b25f57ea755f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CaseInsensitiveDictionary.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CaseInsensitiveDictionary.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
index e89ff2b55990..9090068dc9c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
index 743fa4ed0d90..fc36f9281fd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
@@ -1,16 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.internal.util.collections;
 
 import java.io.IOException;
@@ -1646,9 +1637,9 @@ public V nextElement() {
 		}
 	}
 
-	/*
-		  * This class is needed for JDK5 compatibility.
-		  */
+	/**
+	 * This class is needed for JDK5 compatibility.
+	 */
 	static class SimpleEntry implements Entry, Serializable {
 		private static final long serialVersionUID = -8499721149061103585L;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java
index c00e67384b24..c8ec1356c16c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
index 8d1f51908d5d..02ad7593aa26 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
 import java.io.Serializable;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentitySet.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentitySet.java
index 732d5907c9eb..8dd2fcdb8c8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentitySet.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentitySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedList.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedList.java
index 389a55d7c1e8..e70c3410210e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedList.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazyIndexedMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazyIndexedMap.java
index a35c6d284c65..5a5f2d435150 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazyIndexedMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazyIndexedMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java
index 02fe9be9a27d..7efa05b147bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LazySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LockModeEnumMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LockModeEnumMap.java
index 9cddfd292fef..426d23832dfe 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LockModeEnumMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/LockModeEnumMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/MapBackedClassValue.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/MapBackedClassValue.java
index 9bc7f3bb6fd3..4d3dfe134f0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/MapBackedClassValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/MapBackedClassValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java
index e3f55e9efd3b..cc51d01b919e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/Stack.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/Stack.java
index d8b5e7b72d35..32c3e142f9b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/Stack.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/Stack.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java
index ba5c04b80085..52c711453b8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.collections;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java
index 06760f261a6d..1989ec3d64ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.compare;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java
index 5a831ea6ccb5..76a1accd09fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.compare;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
index e313f8c88f36..d9a63d168444 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.compare;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java
index a4dbc3965d82..cc4f45cefc6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.config;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java
index 1a71df69bb6e..a257acfb6923 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.config;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java
index ecb7c8edb1e7..8eb002719c74 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java
index b22311aba8ee..f9f9811080f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.xml;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java
index 30dd4ae282c7..156b8e8b7f22 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java
@@ -1,17 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.internal.util.xml;
 
 import org.hibernate.HibernateException;
 
 /**
  * Indicates an issue finding or loading an XSD schema.
- * 
+ *
  * @author Steve Ebersole
  */
 public class XsdException extends HibernateException {
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java
index 10a529c9ff1a..06f36b7afd8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java
index 8a835d257941..e0b1bbe3053e 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java
index cd5fcf217bc1..09df86f02bfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java
@@ -1,25 +1,23 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.jdbc;
-import org.hibernate.HibernateException;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * Indicates a failed batch entry (-3 return).
- *
- * @author Steve Ebersole
- */
-public class BatchFailedException extends HibernateException {
-	public BatchFailedException(String s) {
-		super( s );
-	}
-
-	public BatchFailedException(String string, @Nullable Throwable root) {
-		super( string, root );
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.jdbc;
+import org.hibernate.HibernateException;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Indicates a failed batch entry (-3 return).
+ *
+ * @author Steve Ebersole
+ */
+public class BatchFailedException extends HibernateException {
+	public BatchFailedException(String s) {
+		super( s );
+	}
+
+	public BatchFailedException(String string, @Nullable Throwable root) {
+		super( string, root );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java
index f13c7a42c914..a21c4f2fdadc 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
index 2ce11631cb6e..5c805f32d681 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
@@ -1,243 +1,241 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.jdbc;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import org.hibernate.HibernateException;
-import org.hibernate.MappingException;
-import org.hibernate.exception.GenericJDBCException;
-
-import static org.hibernate.jdbc.Expectations.checkBatched;
-import static org.hibernate.jdbc.Expectations.checkNonBatched;
-import static org.hibernate.jdbc.Expectations.sqlExceptionHelper;
-import static org.hibernate.jdbc.Expectations.toCallableStatement;
-
-/**
- * Defines an expected DML operation outcome.
- * Used to verify that a JDBC operation completed successfully.
- * 
      
- * The two standard implementations are {@link RowCount} for
- * row count checking, and {@link OutParameter} for checking
- * the return code assigned to an output parameter of a
- * {@link CallableStatement}. Custom implementations are
- * permitted.
- * 
      
- * An {@code Expectation} is usually selected via an annotation,
- * for example:
- * 
      - * @Entity
- * @SQLUpdate(sql = "update Record set uid = gen_random_uuid(), whatever = ? where id = ?",
- *            verify = Expectation.RowCount.class)
- * class Record { ... }
- * 
      
- *
- * @see org.hibernate.annotations.SQLInsert#verify
- * @see org.hibernate.annotations.SQLUpdate#verify
- * @see org.hibernate.annotations.SQLDelete#verify
- * @see org.hibernate.annotations.SQLDeleteAll#verify
- *
- * @author Steve Ebersole
- */
-public interface Expectation {
-
-	/**
-	 * Is it acceptable to combine this expectation with JDBC
-	 * {@linkplain PreparedStatement#executeBatch() statement batching}?
-	 * If this method returns {@code false}, the use of batch updates
-	 * is disabled.
-	 *
-	 * @return True if batching can be combined with this expectation;
-	 *         false otherwise.
-	 *
-	 * @see PreparedStatement#executeBatch()
-	 */
-	default boolean canBeBatched() {
-		return true;
-	}
-
-	/**
-	 * The number of JDBC parameters this expectation uses. For example,
-	 * {@link OutParameter} requires a single OUT parameter for reading
-	 * back the number of affected rows.
-	 */
-	default int getNumberOfParametersUsed() {
-		return 0;
-	}
-
-	/**
-	 * Perform verification of the outcome of the JDBC operation based
-	 * on the type of expectation defined, after execution of the given
-	 * {@link PreparedStatement}. When a SQL statement is executed via
-	 * {@link PreparedStatement#executeUpdate()}, {@code verifyOutcome()}
-	 * is called exactly once. When {@link PreparedStatement#executeBatch()}
-	 * is used to execute a batch update, this method is called once for
-	 * each element of the batch.
-	 * 
        
-	 * 
      • The argument to {@code rowCount} is usually the number of
-	 *     table rows affected by execution of the SQL statement via
-	 *     {@code executeUpdate()}. However, in the case where
-	 *     {@code executeBatch()} is used to execute a batch update,
-	 *     it might be {@link PreparedStatement#EXECUTE_FAILED} or
-	 *     {@link PreparedStatement#SUCCESS_NO_INFO}.
-	 * 
      • The argument to {@code batchPosition} is negative unless
-	 *     {@code executeBatch()} is used to execute a batch update,
-	 *     in which case it is the position within the batch of the
-	 *     row count being verified.
-	 * 
      
-	 *
-	 * @param rowCount The RDBMS reported "number of rows affected"
-	 * @param statement The statement representing the operation
-	 * @param batchPosition The position in the batch (if batching),
-	 *                      or {@code -1} if not part of a batch
-	 * @param sql The SQL backing the prepared statement, for error
-	 *            reporting and logging purposes
-	 * @throws SQLException Exception from the JDBC driver.
-	 * @throws HibernateException Problem processing the outcome.
-	 *
-	 * @see PreparedStatement#executeUpdate()
-	 * @see PreparedStatement#executeBatch()
-	 */
-	void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql)
-			throws SQLException, HibernateException;
-
-	/**
-	 * Perform any special statement preparation, for example,
-	 * registration of OUT parameters.
-	 *
-	 * @param statement The statement to be prepared
-	 * @return The number of bind positions consumed (if any)
-	 * @throws SQLException Exception from the JDBC driver
-	 * @throws HibernateException Problem performing preparation.
-	 *
-	 * @see CallableStatement#registerOutParameter(int, int)
-	 */
-	default int prepare(PreparedStatement statement)
-			throws SQLException, HibernateException {
-		return 0;
-	}
-
-	/**
-	 * Check that this implementation is compatible with the kind of
-	 * {@link PreparedStatement} it will be called with. Implementors
-	 * should throw a {@link MappingException} if the configuration
-	 * is not supported. This operation is called when Hibernate
-	 * starts up, so that incompatibilities are detected and reported
-	 * as early as possible.
-	 *
-	 * @param callable true if this {@code Expectation} will be called
-	 *                 with a {@link CallableStatement}.
-	 *
-	 * @since 6.5
-	 */
-	default void validate(boolean callable) throws MappingException {
-	}
-
-	/**
-	 * No return code checking. Might mean that no checks are required, or that
-	 * failure is indicated by a {@link java.sql.SQLException} being thrown, for
-	 * example, by a {@link java.sql.CallableStatement stored procedure} which
-	 * performs explicit checks.
-	 *
-	 * @since 6.5
-	 */
-	class None implements Expectation {
-		@Override
-		public void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
-			// nothing to do
-		}
-	}
-
-	/**
-	 * Row count checking. A row count is an integer value returned by
-	 * {@link java.sql.PreparedStatement#executeUpdate()} or
-	 * {@link java.sql.Statement#executeBatch()}. The row count is checked
-	 * against an expected value. For example, the expected row count for
-	 * an {@code INSERT} statement is always 1.
-	 *
-	 * @since 6.5
-	 */
-	class RowCount implements Expectation {
-		@Override
-		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
-			if ( batchPosition < 0 ) {
-				checkNonBatched( expectedRowCount(), rowCount, sql );
-			}
-			else {
-				checkBatched( expectedRowCount(), rowCount, batchPosition, sql );
-			}
-		}
-
-		protected int expectedRowCount() {
-			return 1;
-		}
-	}
-
-	/**
-	 * Essentially identical to {@link RowCount} except that the row count
-	 * is obtained via an output parameter of a {@link CallableStatement
-	 * stored procedure}.
-	 * 
      
-	 * Statement batching is disabled when {@code OutParameter} is used.
-	 *
-	 * @since 6.5
-	 */
-	class OutParameter implements Expectation {
-		@Override
-		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
-			final int result;
-			try {
-				result = toCallableStatement( statement ).getInt( parameterIndex() );
-			}
-			catch ( SQLException sqle ) {
-				sqlExceptionHelper.logExceptions( sqle, "Could not extract row count from CallableStatement" );
-				throw new GenericJDBCException( "Could not extract row count from CallableStatement", sqle );
-			}
-			if ( batchPosition < 0 ) {
-				checkNonBatched( expectedRowCount(), result, sql );
-			}
-			else {
-				checkBatched( expectedRowCount(), result, batchPosition, sql );
-			}
-		}
-
-		@Override
-		public void validate(boolean callable) throws MappingException {
-			if ( !callable ) {
-				throw new MappingException( "Expectation.OutParameter operates exclusively on CallableStatements" );
-			}
-		}
-
-		@Override
-		public int getNumberOfParametersUsed() {
-			return 1;
-		}
-
-		@Override
-		public int prepare(PreparedStatement statement) throws SQLException, HibernateException {
-			toCallableStatement( statement ).registerOutParameter( parameterIndex(), Types.NUMERIC );
-			return 1;
-		}
-
-		@Override
-		public boolean canBeBatched() {
-			return false;
-		}
-
-		protected int parameterIndex() {
-			return 1;
-		}
-
-		protected int expectedRowCount() {
-			return 1;
-		}
-	}
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.jdbc;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.exception.GenericJDBCException;
+
+import static org.hibernate.jdbc.Expectations.checkBatched;
+import static org.hibernate.jdbc.Expectations.checkNonBatched;
+import static org.hibernate.jdbc.Expectations.sqlExceptionHelper;
+import static org.hibernate.jdbc.Expectations.toCallableStatement;
+
+/**
+ * Defines an expected DML operation outcome.
+ * Used to verify that a JDBC operation completed successfully.
+ * 
      
+ * The two standard implementations are {@link RowCount} for
+ * row count checking, and {@link OutParameter} for checking
+ * the return code assigned to an output parameter of a
+ * {@link CallableStatement}. Custom implementations are
+ * permitted.
+ * 
      
+ * An {@code Expectation} is usually selected via an annotation,
+ * for example:
+ * 
      + * @Entity
+ * @SQLUpdate(sql = "update Record set uid = gen_random_uuid(), whatever = ? where id = ?",
+ *            verify = Expectation.RowCount.class)
+ * class Record { ... }
+ * 
      
+ *
+ * @see org.hibernate.annotations.SQLInsert#verify
+ * @see org.hibernate.annotations.SQLUpdate#verify
+ * @see org.hibernate.annotations.SQLDelete#verify
+ * @see org.hibernate.annotations.SQLDeleteAll#verify
+ *
+ * @author Steve Ebersole
+ */
+public interface Expectation {
+
+	/**
+	 * Is it acceptable to combine this expectation with JDBC
+	 * {@linkplain PreparedStatement#executeBatch() statement batching}?
+	 * If this method returns {@code false}, the use of batch updates
+	 * is disabled.
+	 *
+	 * @return True if batching can be combined with this expectation;
+	 *         false otherwise.
+	 *
+	 * @see PreparedStatement#executeBatch()
+	 */
+	default boolean canBeBatched() {
+		return true;
+	}
+
+	/**
+	 * The number of JDBC parameters this expectation uses. For example,
+	 * {@link OutParameter} requires a single OUT parameter for reading
+	 * back the number of affected rows.
+	 */
+	default int getNumberOfParametersUsed() {
+		return 0;
+	}
+
+	/**
+	 * Perform verification of the outcome of the JDBC operation based
+	 * on the type of expectation defined, after execution of the given
+	 * {@link PreparedStatement}. When a SQL statement is executed via
+	 * {@link PreparedStatement#executeUpdate()}, {@code verifyOutcome()}
+	 * is called exactly once. When {@link PreparedStatement#executeBatch()}
+	 * is used to execute a batch update, this method is called once for
+	 * each element of the batch.
+	 * 
        
+	 * 
      • The argument to {@code rowCount} is usually the number of
+	 *     table rows affected by execution of the SQL statement via
+	 *     {@code executeUpdate()}. However, in the case where
+	 *     {@code executeBatch()} is used to execute a batch update,
+	 *     it might be {@link PreparedStatement#EXECUTE_FAILED} or
+	 *     {@link PreparedStatement#SUCCESS_NO_INFO}.
+	 * 
      • The argument to {@code batchPosition} is negative unless
+	 *     {@code executeBatch()} is used to execute a batch update,
+	 *     in which case it is the position within the batch of the
+	 *     row count being verified.
+	 * 
      
+	 *
+	 * @param rowCount The RDBMS reported "number of rows affected"
+	 * @param statement The statement representing the operation
+	 * @param batchPosition The position in the batch (if batching),
+	 *                      or {@code -1} if not part of a batch
+	 * @param sql The SQL backing the prepared statement, for error
+	 *            reporting and logging purposes
+	 * @throws SQLException Exception from the JDBC driver.
+	 * @throws HibernateException Problem processing the outcome.
+	 *
+	 * @see PreparedStatement#executeUpdate()
+	 * @see PreparedStatement#executeBatch()
+	 */
+	void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql)
+			throws SQLException, HibernateException;
+
+	/**
+	 * Perform any special statement preparation, for example,
+	 * registration of OUT parameters.
+	 *
+	 * @param statement The statement to be prepared
+	 * @return The number of bind positions consumed (if any)
+	 * @throws SQLException Exception from the JDBC driver
+	 * @throws HibernateException Problem performing preparation.
+	 *
+	 * @see CallableStatement#registerOutParameter(int, int)
+	 */
+	default int prepare(PreparedStatement statement)
+			throws SQLException, HibernateException {
+		return 0;
+	}
+
+	/**
+	 * Check that this implementation is compatible with the kind of
+	 * {@link PreparedStatement} it will be called with. Implementors
+	 * should throw a {@link MappingException} if the configuration
+	 * is not supported. This operation is called when Hibernate
+	 * starts up, so that incompatibilities are detected and reported
+	 * as early as possible.
+	 *
+	 * @param callable true if this {@code Expectation} will be called
+	 *                 with a {@link CallableStatement}.
+	 *
+	 * @since 6.5
+	 */
+	default void validate(boolean callable) throws MappingException {
+	}
+
+	/**
+	 * No return code checking. Might mean that no checks are required, or that
+	 * failure is indicated by a {@link java.sql.SQLException} being thrown, for
+	 * example, by a {@link java.sql.CallableStatement stored procedure} which
+	 * performs explicit checks.
+	 *
+	 * @since 6.5
+	 */
+	class None implements Expectation {
+		@Override
+		public void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
+			// nothing to do
+		}
+	}
+
+	/**
+	 * Row count checking. A row count is an integer value returned by
+	 * {@link java.sql.PreparedStatement#executeUpdate()} or
+	 * {@link java.sql.Statement#executeBatch()}. The row count is checked
+	 * against an expected value. For example, the expected row count for
+	 * an {@code INSERT} statement is always 1.
+	 *
+	 * @since 6.5
+	 */
+	class RowCount implements Expectation {
+		@Override
+		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
+			if ( batchPosition < 0 ) {
+				checkNonBatched( expectedRowCount(), rowCount, sql );
+			}
+			else {
+				checkBatched( expectedRowCount(), rowCount, batchPosition, sql );
+			}
+		}
+
+		protected int expectedRowCount() {
+			return 1;
+		}
+	}
+
+	/**
+	 * Essentially identical to {@link RowCount} except that the row count
+	 * is obtained via an output parameter of a {@link CallableStatement
+	 * stored procedure}.
+	 * 
      
+	 * Statement batching is disabled when {@code OutParameter} is used.
+	 *
+	 * @since 6.5
+	 */
+	class OutParameter implements Expectation {
+		@Override
+		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
+			final int result;
+			try {
+				result = toCallableStatement( statement ).getInt( parameterIndex() );
+			}
+			catch ( SQLException sqle ) {
+				sqlExceptionHelper.logExceptions( sqle, "Could not extract row count from CallableStatement" );
+				throw new GenericJDBCException( "Could not extract row count from CallableStatement", sqle );
+			}
+			if ( batchPosition < 0 ) {
+				checkNonBatched( expectedRowCount(), result, sql );
+			}
+			else {
+				checkBatched( expectedRowCount(), result, batchPosition, sql );
+			}
+		}
+
+		@Override
+		public void validate(boolean callable) throws MappingException {
+			if ( !callable ) {
+				throw new MappingException( "Expectation.OutParameter operates exclusively on CallableStatements" );
+			}
+		}
+
+		@Override
+		public int getNumberOfParametersUsed() {
+			return 1;
+		}
+
+		@Override
+		public int prepare(PreparedStatement statement) throws SQLException, HibernateException {
+			toCallableStatement( statement ).registerOutParameter( parameterIndex(), Types.NUMERIC );
+			return 1;
+		}
+
+		@Override
+		public boolean canBeBatched() {
+			return false;
+		}
+
+		protected int parameterIndex() {
+			return 1;
+		}
+
+		protected int expectedRowCount() {
+			return 1;
+		}
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
index 7bb463549fd4..430ca3eafa75 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/ReturningWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/ReturningWork.java
index fc5a6b3963bc..8020e1ed5260 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/ReturningWork.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/ReturningWork.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
@@ -26,7 +24,7 @@ public interface ReturningWork {
 	 * @param connection The connection on which to perform the work.
 	 *
 	 * @return The work result
-	 * 
+	 *
 	 * @throws SQLException Thrown during execution of the underlying JDBC interaction.
 	 * @throws org.hibernate.HibernateException Generally indicates a wrapped SQLException.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java
index 99eacc16d2af..6fb351716565 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java
@@ -1,34 +1,32 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.jdbc;
-import org.hibernate.HibernateException;
-
-/**
- * Indicates that more rows were affected then we were expecting to be.
- * Typically indicates presence of duplicate "PK" values in the
- * given table.
- *
- * @author Steve Ebersole
- */
-public class TooManyRowsAffectedException extends HibernateException {
-	private final int expectedRowCount;
-	private final int actualRowCount;
-
-	public TooManyRowsAffectedException(String message, int expectedRowCount, int actualRowCount) {
-		super( message );
-		this.expectedRowCount = expectedRowCount;
-		this.actualRowCount = actualRowCount;
-	}
-
-	public int getExpectedRowCount() {
-		return expectedRowCount;
-	}
-
-	public int getActualRowCount() {
-		return actualRowCount;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.jdbc;
+import org.hibernate.HibernateException;
+
+/**
+ * Indicates that more rows were affected then we were expecting to be.
+ * Typically indicates presence of duplicate "PK" values in the
+ * given table.
+ *
+ * @author Steve Ebersole
+ */
+public class TooManyRowsAffectedException extends HibernateException {
+	private final int expectedRowCount;
+	private final int actualRowCount;
+
+	public TooManyRowsAffectedException(String message, int expectedRowCount, int actualRowCount) {
+		super( message );
+		this.expectedRowCount = expectedRowCount;
+		this.actualRowCount = actualRowCount;
+	}
+
+	public int getExpectedRowCount() {
+		return expectedRowCount;
+	}
+
+	public int getActualRowCount() {
+		return actualRowCount;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
index fdceede5941f..7e07dca39a3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java
index 189c0276f7d6..1421763c1e4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutorVisitable.java b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutorVisitable.java
index 2634dd5251ea..d00d2478d63a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutorVisitable.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutorVisitable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableHints.java b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableHints.java
index 7bdba124e77c..5bbe4cfc8e4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableHints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/CachingType.java b/hibernate-core/src/main/java/org/hibernate/jpa/CachingType.java
index 5f0364e4d739..304870a2288a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/CachingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/CachingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateHints.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateHints.java
index d4450532619a..606277b47156 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateHints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
@@ -10,7 +8,7 @@
  * List of Hibernate-specific (extension) hints available to query,
  * load, and lock scenarios.
  * 
      
- * Some hints are only effective in certain scenarios, which is noted 
+ * Some hints are only effective in certain scenarios, which is noted
  * on each constant's documentation.
  *
  * @apiNote The stringly-typed hints defined here correspond to
@@ -22,8 +20,8 @@
  */
 public interface HibernateHints {
 	/**
-	 * Hint for specifying the {@link org.hibernate.FlushMode} to 
-	 * apply to an {@link jakarta.persistence.EntityManager} or 
+	 * Hint for specifying the {@link org.hibernate.FlushMode} to
+	 * apply to an {@link jakarta.persistence.EntityManager} or
 	 * {@link jakarta.persistence.Query}.
 	 *
 	 * @see org.hibernate.query.Query#setHibernateFlushMode
@@ -64,7 +62,7 @@ public interface HibernateHints {
 	String HINT_FETCH_SIZE = "org.hibernate.fetchSize";
 
 	/**
-	 * Hint for specifying whether results from a query should be 
+	 * Hint for specifying whether results from a query should be
 	 * stored in the query cache.
 	 *
 	 * @see org.hibernate.query.SelectionQuery#setCacheable
@@ -91,7 +89,7 @@ public interface HibernateHints {
 	String HINT_CACHE_MODE = "org.hibernate.cacheMode";
 
 	/**
-	 * Hint for specifying a database comment to be appended to the 
+	 * Hint for specifying a database comment to be appended to the
 	 * SQL statement sent to the database.
 	 *
 	 * @implSpec Not valid for {@link org.hibernate.procedure.ProcedureCall},
@@ -121,16 +119,16 @@ public interface HibernateHints {
 	 * 
      
 	 * Accepts either a {@link jakarta.persistence.LockModeType} or a
 	 * {@link org.hibernate.LockMode}.
-	 * 
-	 * @apiNote While Hibernate supports applying a lock mode to a 
-	 *          native query, the JPA specification requires that 
-	 *          {@link jakarta.persistence.Query#setLockMode} throw 
+	 *
+	 * @apiNote While Hibernate supports applying a lock mode to a
+	 *          native query, the JPA specification requires that
+	 *          {@link jakarta.persistence.Query#setLockMode} throw
 	 *          an {@link IllegalStateException} in this scenario.
 	 */
 	String HINT_NATIVE_LOCK_MODE = "org.hibernate.lockMode";
 
 	/**
-	 * Hint for specifying the 
+	 * Hint for specifying the
 	 * {@linkplain org.hibernate.query.SynchronizeableQuery query spaces}
 	 * that affect the results of a native query.
 	 * 
      
@@ -144,7 +142,7 @@ public interface HibernateHints {
 	 * Typically, these are the names of tables which are referenced by
 	 * the query.
 	 *
-	 * @see org.hibernate.query.SynchronizeableQuery#addSynchronizedQuerySpace 
+	 * @see org.hibernate.query.SynchronizeableQuery#addSynchronizedQuerySpace
 	 * @see #HINT_FLUSH_MODE
 	 * @see org.hibernate.annotations.NamedNativeQuery#querySpaces
 	 */
@@ -225,7 +223,7 @@ public interface HibernateHints {
 	String HINT_QUERY_PLAN_CACHEABLE = "hibernate.query.plan.cacheable";
 
 	/**
-	 * Hint for specifying a query hint to be appended to the 
+	 * Hint for specifying a query hint to be appended to the
 	 * SQL statement sent to the database.
 	 *
 	 * @see org.hibernate.query.spi.MutableQueryOptions#addDatabaseHint(String)
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
index 23167948e54e..131716218280 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
index c7775a9d29cf..7db72d3f90ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
@@ -41,7 +39,7 @@ public class HibernatePersistenceProvider implements PersistenceProvider {
 	private static final CoreMessageLogger log = CoreLogging.messageLogger( HibernatePersistenceProvider.class );
 
 	private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
-	
+
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/JpaComplianceViolation.java b/hibernate-core/src/main/java/org/hibernate/jpa/JpaComplianceViolation.java
index e09f81432b69..e2300d6fae8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/JpaComplianceViolation.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/JpaComplianceViolation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/LegacySpecHints.java b/hibernate-core/src/main/java/org/hibernate/jpa/LegacySpecHints.java
index 0e98ab73e95e..f71610e64e15 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/LegacySpecHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/LegacySpecHints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/jpa/QueryHints.java
index 4078299c7646..4593e3e4d6a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/QueryHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/QueryHints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/SpecHints.java b/hibernate-core/src/main/java/org/hibernate/jpa/SpecHints.java
index 12775a536384..3e656b885f79 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/SpecHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/SpecHints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
index dbb96c73fed8..26e531ef8439 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
@@ -142,12 +140,12 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
 	 * Names a {@link IntegratorProvider}
 	 */
 	public static final String INTEGRATOR_PROVIDER = JpaSettings.INTEGRATOR_PROVIDER;
-	
+
 	/**
 	 * Names a {@link StrategyRegistrationProviderList}
 	 */
 	public static final String STRATEGY_REGISTRATION_PROVIDERS = JpaSettings.STRATEGY_REGISTRATION_PROVIDERS;
-	
+
 	/**
 	 * Names a {@link TypeContributorList}
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java
index 28fed3ac965b..340c87d47a72 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
index 127a7233fa6d..f4835c21d495 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java
index 3d484b37eb88..08b40c4f561d 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
@@ -13,7 +11,6 @@
 import java.util.Properties;
 
 import jakarta.persistence.spi.PersistenceUnitInfo;
-import org.hibernate.boot.archive.internal.ArchiveHelper;
 import org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import org.hibernate.bytecode.spi.ClassTransformer;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java
index a9bfb14327cf..de00d769d34d 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ServiceRegistryCloser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ServiceRegistryCloser.java
index 483ec8e5979b..533a83e45485 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ServiceRegistryCloser.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ServiceRegistryCloser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/StandardJpaScanEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/StandardJpaScanEnvironmentImpl.java
index fc55a6ca35ff..e29689a83516 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/StandardJpaScanEnvironmentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/StandardJpaScanEnvironmentImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
index 21ce58004bc1..f97d1e48503e 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java
index 27bb9071c204..ccd4b8a41911 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/IntegratorProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/IntegratorProvider.java
index 1583bb0f8ac0..5518b02ab9e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/IntegratorProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/IntegratorProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/JpaSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/JpaSettings.java
index ec451c938287..993c88fb450a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/JpaSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/JpaSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceConfigurationDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceConfigurationDescriptor.java
index 2cee372205cf..f24aa1dc3f4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceConfigurationDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceConfigurationDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java
index bfc26022b20b..707787610c67 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
index d0380e7edc3b..49b35a6bdb7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
index 2f662e5a2c15..70d74f3dc02b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/StrategyRegistrationProviderList.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/StrategyRegistrationProviderList.java
index 59c08ee6bba4..c06d3e886df5 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/StrategyRegistrationProviderList.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/StrategyRegistrationProviderList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/TypeContributorList.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/TypeContributorList.java
index 8cbb6c6fb4d2..9f46abec281f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/TypeContributorList.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/TypeContributorList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.boot.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/AbstractCallback.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/AbstractCallback.java
index e7441e2a8920..c9d2eb4250a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/AbstractCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/AbstractCallback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java
index 24e69b6f8de4..c8f36744d93c 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java
index 79aafa67eb5f..f8669bdb9539 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
index c2c389f2e3ae..0a0e8d22d281 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java
index 501dbf38e9e7..6733a6be39a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmptyCallbackRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmptyCallbackRegistryImpl.java
index 0b85a44573a2..71eac5885c7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmptyCallbackRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmptyCallbackRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EntityCallback.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EntityCallback.java
index 7c5c3ac71b43..000eaeb40e21 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EntityCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EntityCallback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/ListenerCallback.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/ListenerCallback.java
index 79e74a67e57a..971452d8452d 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/ListenerCallback.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/ListenerCallback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/Callback.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/Callback.java
index f6a59fd58e2d..287a3266df2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/Callback.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/Callback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackDefinition.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackDefinition.java
index 3bed22602db2..4b3fc81c59eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
index 4ba999582217..ef92e27491f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistryConsumer.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistryConsumer.java
index 9eaa6c58369a..7f2b6d815ac3 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistryConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistryConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java
index 608ad1fda82c..2ef586ba5ed9 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.event.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java
index 05d2cb2be88a..f4383f038f8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/HintsCollector.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/HintsCollector.java
index 2d86d0a0f391..22f062b2f0c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/HintsCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/HintsCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaComplianceImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaComplianceImpl.java
index 008a4ec5db6d..7cea52651488 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaComplianceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaComplianceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaEntityNotFoundDelegate.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaEntityNotFoundDelegate.java
index 2ef55fdc63cc..9b9521443cf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaEntityNotFoundDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaEntityNotFoundDelegate.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
 import jakarta.persistence.EntityNotFoundException;
 import org.hibernate.ObjectNotFoundException;
-import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.proxy.EntityNotFoundDelegate;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/LegacySpecHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/LegacySpecHelper.java
index 910173110866..ad6e6007bb4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/LegacySpecHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/LegacySpecHelper.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
 import java.util.function.Function;
 
-import org.hibernate.internal.log.DeprecationLogger;
 
 import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java
index 9abf6ab94581..c42bdcc5945b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java
index a169ecc3bdc0..e199675ad7f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java
index 77383de47070..7e1200a1be7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.enhance;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java
index 036952abb76c..88cdc9a03533 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java
index acfe2dc0c130..eca08c61523e 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
index 55e438baa8b0..1b52ab14d5c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java
index 094d6f022e4e..6778519143a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java
index 9315644187e5..46535b307a3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java
index b7eab600b435..7467d29abbdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
index ca8866a0efa2..2a53d1d94708 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PessimisticNumberParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PessimisticNumberParser.java
index d7bf2fc03074..2addb0e04428 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PessimisticNumberParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PessimisticNumberParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.internal.util;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
index 2ca821c0bf8e..dd702a1278b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java
index da556260c2b2..9ad62ab9d7a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/MutableJpaCompliance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
index b9414bae993b..e7be7e0d9941 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryListTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryListTransformer.java
index ce4636eb5017..4f330021ec75 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryListTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryListTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryMapTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryMapTransformer.java
index 478a241c6ae0..638c6286b0be 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryMapTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryMapTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
index 2e40a9e1a6a0..0c4f0a7270dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpa.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/LoaderLogging.java b/hibernate-core/src/main/java/org/hibernate/loader/LoaderLogging.java
index 4044a8582c3f..853887893a97 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/LoaderLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/LoaderLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java b/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java
index 7f63cce7a83c..52e91e2f2305 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader;
 import java.util.List;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/NonUniqueDiscoveredSqlAliasException.java b/hibernate-core/src/main/java/org/hibernate/loader/NonUniqueDiscoveredSqlAliasException.java
index b4c9a250e9c7..89678247f6ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/NonUniqueDiscoveredSqlAliasException.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/NonUniqueDiscoveredSqlAliasException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java
index c37b5a480d2f..b19ef0a592f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
index 0ec93a874e44..75c6f0b90e97 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractEntityBatchLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
index d86935c58043..38501fcae14f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
index e4603403bb04..61443ad7f04c 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/BatchLoaderFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/BatchLoaderFactoryInitiator.java
index bbffbee04df9..45db9df89759 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/BatchLoaderFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/BatchLoaderFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CacheEntityLoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CacheEntityLoaderHelper.java
index 1732b0a94b16..59af5d930396 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CacheEntityLoaderHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CacheEntityLoaderHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
index fb578add5306..c4b543734cfa 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
@@ -19,10 +17,7 @@
 import org.hibernate.loader.ast.spi.SqlArrayMultiKeyLoader;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.NonAggregatedIdentifierMapping;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
-import org.hibernate.metamodel.mapping.ValuedModelPart;
-import org.hibernate.metamodel.mapping.internal.IdClassEmbeddable;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.from.TableGroup;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
index 428b814cbd78..1858556c4f6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
index 42126c2e1257..b15f5a380e55 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java
index 9772ee544720..4a48025b9fc3 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
index cddf8468ab59..b92f9a2f5eb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
index eee65c1e5f70..e4e5855bd3be 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CompoundNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CompoundNaturalIdLoader.java
index 442b21f4f4f4..902bbae66415 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CompoundNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CompoundNaturalIdLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
index 66843671169a..d994c877aaf8 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
index 5ffff9fd24d7..08cf5fd13bf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
@@ -12,7 +10,6 @@
 
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.loader.ast.spi.SqlArrayMultiKeyLoader;
 import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
index 493cb011d0b2..e7dca28db76a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
@@ -1,20 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Locale;
 
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.BatchFetchQueue;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.SubselectFetch;
 import org.hibernate.loader.ast.spi.EntityBatchLoader;
@@ -27,7 +23,6 @@
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 
-import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
index c14414202f11..8df2cdf28133 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
index 36034e9f6c01..e05e929b8662 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java
index 171f9d03689f..24c4bed48554 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
index 70d12a0eb327..a889a7bd8ffb 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
index e25ec9a52bd5..9a4da9813b9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
@@ -1204,4 +1202,3 @@ private enum RowCardinality {
 		BAG
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
index f7377d4dcd1c..3e162f33fa15 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
index b142a38507fd..9372168d7992 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
index 24a6a81f2aad..391ef3ce2fe0 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
index f7b40b0c3b76..0397e2c99adc 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.List;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.Bindable;
-import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.ExecutionContext;
@@ -18,7 +14,6 @@
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
-import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.sql.results.spi.ManagedResultConsumer;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadHelper.java
index 867e6dba27c8..774c2837629b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
@@ -10,7 +8,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.type.BasicType;
-import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
index 16d73ebc0f31..5441e2eb2ce8 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
index 17116a311ce7..98d221ac9f4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java
index e487d91fe361..fb93905400ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderInPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
index bf880c0249c6..bdd075d132af 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/NoCallbackExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/NoCallbackExecutionContext.java
index 2e8726467ed1..23bd74977d18 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/NoCallbackExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/NoCallbackExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SimpleNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SimpleNaturalIdLoader.java
index 9b77932d4e16..c5e3220a3790 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SimpleNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SimpleNaturalIdLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java
index 09f09f7b2321..e4b2a9de4ac7 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdArrayLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdArrayLoadPlan.java
index 278937345d27..3ddb6da0955b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdArrayLoadPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdArrayLoadPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
index e683b5d4b8f5..4f6a516ca7fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
index 3f60494f43c9..461d9fe152af 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderSupport.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderSupport.java
index 9cde30092d09..d9131532d667 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdExecutionContext.java
index 9c59d308fe42..96e05fd0fff5 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java
index 6cac0c4dbc5e..e67518932593 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
index 48d060cc21d1..8c20b68977d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java
index 7b521ab0529c..5b4bcf31ef4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/AfterLoadAction.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/AfterLoadAction.java
index c02c05d55ade..f421b6db05d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/AfterLoadAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/AfterLoadAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoader.java
index c5967454d81d..39aeb031f30c 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoaderFactory.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoaderFactory.java
index 9f019c202cc9..243506866bbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoaderFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/BatchLoaderFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CascadingFetchProfile.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CascadingFetchProfile.java
index e3d096d46c02..d32e797c3b46 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CascadingFetchProfile.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CascadingFetchProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionBatchLoader.java
index 294620768ffb..02075bda713e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionBatchLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionBatchLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionLoader.java
index e930463d8b47..d5617af58a5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CollectionLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityBatchLoader.java
index 880bffee1e4c..fb32dc5af3dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityBatchLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityBatchLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityLoader.java
index 779463abc548..932e7672da9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityMultiLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityMultiLoader.java
index ca42b2b1b392..e372fbdb964f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityMultiLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/EntityMultiLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
index b32ca7d1c5e3..4c94937484dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loader.java
index bbf32a96b155..65e5108cb7ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
index 5dfd0c99a490..abe6e3e8f8fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
index b0bf47972727..af41e7f18522 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
index 3e2eabede1d5..0b48ac2d8442 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoader.java
index c77c511f81c4..88d8f2838509 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
index 94ccf5f9fbf2..2060fffb2f62 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
index d200d08fe8fc..220ab0ab6cd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
index b74d53546e87..33e2224ea6dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoadOptions.java
index 836b99bfc660..83d73292270a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoadOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
index 5b1d36048c4e..10209614ca07 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleEntityLoader.java
index 102a4afaa57c..4b822359fb1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleEntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleIdEntityLoader.java
index f00f793b7c57..12aaf2bc3cec 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleIdEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleIdEntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleUniqueKeyEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleUniqueKeyEntityLoader.java
index 2f8af708264b..4956ce56e771 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleUniqueKeyEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SingleUniqueKeyEntityLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlArrayMultiKeyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlArrayMultiKeyLoader.java
index 5a4520876b07..9ec718a5ac79 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlArrayMultiKeyLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlArrayMultiKeyLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlInPredicateMultiKeyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlInPredicateMultiKeyLoader.java
index 49c8520b8716..4520bf96a3f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlInPredicateMultiKeyLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/SqlInPredicateMultiKeyLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/AliasConstantsHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/AliasConstantsHelper.java
index 96dd862c997a..b6d49ebade75 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/AliasConstantsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/AliasConstantsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
index 2d380226fbb9..07c5489e6ef3 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
index 2dce5ca87512..9867adad1c4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/LoadAccessContext.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/LoadAccessContext.java
index c29fd228a003..b1716cd901a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/LoadAccessContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/LoadAccessContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java
index 99fc1a5ea5ee..41572c42c17f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/NaturalIdLoadAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
index a9132d4da6e6..37c43ec53aad 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.loader.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/AbstractUserDefinedType.java b/hibernate-core/src/main/java/org/hibernate/mapping/AbstractUserDefinedType.java
index 9c525f36b523..19b4e591161d 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/AbstractUserDefinedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/AbstractUserDefinedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/AggregateColumn.java b/hibernate-core/src/main/java/org/hibernate/mapping/AggregateColumn.java
index 6391c978ec5f..789215ded9f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/AggregateColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/AggregateColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
index db312d293ae5..1518ff742484 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java
index 4b28eee5097b..d5903f03c6e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/mapping/AttributeContainer.java
index 527e45d5e100..587856723c49 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/AttributeContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/AttributeContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java
index 3dbc894457f5..d270c2cfe823 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -49,7 +47,7 @@ public PropertyAccessStrategy getPropertyAccessStrategy(Class clazz) throws Mapp
 		}
 		return propertyAccessStrategy;
 	}
-	
+
 	public String getEntityName() {
 		return entityName;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java b/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
index 23c7a57c996f..43ba6fbecdeb 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -17,7 +15,7 @@
 /**
  * A mapping model object representing a collection of type {@link java.util.Collection} which may
  * contain duplicates. Since a bag permits duplicates, it has no primary key
- * 
+ *
  * @author Gavin King
  */
 public class Bag extends Collection {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
index 85072b6e719b..7cc5d5c6057f 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/CheckConstraint.java b/hibernate-core/src/main/java/org/hibernate/mapping/CheckConstraint.java
index 6d68e76800da..1b1fc3c678c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/CheckConstraint.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/CheckConstraint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
index 678c8be4adb1..d125691d9364 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
index 47fa57f8c2c2..66b09c9b9f6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -752,7 +750,7 @@ public String getCollation() {
 	public void setCollation(String collation) {
 		this.collation = collation;
 	}
-	
+
 	public String getDefaultValue() {
 		return defaultValue;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
index 2428b5f067fd..1fcdbb8d2410 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java b/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java
index 113e0b701a00..5a834cccd691 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
index da6474360ba8..4f67d1af81e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java b/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java
index 12a63fcb38aa..99ce89c82249 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DependantBasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/DependantBasicValue.java
index 16e3d8bd1d19..c68f4ff3a388 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/DependantBasicValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/DependantBasicValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java
index bf1779dcfe19..b0c87ae49070 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -59,9 +57,9 @@ public Object accept(ValueVisitor visitor) {
 	@Override
 	public boolean isNullable() {
 		return nullable;
-	
+
 	}
-	
+
 	public void setNullable(boolean nullable) {
 		this.nullable = nullable;
 	}
@@ -70,7 +68,7 @@ public void setNullable(boolean nullable) {
 	public boolean isUpdateable() {
 		return updateable;
 	}
-	
+
 	public void setUpdateable(boolean updateable) {
 		this.updateable = updateable;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java
index 951e7c3b9e6e..38aa92fb8be7 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java
index 6552c2a86456..231a1e6c7adb 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 import org.hibernate.FetchMode;
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java
index f5a76598ecbe..e1562acdff97 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
index ae7fe83a8854..693c14f05bc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
index 76539c6e0d9d..faf9f19e3a1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/GeneratorCreator.java b/hibernate-core/src/main/java/org/hibernate/mapping/GeneratorCreator.java
index 87ac0ed6b5eb..9ab6f2b5a60e 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/GeneratorCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/GeneratorCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
index 77c0dc5519a1..a5bf6942aea5 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
index fe530ea2ea56..a9ff967389aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -48,5 +46,5 @@ public CollectionType getDefaultCollectionType() {
 
 	public Object accept(ValueVisitor visitor) {
 		return visitor.accept(this);
-	}	
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
index 61c54abb3378..2c66c0559d72 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Index.java b/hibernate-core/src/main/java/org/hibernate/mapping/Index.java
index 04938359b5f0..7a8e6f026e99 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Index.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Index.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java
index f156eb3acae4..fe09f44abbb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java
index fd334c316041..fa8d36e9776f 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
index 494624cbdc1c..0b6e081e71be 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
index 46c619e3a4f5..02b508d3a6f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java
index d225776082dc..4ffded8c8076 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -20,11 +18,11 @@
 public interface KeyValue extends Value {
 
 	ForeignKey createForeignKeyOfEntity(String entityName);
-	
+
 	boolean isCascadeDeleteEnabled();
-	
+
 	String getNullValue();
-	
+
 	boolean isUpdateable();
 
 	@Deprecated(since = "7.0")
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/List.java b/hibernate-core/src/main/java/org/hibernate/mapping/List.java
index 8b641d70c627..d0831dde6b67 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/List.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/List.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -22,7 +20,7 @@
  * @author Gavin King
  */
 public class List extends IndexedCollection {
-	
+
 	private int baseIndex;
 
 	/**
@@ -56,7 +54,7 @@ public boolean isList() {
 	public CollectionType getDefaultCollectionType() throws MappingException {
 		return new ListType( getRole(), getReferencedPropertyName() );
 	}
-	
+
 	public Object accept(ValueVisitor visitor) {
 		return visitor.accept(this);
 	}
@@ -64,7 +62,7 @@ public Object accept(ValueVisitor visitor) {
 	public int getBaseIndex() {
 		return baseIndex;
 	}
-	
+
 	public void setBaseIndex(int baseIndex) {
 		this.baseIndex = baseIndex;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
index 98b4bb14d64d..3f129aba4ebd 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -92,7 +90,7 @@ public void createPropertyRefConstraints(Map persistent
 			if ( property==null ) {
 				throw new MappingException( "Referenced entity '" + referencedEntityName
 						+ "' has no property named '" + referencedPropertyName + "'" );
-			} 
+			}
 			else {
 				// Make sure synthetic properties are sorted
 				if ( property.getValue() instanceof Component component ) {
@@ -101,9 +99,9 @@ public void createPropertyRefConstraints(Map persistent
 				// todo : if "none" another option is to create the ForeignKey object still	but to set its #disableCreation flag
 				if ( isForeignKeyEnabled() && !hasFormula() ) {
 					final ForeignKey foreignKey = getTable().createForeignKey(
-							getForeignKeyName(), 
-							getConstraintColumns(), 
-							( (EntityType) getType() ).getAssociatedEntityName(), 
+							getForeignKeyName(),
+							getConstraintColumns(),
+							( (EntityType) getType() ).getAssociatedEntityName(),
 							getForeignKeyDefinition(),
 							getForeignKeyOptions(),
 							new ArrayList<>( property.getColumns() )
@@ -114,7 +112,7 @@ public void createPropertyRefConstraints(Map persistent
 			}
 		}
 	}
-	
+
 	public Object accept(ValueVisitor visitor) {
 		return visitor.accept(this);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java
index 89592ddb0106..34f2a0620e6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
index 2caf740ff748..6d14a7d72a12 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
index eb324d6953c1..db33069b10fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java
index 01678061d617..2437e08acdc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -11,7 +9,7 @@
 
 /**
  * Common interface for things that can handle meta attributes.
- * 
+ *
  * @since 3.0.1
  */
 public interface MetaAttributable {
@@ -19,7 +17,7 @@ public interface MetaAttributable {
 	Map getMetaAttributes();
 
 	void setMetaAttributes(Map metas);
-		
+
 	MetaAttribute getMetaAttribute(String name);
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java
index d1d3f589b883..1640fbe25ebb 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -22,10 +20,10 @@ public class MetaAttribute implements Serializable {
 	public MetaAttribute(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
-	}	
+	}
 
 	public java.util.List getValues() {
 		return Collections.unmodifiableList(values);
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java
index 56c984ba1190..ee2edda5240c 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
index 38593d6bb007..a7cea7c5869c 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
index b1b8dd4ccbe9..d9929320b48a 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -56,11 +54,11 @@ public String getPropertyName() {
 	public void setPropertyName(String propertyName) {
 		this.propertyName = propertyName==null ? null : propertyName.intern();
 	}
-	
+
 	public String getEntityName() {
 		return entityName;
 	}
-	
+
 	public Type getType() throws MappingException {
 		if ( getColumnSpan()>0 ) {
 			return MappingHelper.specialOneToOne(
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
index a33b8fbcdb4c..91ff4fb99d38 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java
index 0db3aac2d36a..9b5014d56ede 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java
index e3638902d0b6..bfce48f91912 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java b/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java
index e43e69cd2016..a8cbb5f8255c 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
index c905ffcfd5ab..d21302512d64 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -87,7 +85,7 @@ public boolean isSynthetic() {
 	public Type getType() throws MappingException {
 		return value.getType();
 	}
-	
+
 	public int getColumnSpan() {
 		return value.getColumnSpan();
 	}
@@ -107,11 +105,11 @@ public java.util.List getSelectables() {
 	public java.util.List getColumns() {
 		return value.getColumns();
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public boolean isComposite() {
 		return value instanceof Component;
 	}
@@ -151,7 +149,7 @@ else if ( type instanceof CollectionType ) {
 			return getCollectionCascadeStyle( collection.getElement().getType(), cascade );
 		}
 		else {
-			return getCascadeStyle( cascade );			
+			return getCascadeStyle( cascade );
 		}
 	}
 
@@ -185,7 +183,7 @@ else if ( elementType instanceof ComponentType ) {
 			return getCascadeStyle( cascade );
 		}
 	}
-	
+
 	private static CascadeStyle getCascadeStyle(String cascade) {
 		if ( cascade==null || cascade.equals("none") ) {
 			return CascadeStyles.NONE;
@@ -198,9 +196,9 @@ private static CascadeStyle getCascadeStyle(String cascade) {
 				styles[i++] = CascadeStyles.getCascadeStyle( tokens.nextToken() );
 			}
 			return new CascadeStyles.MultipleCascadeStyle(styles);
-		}		
+		}
 	}
-	
+
 	public String getCascade() {
 		return cascade;
 	}
@@ -224,7 +222,7 @@ public boolean isUpdateable() {
 	}
 
 	public boolean isInsertable() {
-		// if the property mapping consists of all formulas, 
+		// if the property mapping consists of all formulas,
 		// make it non-insertable
 		return insertable && value.hasAnyInsertableColumns();
 	}
@@ -310,7 +308,7 @@ public boolean isValid(MappingContext mappingContext) throws MappingException {
 	public String toString() {
 		return getClass().getSimpleName() + '(' + name + ')';
 	}
-	
+
 	public void setLazy(boolean lazy) {
 		this.lazy=lazy;
 	}
@@ -356,11 +354,11 @@ public boolean isOptimisticLocked() {
 	public void setOptimisticLocked(boolean optimisticLocked) {
 		this.optimisticLocked = optimisticLocked;
 	}
-	
+
 	public boolean isOptional() {
 		return optional;
 	}
-	
+
 	public void setOptional(boolean optional) {
 		this.optional = optional;
 	}
@@ -376,7 +374,7 @@ public void setPersistentClass(PersistentClass persistentClass) {
 	public boolean isSelectable() {
 		return selectable;
 	}
-	
+
 	public void setSelectable(boolean selectable) {
 		this.selectable = selectable;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Resolvable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Resolvable.java
index 06ce9b3221b2..b732e19f1e1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Resolvable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Resolvable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -17,4 +15,3 @@ public interface Resolvable {
 
 	BasicValue.Resolution resolve();
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
index 659bef80ecf8..1fb6d87a6fb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java
index 05fc01889345..19e45955bafd 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
index 20c7428baf11..a8f81afca0b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
index 2e1fef5b9d2f..6c664d33079d 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java
index 204f56df3db6..a4054b902261 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java b/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
index 9064be0b6b72..a2d22ad5e7d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SortableValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SortableValue.java
index 95511db02cd6..16cb8fb5f022 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SortableValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SortableValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
index 3ec9d0d0a0fe..c6659466d77a 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java b/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java
index 3e09e59bd6a7..9fee9c2fb460 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java
@@ -1,15 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
 
 /**
  * Models a property which does not actually exist in the model.  It is created by Hibernate during
- * the metamodel binding process. 
+ * the metamodel binding process.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
index 580516e8496a..e9c6c9631876 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java
index 1ef6d16ee536..24cea98a8ad9 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java
index 227d3e3db0cb..72caf475b368 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -12,7 +10,7 @@
  * Differentiates entity types that map to their own table ({@link RootClass},
  * {@link UnionSubclass}, and {@link JoinedSubclass}) from those which do not
  * ({@link SingleTableSubclass}).
- * 
+ *
  * @author Emmanuel Bernard
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
index fc1d5efea50f..42c98ff52545 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java
index 3aa0ecd3f550..c720e34277dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -41,11 +39,11 @@ public java.util.Set getSynchronizedTables() {
 	protected List getNonDuplicatedProperties() {
 		return getPropertyClosure();
 	}
-	
+
 	public Table getIdentityTable() {
 		return getTable();
 	}
-	
+
 	public Object accept(PersistentClassVisitor mv) {
 		return mv.accept(this);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
index c7962850c83f..bfb7ff864f82 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
index f2a912d0abb0..c26d70fb2ed4 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedObjectType.java b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedObjectType.java
index c42eeeeace4d..57fa37e37929 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedObjectType.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedObjectType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedType.java b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedType.java
index 83eb4abe17aa..39db35427534 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
index 37921a3e0cb3..41ee4c8c28c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java b/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java
index 1ea85c658583..279ea60a2657 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.mapping;
 
@@ -18,7 +16,7 @@ public interface ValueVisitor {
 	Object accept(IdentifierBag bag);
 
 	Object accept(List list);
-	
+
 	Object accept(PrimitiveArray primitiveArray);
 	Object accept(Array list);
 
@@ -37,11 +35,11 @@ default Object accept(BasicValue value) {
 	}
 
 	Object accept(DependantValue value);
-	
+
 	Object accept(Component component);
-	
+
 	Object accept(ManyToOne mto);
 	Object accept(OneToOne oto);
-	
+
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java
index f42c61cfd7db..d10fd9d307a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java
index 181f46d407a7..47afa56b0383 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MappingMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MappingMetamodel.java
index a721bfce5f97..16358cb7d679 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/MappingMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/MappingMetamodel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
@@ -113,7 +111,7 @@ MappingModelExpressible resolveMappingExpressible(
 	 * @apiNote Returns {@code null} rather than throwing exception
 	 */
 	EntityPersister findEntityDescriptor(Class entityJavaType);
-	
+
 	boolean isEntityClass(Class entityJavaType);
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/RepresentationMode.java b/hibernate-core/src/main/java/org/hibernate/metamodel/RepresentationMode.java
index a7c62ecfd12a..f9d022b53782 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/RepresentationMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/RepresentationMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java b/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java
index c0e519ba277c..1ae6fb057d44 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/UnsupportedMappingException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/UnsupportedMappingException.java
index 5d7402207e0c..ccdd1e374016 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/UnsupportedMappingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/UnsupportedMappingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java
index bc4e1a8a5a99..c94ab0b1c8be 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
index 3d99255d1140..bf3769957b91 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java
index c6687155d2d1..f13d1cac4e52 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractEntityInstantiatorPojo.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractEntityInstantiatorPojo.java
index 9aed4964af3d..d6795f8b5b06 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractEntityInstantiatorPojo.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractEntityInstantiatorPojo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractPojoInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractPojoInstantiator.java
index f220a3fcef87..c48d4fce9a06 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractPojoInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractPojoInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeContext.java
index b3794297c54f..a4ef5d35f318 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
index f8f22a78cbfc..ebb208fca17a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java
index 0333836a8fc0..2911bb917b7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java
index a12ce485bb7d..4a89463ff75c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableCompositeUserTypeInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableCompositeUserTypeInstantiator.java
index ab30b83ef2ed..aa27c2b102ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableCompositeUserTypeInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableCompositeUserTypeInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
index 2ff922a3fe57..8005fbf34d8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
index 35257a18c291..e8f664f63c2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
index 2e674dc5c646..4e947cf3d479 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
index 1e108b681e9f..125ea0bc2db7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
index 6983cb5015e4..9bd87cbfb694 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorProxied.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorProxied.java
index a9921cb5f6fe..e7139479506c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorProxied.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorProxied.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
index 6a52074da199..6e825e9b4abb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordStandard.java
index dc353c60af3f..681eb1fe0e69 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyMap.java
index a166313085d9..5f791be3050a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
index 84ac87f03022..a4db40faed12 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java
index 0bcde484fdd6..a76edc454691 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoOptimized.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoOptimized.java
index 56d81b09e32c..41dd7aa17e21 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoOptimized.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoOptimized.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java
index 0f5b97353008..1eccaf1ce0ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java
index dda99996ae42..04429cc2e53a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
-import java.util.Iterator;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 import org.hibernate.EntityNameResolver;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
index fedbb33e6535..50c070942853 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
index 3f5b044ae609..1accb4a79240 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
index 813e91c5472b..7cf581ee2cf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java
index 5b13646c1b51..87da20e2d18c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MemberResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MemberResolver.java
index 151f309011f3..897fd78f88c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MemberResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MemberResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
index ebdb4f9419d1..2bc993acd34c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
@@ -26,7 +24,6 @@
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
-import org.hibernate.internal.util.collections.JoinedList;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
@@ -61,7 +58,6 @@
 import jakarta.persistence.metamodel.SingularAttribute;
 import jakarta.persistence.metamodel.Type;
 
-import static org.hibernate.internal.util.StringHelper.root;
 
 /**
  * Defines a context for storing information during the building of the {@link MappingMetamodelImpl}.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java
index 369f83e3d1e7..5519c48ec15a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java
index 9d56c372b638..0476ccc45ac3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PojoInstantiatorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PojoInstantiatorImpl.java
index ed0461da69fd..620d30de86bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PojoInstantiatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PojoInstantiatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java
index 743f08ea4e8b..22c92d4bd934 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadata.java
index 78f640cfd270..9bf7fa8b30fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java
index 6f41bf7c1837..7315b1338c92 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/StandardEmbeddableInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/StandardEmbeddableInstantiator.java
index 536ae59d3292..4368e07135cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/StandardEmbeddableInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/StandardEmbeddableInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ValueContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ValueContext.java
index 08255feb239c..dd3d852852ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ValueContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ValueContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AggregatedIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AggregatedIdentifierMapping.java
index f995b80afd3f..0e4d0dffe86c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AggregatedIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AggregatedIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Association.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Association.java
index 6df8b4ce6001..772acd4d172f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Association.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Association.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AssociationKey.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AssociationKey.java
index 1aaa82f73c4d..126f4598abf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AssociationKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AssociationKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java
index 4360c1cdaee6..29afaa761641 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsList.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsList.java
index 29a57a5d7957..5d3414e51f3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsList.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsMap.java
index b39ed076cfcc..e422c4449da5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMetadata.java
index 8fbc48f5b441..04df7a96f832 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicEntityIdentifierMapping.java
index 561cb3ec803a..0280391ef3ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicEntityIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicEntityIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedMapping.java
index c5c3cbed698b..364bc36e7595 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedModelPart.java
index babd435f58e1..8b8f2867e4ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/BasicValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
index 48476ad35188..5ce947184b62 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
@@ -169,7 +167,7 @@ default  int forEachJdbcValue(
 	 * Visit each constituent JDBC value extracted from the entity instance itself.
 	 *
 	 * Short-hand form of calling {@link #disassemble} and piping its result to
-	 * {@link #forEachDisassembledJdbcValue(Object, int, JdbcValuesConsumer, SharedSessionContractImplementor)} 
+	 * {@link #forEachDisassembledJdbcValue(Object, int, JdbcValuesConsumer, SharedSessionContractImplementor)}
 	 */
 	default  int forEachJdbcValue(
 			Object value,
@@ -180,7 +178,7 @@ default  int forEachJdbcValue(
 			SharedSessionContractImplementor session) {
 		return forEachDisassembledJdbcValue( disassemble( value, session ), offset, x, y, valuesConsumer, session );
 	}
-	
+
 	/**
 	 * A short hand form of {@link #forEachJdbcValue(Object, Object, Object, JdbcValuesBiConsumer, SharedSessionContractImplementor)},
 	 * that passes null for the two values {@code X} and {@code Y}.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionIdentifierDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionIdentifierDescriptor.java
index 30d3995051f2..d46fe4e59e63 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionIdentifierDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionIdentifierDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionMappingType.java
index ec8f99dc0d5d..9e46201afd7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionMappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java
index 00f911d7b2cd..970dfee5c44c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CompositeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CompositeIdentifierMapping.java
index 2c5416b1f563..25fa98a9c03f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CompositeIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/CompositeIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DefaultDiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DefaultDiscriminatorConverter.java
index 690188053ea1..b55f5a2d4496 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DefaultDiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DefaultDiscriminatorConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
index 05e7b57e445e..5a715f4abe54 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
index 3e504dd2a096..4309fa78b4f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
index 955f7686716d..99460aebb888 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
index 18d11f48055f..6ddf2fbe4222 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorType.java
index b77ae7fd620a..c48981952296 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValueDetails.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValueDetails.java
index b443532eb29f..41e789f99606 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValueDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValueDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
@@ -19,8 +17,8 @@
  */
 public interface DiscriminatorValueDetails {
 	/**
-     * The discriminator value
-     */
+	 * The discriminator value
+	 */
 	Object getValue();
 
 	/**
@@ -32,6 +30,6 @@ default String getIndicatedEntityName() {
 
 	/**
 	 * Form of {@link #getIndicatedEntityName()} returning the matched {@link EntityMappingType}
-     */
+	 */
 	EntityMappingType getIndicatedEntity();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorConverter.java
index bbf4099e1a9a..588cadd8654e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorMapping.java
index 39b8b13e1834..0749e1403b94 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableDiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
index ddb217da0aa8..4ae64b769f09 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
@@ -18,7 +16,6 @@
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
-import org.hibernate.property.access.spi.Getter;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableGroup;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java
index 858e154b17e5..b2b4741788f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityAssociationMapping.java
index a9ef7203acef..b8b0761d63f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityAssociationMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityAssociationMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java
index dee247184f32..4437af2250a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java
index cd764828c958..90af592a26dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
index 9e0abf088b8d..9083b0565e88 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java
index 8fda48b5dd12..b85edee4268f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityRowIdMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java
index 03e7dac2a05c..cd7759d1e344 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java
index 7e7a70a37d17..63d3cb367c08 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityVersionMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/FilterRestrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/FilterRestrictable.java
index 51ec077ab168..ed89575fc0ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/FilterRestrictable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/FilterRestrictable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java
index 3c002dbec957..d548a2bcbd01 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java
index 308b182beff9..23775e8e264f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMappingContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMappingContainer.java
index 6c58b68257a2..0d6f05f5fc0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMappingContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMappingContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
index bd62a5fe1e3e..97c148e36bd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappedDiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappedDiscriminatorConverter.java
index b7aa1a857ac3..040ecf2c050c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappedDiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappedDiscriminatorConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
index 6007f006d705..9bdbb2768014 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelExpressible.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelExpressible.java
index 6a9819a782dd..df08e7d9926d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java
index 4c95b6cae9c0..4d87cb8b5b04 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingType.java
index c782fc1c8d5b..b75434973bbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
index de7657cf6978..cfe2a1e05d22 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPartContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPartContainer.java
index 7826e3d065d6..b5be5e7cf6a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPartContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPartContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdLogging.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdLogging.java
index d33ee17fcfbc..165ab4572d66 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
index 0a095afdd4fb..bb16766929ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
@@ -23,9 +21,9 @@
  * be classified as "candidate keys" (as in a column or group of
  * columns that are considered candidates for primary-key).
  * 
      
- * However, a natural id has fewer restrictions than a primary 
+ * However, a natural id has fewer restrictions than a primary
  * key.  While these lessened restrictions make them inappropriate
- * for use as a primary key, they are still generally usable as 
+ * for use as a primary key, they are still generally usable as
  * unique locators with caveats.  General reasons a natural id
  * might be inappropriate for use as a primary key are
        
  *     
      • it contains nullable values
        • 
@@ -33,10 +31,10 @@
  * 
      
  * 
      
  * See other sources for a more complete discussion of data modeling.
- * 
- * @see org.hibernate.Session#byNaturalId 
+ *
+ * @see org.hibernate.Session#byNaturalId
  * @see org.hibernate.Session#bySimpleNaturalId
- * @see org.hibernate.Session#byMultipleNaturalId 
+ * @see org.hibernate.Session#byMultipleNaturalId
  *
  * @author Steve Ebersole
  */
@@ -50,8 +48,8 @@ public interface NaturalIdMapping extends VirtualModelPart {
 	List getNaturalIdAttributes();
 
 	/**
-	 * Whether the natural-id is mutable.  
-	 * 
+	 * Whether the natural-id is mutable.
+	 *
 	 * @apiNote For compound natural-ids, this is true if any of the attributes are mutable.
 	 */
 	boolean isMutable();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonAggregatedIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonAggregatedIdentifierMapping.java
index 469d1ac60179..4882eec9a14b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonAggregatedIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonAggregatedIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonTransientException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonTransientException.java
index c2efc41a5ae3..c266bba6c46c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonTransientException.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NonTransientException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/OwnedValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/OwnedValuedModelPart.java
index 9858f291cf1a..bfe0eb063c04 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/OwnedValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/OwnedValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
index 47a52798febd..dcd2407cccd5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PropertyBasedMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PropertyBasedMapping.java
index fe03b9cd91c6..90a492ce6272 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PropertyBasedMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PropertyBasedMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
index 802e2862cc43..4694dee31ca3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java
index 68ff78db307b..2431d64201d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableConsumer.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
-import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.IntFunction;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java
index 60ee98d152bc..81295d914a5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java
index 98f775eda3b7..5ffc6d0cd4d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectablePath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectablePath.java
index 55ae4d3f14df..b9b26527adb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectablePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectablePath.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Objects;
 
 import org.hibernate.Incubating;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SingularAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SingularAttributeMapping.java
index 3ab42ab3ee2f..ba5f19d9c9fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SingularAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SingularAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeletableModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeletableModelPart.java
index 9ed8d4442e13..3a32a7c3e819 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeletableModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeletableModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
index 76a42fc7b0ce..7fe70e06be45 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlExpressible.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlExpressible.java
index bfdeef56a6df..157086d2564e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlTypedMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlTypedMapping.java
index 3f110c24c363..39faa44b0251 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlTypedMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SqlTypedMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
index 54021b69faf3..347ae523baa9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
index 8eb8587870a1..caa8980905bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
index 6f57ea3430bf..34f199ffc57a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/VirtualModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/VirtualModelPart.java
index 9b11793ae026..8e6629075f3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/VirtualModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/VirtualModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java
index d4f0540d7383..d6c4036985d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
index 97f459f25723..036d090a5d64 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
@@ -43,7 +41,7 @@ public AbstractAttributeMapping(
 
 	/**
 	 * For Hibernate Reactive
- 	 */
+	 */
 	protected AbstractAttributeMapping(AbstractAttributeMapping original) {
 		this(
 				original.name,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
index bf98baa796d0..ae4c3648e018 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
index 7316e635841f..cfa5d00fb1b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
index e33d204593ca..497e0f0ab8c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
index cda429bdd120..a48651e1beef 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
@@ -44,7 +42,6 @@
 import org.hibernate.sql.results.graph.entity.EntityFetch;
 import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl;
 import org.hibernate.type.ComponentType;
-import org.hibernate.type.CompositeType;
 import org.hibernate.type.Type;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
index fa0f00b24d1b..5849c875218e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
index c1deac5bd11f..dfed025f2781 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
index bee2df605b6c..d451e89ec95e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
index 85f3ea113cc6..ecfdf7a84663 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
index 0a98a44959dd..6abc95dfdbf8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
index a6d4b52e9b0e..62450daf3959 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
index 5e71f24f1592..76939e56cf8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
index ead1f605f140..1aa401aff2f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
index ea728a9c8df9..69ce34091087 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
index 3476a183ef9f..e01afb26c944 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
index 0e942286afc8..3adda2e45f36 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
index 8a0ea66d3c5b..6499a77bfb7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
index 1e2ca974a3cf..ae3350c117c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
index 81d86e6f5b3e..d44e8d7e1443 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorTypeImpl.java
index 5fad4b7e2791..b2c2fab22de3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
index d3b2fa71f87e..62fbea238a62 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableDiscriminatorValueDetailsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableDiscriminatorValueDetailsImpl.java
index 4a8aeddf3ece..10e4f23545a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableDiscriminatorValueDetailsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableDiscriminatorValueDetailsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
index 676866827bf0..811093684592 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
index a47872909d0d..70447085890c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
index aa49eb298cd1..f7f84f8f8ca4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
index 27877504e7ca..0d9b61abf6ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptorSide.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptorSide.java
index c6f7dbae7a58..86f68a0a0464 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptorSide.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptorSide.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
index 4681a7de842d..a3374451c37c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmptyAttributeMappingsMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmptyAttributeMappingsMap.java
index 1e983f370a3e..20658dd1fc38 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmptyAttributeMappingsMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmptyAttributeMappingsMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java
index 4a69ee8bfc27..1b910c856546 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java
index b493e225900d..644aedf79b58 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
index 95d7a7d8d55c..58a9778362a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
index 7bb7160d6439..ac597417f3a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java
index 602bc1cabf8b..bb333f79f7a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/FetchOptionsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
index d0882cbe36bf..ba30a468f36e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
index 27ec4c0621b0..0a194e358af5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassRepresentationStrategy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassRepresentationStrategy.java
index e46cc9e7a782..f5b96694706a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassRepresentationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassRepresentationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingList.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingList.java
index 4d309f182906..fd823350899c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingList.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingList.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Objects;
 import java.util.function.Consumer;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingsMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingsMap.java
index cdb404798cb7..2c754dc51053 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingsMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingsMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InFlightEntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InFlightEntityMappingType.java
index b5d07416f7a8..16eb5741cf71 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InFlightEntityMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InFlightEntityMappingType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java
index 5e47f34d21a8..decc148cf8e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
index f0818f97df87..9b6f9a19a8a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
index 5fbbc330131a..e3b625d31a56 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java
index 0f696859d3d1..f3367ead9a40 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
index bf46e08d6e9f..2bbd077aaccd 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
index 54871a77f99e..3861a42f2e8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
index 495641d6c657..5e3d4c77cc11 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
index 5b8958589ed0..3cabbe15a9e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
index f39e8ab78e30..f4fd2108aee9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
index acc37878874d..8104efd342ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleAttributeMetadata.java
index fc6260d50f7a..d915af0b6570 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleAttributeMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleAttributeMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
index b0cec060a3da..f578c97e4dd8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptorSide.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptorSide.java
index 778d72b3f630..a6e6557ff1d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptorSide.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptorSide.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
index fe6a5b258ee8..0c7db5d7db67 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java
index 9adf681b8764..65dcec5e9463 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
index 044bfd401b52..9a8f478eef69 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java
index 07d3bb3a5d55..975ec34d0d63 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
index 7b005d2d413f..a71698424222 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
@@ -140,19 +138,19 @@ public enum Cardinality {
 	private final boolean isNullable;
 	private final boolean isLazy;
 	/*
-	 The nullability of the table on which the FK column is located
-	 Note that this can be null although the FK column is not nullable e.g. in the case of a join table
-
-	 @Entity
-	 public class Entity1 {
-	     @OneToOne
-	     @JoinTable(name = "key_table")
-	     Entity2 association;
-	 }
-
-	 Here the join to "key_table" is nullable, but the FK column is not null.
-	 Choosing an inner join for the association would be wrong though, because of the nullability of the key table,
-	 hence this flag is also controlling the default join type.
+	The nullability of the table on which the FK column is located
+	Note that this can be null although the FK column is not nullable e.g. in the case of a join table
+
+	@Entity
+	public class Entity1 {
+		@OneToOne
+		@JoinTable(name = "key_table")
+		Entity2 association;
+	}
+
+	Here the join to "key_table" is nullable, but the FK column is not null.
+	Choosing an inner join for the association would be wrong though, because of the nullability of the key table,
+	hence this flag is also controlling the default join type.
 	 */
 	private final boolean isKeyTableNullable;
 	private final boolean isInternalLoadNullable;
@@ -168,8 +166,8 @@ public class Entity1 {
 	private final Cardinality cardinality;
 	private final boolean hasJoinTable;
 	/*
-	 Capture the other side's name of a possibly bidirectional association to allow resolving circular fetches.
-	 It may be null if the referenced property is a non-entity.
+	Capture the other side's name of a possibly bidirectional association to allow resolving circular fetches.
+	It may be null if the referenced property is a non-entity.
 	 */
 	private final SelectablePath bidirectionalAttributePath;
 	private final TableGroupProducer declaringTableGroupProducer;
@@ -379,9 +377,9 @@ && equal( join.getKey(), manyToOne ) ) {
 			hasJoinTable = false;
 
 			/*
-		 		The otherSidePropertyName value is used to determine bidirectionality based on the navigablePath string
+				The otherSidePropertyName value is used to determine bidirectionality based on the navigablePath string
 
-		 		e.g.
+				e.g.
 
 				class Card{
 					@OneToMany( mappedBy = "card")
@@ -420,7 +418,7 @@ class PrimaryKey implements Serializable {
 				in such case the mappedBy is "primaryKey.card"
 				the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does not contain the "primaryKey" part,
 				so in order to recognize the bidirectionality the "primaryKey." is removed from the otherSidePropertyName value.
-		 	*/
+			 */
 			final OneToOne oneToOne = (OneToOne) bootValue;
 			if ( oneToOne.getMappedByProperty() == null ) {
 				this.bidirectionalAttributePath = SelectablePath.parse( referencedPropertyName );
@@ -1476,20 +1474,20 @@ class Level1 {
 					DerivedLevel2 level2Child;
 				}
 
-				 class Level2 {
-				 	@OneToOne(mappedBy = "level2Parent")
+				class Level2 {
+					@OneToOne(mappedBy = "level2Parent")
 					Level3 level3Child;
-				 }
+				}
 
-				 class DerivedLevel2 extends Level2 {
-				 	@OneToOne
+				class DerivedLevel2 extends Level2 {
+					@OneToOne
 					Level1 level1Parent;
-				 }
+				}
 
-				 class Level3 {
-				 	@OneToOne
+				class Level3 {
+					@OneToOne
 					Level2 level2Parent;
-				 }
+				}
 
 				We have Level1->leve2Child->level3Child->level2Parent
 
@@ -1532,15 +1530,15 @@ public EntityFetch generateFetch(
 				&& parentNavigablePath.equals( fetchParent.getNavigablePath().getRealParent() );
 
 		/*
-		 In case of selected we are going to add a fetch for the `fetchablePath` only if there is not already a `TableGroupJoin`.
+		In case of selected we are going to add a fetch for the `fetchablePath` only if there is not already a `TableGroupJoin`.
 
-		 e.g. given :
-		 	public static class EntityA {
+		e.g. given :
+			public static class EntityA {
 				...
 
 			@ManyToOne(fetch = FetchType.EAGER)
 			private EntityB entityB;
-		 	}
+			}
 
 			@Entity(name = "EntityB")
 			public static class EntityB {
@@ -1549,11 +1547,11 @@ public static class EntityB {
 				private String name;
 			}
 
-		 and the HQL query :
+		and the HQL query :
 
-		 `Select a From EntityA a Left Join a.entityB b Where ( b.name IS NOT NULL )`
+		`Select a From EntityA a Left Join a.entityB b Where ( b.name IS NOT NULL )`
 
-		 having the left join we don't want to add an extra implicit join that will be translated into an SQL inner join (see HHH-15342)
+		having the left join we don't want to add an extra implicit join that will be translated into an SQL inner join (see HHH-15342)
 		*/
 		if ( fetchTiming == FetchTiming.IMMEDIATE && selected ) {
 			final TableGroup tableGroup = determineTableGroupForFetch(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java
index b0f47955128e..e38ebab4dcbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
index 3817eb4fecf0..7ec08442f5cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
@@ -17,7 +15,6 @@
 import org.hibernate.metamodel.mapping.SelectableMappings;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.property.access.spi.Getter;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdRepresentationStrategy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdRepresentationStrategy.java
index 812129dd3683..ae070cca5055 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdRepresentationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdRepresentationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/AliasResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/AliasResolver.java
index 81d5bfc5dc8d..767b330f2ffe 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/AliasResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/AliasResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java
index 9533ef250f84..97ec2f8995a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentImpl.java
index 1cf76f7ae0f8..0138740bad05 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java
index 1f33aadcfbbb..09f1f0521d4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/TranslationContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/TranslationContext.java
index 1ac07a54711d..3899179499ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/TranslationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/TranslationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java
index 5f4f996ee086..65cbe7f03194 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java
index 343fcfb2c1be..d21009c782f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java
index f2ed64fb6d63..dfcfd821e4dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java
index b928818c12cc..283401c3e37f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java
index 571a69bbf311..dc8f94f597ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.hibernate.metamodel.mapping.ModelPart;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java
index af8e07a022f8..3595390812af 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java
index 9678153aa6a6..d35e9b9a4b9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java
index a0c59ae31437..a1ff044a59e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java
index 5532ed65f114..a09b18bb053f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java
index 17963b5a67ce..16aed2e95756 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java
index 62bb1e1ede21..12ce4e67f7b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathConsumer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathConsumer.java
index 33078c1c7a3e..69ed38abfa71 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java
index 0f8521757613..a7860cefc71e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java
index 855967d20a69..bd35d7d1676a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/RootSequencePart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/RootSequencePart.java
index c34867c621c8..b647b3e8e40a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/RootSequencePart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/RootSequencePart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java
index b8cc12b925ce..0deebfd2c4c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SelfRenderingOrderingExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SequencePart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SequencePart.java
index 3aadbc9656fa..d9b6e088da46 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SequencePart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/SequencePart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.mapping.ordering.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractDomainType.java
index cd213af1b3c8..16a4143d3c14 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java
index f9f4f247c249..b80192ab7ece 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java
index 4a45210b738e..4cfcd1b454dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AnyMappingDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AnyMappingDomainType.java
index 29cc3c4287eb..7dba2b9faa98 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AnyMappingDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AnyMappingDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java
index b7b3bbf49c6b..86daa71deb28 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java
index 382f9c7e4d3e..f91916e93f8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DiscriminatorSqmPath.java
index db891935ae35..935fc3e3dd3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DiscriminatorSqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java
index 950bd4e960fa..9a7bfee14f51 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java
index 93446637d4e7..28f5c37f8c86 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
 import java.util.Collection;
 
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.query.sqm.SqmPathSource;
 
 import jakarta.persistence.metamodel.EmbeddableType;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java
index 7abf162befd2..c8600fd46381 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java
index f4de396de787..02fa802d9a35 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java
index 8ebd38399720..29bd34fac88a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
index 22acec44e61d..c4f526a29a5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java
index b05bf3a349ec..64c78cbb48ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java
index 8a8c17368716..adde14df3ea0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java
index da8ce362f7be..71fa8f5266fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java
index fbe879089f5b..2e09e08dfcff 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
index 8e3dab06e741..e81dbe18119f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java
index c458a0845615..b73db92f28da 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java
index 16da245030e4..71ebb7a1dcc4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java
index e2fd78b34540..f4e88e6bc687 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java
index 5b565b830c93..ab7e32e7628b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java
index b122d6742147..7a2e493b163d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TreatableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TreatableDomainType.java
index 5f25649824da..7424fc383c61 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TreatableDomainType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TreatableDomainType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TupleType.java
index 7fd1e46ca1d4..72a7875cfc39 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TupleType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/TupleType.java
@@ -1,18 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain;
 
 import java.util.List;
 
-import org.hibernate.Incubating;
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.sql.ast.spi.FromClauseAccess;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.TableGroupProducer;
 
 /**
  * Describes any structural type without a direct java type representation.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
index c97f3aeddb83..f9490f368c95 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java
index 6e95d77de21a..759bd242c5b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
index 65048fc12062..77c97efeb4ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java
index c46bdf327440..70605d4c33e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
index e65d024cb8b0..bd82866c6d32 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
index fbd840e7d916..117bd93201a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
index 242d98a201a5..75f7fd9b5e19 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java
index b8665d66f602..6752c1c8ce14 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
index 99b49b9dbf77..e57accc3d233 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
index b2dd4ae58dbb..5af492f8739b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java
index 56d5db22e818..101682cf34ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
index e5748f60916f..09cfb628b796 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java
index a81b55a3fed7..1943f04f884f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/CompositeSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/CompositeSqmPathSource.java
index 96472f1be828..e7153f03540e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/CompositeSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/CompositeSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
index 379401d00405..e9bc9296a5ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
index 46ce0d0f5c6f..c1fbbb56f15e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
index 7f65a9340196..d57c33507862 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java
index ba9a04b313ce..cccc5dfa7308 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedSqmPathSource.java
index 22426bf74a10..cbc4fe8317a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
index a50c115a8bdd..b97802e61c13 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPathSource.java
index 5da2537cd8c2..1c35bd0ded42 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
index 3a21edab9826..6884616bce2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java
index 93bf55ab6558..df09e53e1c64 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
index ca0df79dd129..7b302907c7f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
index 86393421ed5e..6af29441880b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java
index ca922c587708..5843a2d8be76 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java
index c55b628cecd5..03b60c4e053b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java
index 5c5a1dc230e2..83c68acbe232 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassSqmPathSource.java
index 935edcf4ece7..669cb97cdbdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
index b9266c6d5940..fbdbc58fa379 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
index 5eb164c15a5e..551308890583 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/NonAggregatedCompositeSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/NonAggregatedCompositeSqmPathSource.java
index 3a6035250606..9a35282ae1a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/NonAggregatedCompositeSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/NonAggregatedCompositeSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
index ab09bc236408..2a073b2cde8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
index 265d8aad73d7..d771edf516ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PrimitiveBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PrimitiveBasicTypeImpl.java
index 72c7bfdcde55..976c5b40075d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PrimitiveBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PrimitiveBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java
index 027fe6a30598..2e4f42afca1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
index 9f6411602616..559eb7eb1e44 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java
index dd624d8a8922..915bc459007d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/JpaMetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/JpaMetamodelImplementor.java
index 5de415562bb3..d087a7bf12bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/JpaMetamodelImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/JpaMetamodelImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.model.domain.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableInstantiator.java
index 97ba24243b0f..cb2f937f7b09 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
@@ -11,7 +9,7 @@
 
 /**
  * Contract for instantiating embeddable values.
- * 
+ *
  * @apiNote Incubating until the proposed
  * {@code instantiate(IntFunction valueAccess, SessionFactoryImplementor sessionFactory)}
  * form can be implemented.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableRepresentationStrategy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableRepresentationStrategy.java
index ad7d23d8272c..244968ea1329 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableRepresentationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EmbeddableRepresentationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityInstantiator.java
index c4024d58d032..d78f44aa27a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityRepresentationStrategy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityRepresentationStrategy.java
index d1c2d6e714a9..cc2376a5019a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityRepresentationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/EntityRepresentationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/Instantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/Instantiator.java
index 805a91ca6d33..f9fd2a77625a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/Instantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/Instantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationResolver.java
index 542c53818401..90971cbbc79c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationStrategy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationStrategy.java
index cdbf3c187ae8..88b0a0d468a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ManagedTypeRepresentationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MappingMetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MappingMetamodelImplementor.java
index f10f24952c48..795f5b2420cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MappingMetamodelImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MappingMetamodelImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java
index ae65e82efaf2..7fafff857e8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or 
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java
index 551ad754408e..eafd947be8a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
index 8cb9b07807ef..63f43908ab63 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ValueAccess.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ValueAccess.java
index 457eaff89839..1a883a4d6c1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ValueAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/ValueAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.metamodel.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
index 7b1daa4845fd..157828f5fd21 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
index 35a5d97c16db..9d3e44297bc6 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
index 85fb5adad75f..ea92b9a2b170 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
index 65c907f1abda..cad86d2e8b2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
index aa45df3dbba6..360bc53dd716 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java
index e3a41e6b14cc..283f73649461 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionMutationTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java
index e7f1d5d16767..2d2f5adfa66d 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionOperationCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
index e67620f4611f..f559037a1892 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java
index 7001adea9972..06c75108876f 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java
index bc12c7e8142c..d29c9927f33a 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
index 8758acabe958..ee55754a2a9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorTablePerSubclass.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorTablePerSubclass.java
index 53e9e1b66d54..3e116e110f81 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorTablePerSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorTablePerSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java
index 0f714645ee18..5accd441e025 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
@@ -19,8 +17,8 @@
  * 
      
  * A "logical" insertion because the actual SQL used may be an UPDATE in the case of
  * one-to-many mappings to set the foreign-key
- * 
- * @see CollectionPersister#recreate 
+ *
+ * @see CollectionPersister#recreate
  * @see CollectionPersister#insertRows
  * @see RowMutationOperations#getInsertRowOperation()
  * @see RowMutationOperations#getInsertRowValues()
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java
index 541630523585..3c3cd0216c9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java
index f1e0e376d650..a6fbea6abfd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorTablePerSubclass.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorTablePerSubclass.java
index bf33c4ec0e78..a91a35607832 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorTablePerSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorTablePerSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java
index 8fec2b993de8..ae45d8813576 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/OperationProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java
index ae68e75e2b57..b4f677ae5d20 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java
index 6c711d7cc10f..b081655576bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
index 1573e66c19a4..bce4d395f64e 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
index a2cccd47200c..3a94e04c8268 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
index 6bfff5649647..c35e6a445abc 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java
index 01974995c99e..ad3b1c815f24 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java
index eff54e6d9636..c432bd762b99 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java
index 551410f821a2..b6dabbbe9779 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorOneToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java
index e4cd2d6a9abb..a5235ce922e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTablePerSubclass.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTablePerSubclass.java
index ae075c55df8e..d08e1fb62d91 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTablePerSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTablePerSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.collection.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index 608234c13764..b76a585c146a 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
index 124a16185199..3340baa4b7b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
@@ -11,11 +9,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.tuple.NonIdentifierAttribute;
-import org.hibernate.type.AnyType;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.CollectionType;
-import org.hibernate.type.ComponentType;
-import org.hibernate.type.ManyToOneType;
 import org.hibernate.type.Type;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
index 0a8972000c56..8ee6f6765e47 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorMetadata.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorMetadata.java
index e9718e1f65f3..d13285cde074 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java
index b1d20050e8c3..502bdf4e41ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityNameUse.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityNameUse.java
index 8193b6282f29..0192b53e3262 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityNameUse.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityNameUse.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
index fb13aa64080f..cc475efd9662 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
@@ -154,7 +152,7 @@ default String getSqlAliasStem() {
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // stuff that is persister-centric and/or EntityInfo-centric ~~~~~~~~~~~~~~
+	// stuff that is persister-centric and/or EntityInfo-centric ~~~~~~~~~~~~~~
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	/**
@@ -1131,8 +1129,8 @@ default Object getValue(Object object, int i) {
 	 */
 	Object getIdentifier(Object entity, SharedSessionContractImplementor session);
 
-    /**
-     * Inject the identifier value into the given entity.
+	/**
+	 * Inject the identifier value into the given entity.
 	 */
 	void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session);
 
@@ -1443,7 +1441,7 @@ default String getSelectByUniqueKeyString(String[] propertyNames) {
 
 	/**
 	 * Given a property path, return the corresponding column name(s).
-	 * 
+	 *
 	 * @deprecated No longer used in ORM core
 	 */
 	@Deprecated(since = "7.0", forRemoval = true)
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java
index 624780e1108e..e8e12bbb39d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/Joinable.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/Joinable.java
index 2b26df3b1210..98758768758d 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/Joinable.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/Joinable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
index 61fda370539b..b0ea45313e53 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
@@ -48,7 +46,6 @@
 import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.internal.SqlFragmentPredicate;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SessionFactoryBasedWrapperOptions.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SessionFactoryBasedWrapperOptions.java
index 3db2936745ea..3de878c6d3ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SessionFactoryBasedWrapperOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SessionFactoryBasedWrapperOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
index e85364048188..be22224fcae3 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
index faa8ee0a0e6e..3fa14b0b64e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/UniqueKeyEntry.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/UniqueKeyEntry.java
index 4127cf991c8f..4e4703a201a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/UniqueKeyEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/UniqueKeyEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
index 6dadee89f465..30f8bf28d70f 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
index d5335d2d5cb8..386f5f58de05 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java
index 554d2796e471..e756c0720eca 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AttributeAnalysis.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java
index eb7835cd9314..7e1cde807914 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
index 20029dc0029d..ea190ba8be28 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
index 30f569f6cbb7..469fcd067fee 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
index 6fabe8fc69d8..185bedffb481 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java
index e73f3e68d281..3fa53083caf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java
index c06d2a195d43..45b5abb2ab7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
index 8df56a036e4b..2a8b89ad0a5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java
index 06cd46589804..945b8cc58e64 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
index 79f1e723ca9c..691112c9ef58 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
index d248a3ba7a64..759edb43ac23 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.TableMapping;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java
index 3673800ac434..916cf17bf591 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java
index a372e5329888..51e3fca95bac 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
index 8e72e45a9607..7e85862ef249 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java
index 02e75326ca51..484c1adba5c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateValuesAnalysis.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.entity.mutation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
index 18c224987942..32e425601f43 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java
index a456cbda43db..63fc0a0ae8ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
index dfac203deab4..418013fe58b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/SqlFragmentPredicate.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/SqlFragmentPredicate.java
index b7dfcfc9a2dc..3e3a5ab43aff 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/SqlFragmentPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/SqlFragmentPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/internal/StandardPersisterClassResolver.java b/hibernate-core/src/main/java/org/hibernate/persister/internal/StandardPersisterClassResolver.java
index 1263455d4342..b95ebe171c93 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/internal/StandardPersisterClassResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/internal/StandardPersisterClassResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterClassResolver.java b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterClassResolver.java
index 9d8348d120aa..a6d5b4481cc6 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterClassResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterClassResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java
index 772f8d319586..bd36372aa779 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/spi/PersisterFactory.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.spi;
 
-import org.hibernate.HibernateException;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/spi/UnknownPersisterException.java b/hibernate-core/src/main/java/org/hibernate/persister/spi/UnknownPersisterException.java
index a43d4fc237bd..7cc0b46fc4d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/spi/UnknownPersisterException.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/spi/UnknownPersisterException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/walking/spi/AttributeSource.java b/hibernate-core/src/main/java/org/hibernate/persister/walking/spi/AttributeSource.java
index ab883cf77027..324dbc37fa71 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/walking/spi/AttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/walking/spi/AttributeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.persister.walking.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java b/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java
index c51fde0347b5..734b322ba3a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.pretty;
 
@@ -227,7 +225,7 @@ public static String infoString(String entityName, String propertyName, @Nullabl
 
 
 	// collections ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	
+
 	/**
 	 * Generate an info message string relating to a particular managed
 	 * collection.  Attempts to intelligently handle property-refs issues
@@ -244,7 +242,7 @@ public static String collectionInfoString(
 			@Nullable PersistentCollection collection,
 			Object collectionKey,
 			SharedSessionContractImplementor session ) {
-		
+
 		StringBuilder s = new StringBuilder();
 		s.append( '[' );
 		if ( persister == null ) {
@@ -253,13 +251,13 @@ public static String collectionInfoString(
 		else {
 			s.append( persister.getRole() );
 			s.append( '#' );
-			
+
 			Type ownerIdentifierType = persister.getOwnerEntityPersister()
 					.getIdentifierType();
 			Object ownerKey;
 			// TODO: Is it redundant to attempt to use the collectionKey,
 			// or is always using the owner id sufficient?
-			if ( collectionKey.getClass().isAssignableFrom( 
+			if ( collectionKey.getClass().isAssignableFrom(
 					ownerIdentifierType.getReturnedClass() ) ) {
 				ownerKey = collectionKey;
 			}
@@ -268,7 +266,7 @@ public static String collectionInfoString(
 				EntityEntry entry = collectionOwner == null ? null : session.getPersistenceContextInternal().getEntry(collectionOwner);
 				ownerKey = entry == null ? null : entry.getId();
 			}
-			s.append( ownerIdentifierType.toLoggableString( 
+			s.append( ownerIdentifierType.toLoggableString(
 					ownerKey, session.getFactory() ) );
 		}
 		s.append( ']' );
@@ -342,7 +340,7 @@ public static String collectionInfoString(
 
 		return s.toString();
 	}
-	
+
 	private static void addIdToCollectionInfoString(
 			CollectionPersister persister,
 			Object id,
@@ -357,7 +355,7 @@ private static void addIdToCollectionInfoString(
 		// may not be the owner key.
 		Type ownerIdentifierType = persister.getOwnerEntityPersister()
 				.getIdentifierType();
-		if ( id.getClass().isAssignableFrom( 
+		if ( id.getClass().isAssignableFrom(
 				ownerIdentifierType.getReturnedClass() ) ) {
 			s.append( ownerIdentifierType.toLoggableString( id, factory ) );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
index dc317fe9a7e0..e3595a85bbb3 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/NamedParametersNotSupportedException.java b/hibernate-core/src/main/java/org/hibernate/procedure/NamedParametersNotSupportedException.java
index d456240acb15..463cf249fa7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/NamedParametersNotSupportedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/NamedParametersNotSupportedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/NoSuchParameterException.java b/hibernate-core/src/main/java/org/hibernate/procedure/NoSuchParameterException.java
index d4b3e8220d60..3f7e5fb75174 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/NoSuchParameterException.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/NoSuchParameterException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterMisuseException.java b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterMisuseException.java
index 80bfc3aba67c..4d2cacbc3458 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterMisuseException.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterMisuseException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterStrategyException.java b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterStrategyException.java
index 7b287537b3c4..9c6e39de4657 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterStrategyException.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterStrategyException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterTypeException.java b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterTypeException.java
index 1afaba74d195..7748a7a9e82c 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/ParameterTypeException.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/ParameterTypeException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java
index a6db5f5fbc6d..39c6a18a7e4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java
index 05b1a7ed5a1c..e39ab03dbfd2 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java
index a2d8c1c24b9d..6e1c23c5675f 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/AbstractStandardCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/DB2CallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/DB2CallableStatementSupport.java
index 7aed3903a18b..77ba11731ee0 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/DB2CallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/DB2CallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
@@ -10,7 +8,6 @@
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.procedure.spi.FunctionReturnImplementor;
-import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.procedure.spi.ProcedureCallImplementor;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
index ed02307da332..ed464d188d82 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
index 7b1fa98b8f06..ffaced14e2f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.procedure.internal;
 
 import java.sql.Types;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/JTDSCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/JTDSCallableStatementSupport.java
index 7a4cce5b40c5..f76aab39dcd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/JTDSCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/JTDSCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java
index 739ab483abcb..73e1e0c12866 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/OracleCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/OracleCallableStatementSupport.java
index c03a3aab65d4..6f03e41e2758 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/OracleCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/OracleCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgreSQLCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgreSQLCallableStatementSupport.java
index 94ddbcd23740..b53a3f179258 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgreSQLCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/PostgreSQLCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
index 4904cce092d9..acb72dd480ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
index a691724a59d3..6ea561b65d2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
index d54403f6ad10..38687d34ad4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
index af9234cfabde..fc83e733d018 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
index 9c4f0c3de084..154318429481 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
index f64282cd4e08..356cc23bda27 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/SQLServerCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/SQLServerCallableStatementSupport.java
index d216373e1607..2ee84fe7c7ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/SQLServerCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/SQLServerCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
index b8ab1118e4a9..e9fcadf19472 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
 import java.util.function.BiFunction;
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
-import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.ResultSetMappingSqlSelection;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
@@ -18,7 +15,6 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java
index a23d2e9b1019..bfad018a5198 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/SybaseCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/SybaseCallableStatementSupport.java
index 949c8fffcbfc..beda3516e4f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/SybaseCallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/SybaseCallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
index ec25b14628f1..982595c7d10b 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java
index ec0406be33ab..fb108f603c1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/CallableStatementSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/FunctionReturnImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/FunctionReturnImplementor.java
index 5a271ad0cf21..7e9087507c4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/FunctionReturnImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/FunctionReturnImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/NamedCallableQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/NamedCallableQueryMemento.java
index facf4a8ca541..55894b7da0e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/NamedCallableQueryMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/NamedCallableQueryMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ParameterStrategy.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ParameterStrategy.java
index 459004d9acd8..c280bb9f6da9 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ParameterStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ParameterStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
index cef5d806aeb7..717c62d85e28 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
@@ -20,7 +18,6 @@
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.Parameter;
 import jakarta.persistence.ParameterMode;
-import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.TemporalType;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java
index e433624b725b..48f38bd16a38 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java
index 87fb3dbc54e3..82645a806879 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.procedure.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java
index 5baab1052133..36801cc708f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java
index 6132a9d16c59..03eda5662f24 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AccessStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AccessStrategyHelper.java
index a46a0d2c1034..31668187cc5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AccessStrategyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AccessStrategyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/ChainedPropertyAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/ChainedPropertyAccessImpl.java
index de76aca1ce9e..5cf0db18df0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/ChainedPropertyAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/ChainedPropertyAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessBasicImpl.java
index 7ff64fde3be2..8c113fab3727 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessCompositeUserTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessCompositeUserTypeImpl.java
index aaf35ee5e41d..7dd8a90d416b 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessCompositeUserTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessCompositeUserTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java
index a9f67dc4a309..5272e813d180 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEnhancedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEnhancedImpl.java
index 3a6e3e51b476..573bb5003ff5 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEnhancedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEnhancedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessFieldImpl.java
index d9019e68c9be..0619b9fcdc8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessFieldImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessFieldImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java
index f2542eccf034..389499baba18 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java
index f1b26ce04c4d..7a2cc7b807dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java
index 7940c508912a..eaf4776a7a6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBasicImpl.java
index 45fcff7f0844..59dabdfdddf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyChainedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyChainedImpl.java
index 76ae1d78fe9d..49a18757436b 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyChainedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyChainedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyCompositeUserTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyCompositeUserTypeImpl.java
index 40d5ae20a232..4c70eb5cf3a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyCompositeUserTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyCompositeUserTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEmbeddedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEmbeddedImpl.java
index e414669150e8..755c220640a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEmbeddedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEmbeddedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java
index 33c5181552dc..6102c3ce1b6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyFieldImpl.java
index e6a16b511430..9abf720ff48b 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyFieldImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyFieldImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java
index 0c7f068107d1..476ed1d9ed1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMapImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMapImpl.java
index 10f3b5083d29..6e0f0db5cf85 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMapImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
@@ -25,7 +23,7 @@ public class PropertyAccessStrategyMapImpl implements PropertyAccessStrategy {
 
 	@Override
 	public PropertyAccess buildPropertyAccess(@Nullable Class containerJavaType, String propertyName, boolean setterRequired) {
-		
+
 		// Sometimes containerJavaType is null, but if it isn't, make sure it's a Map.
 		if (containerJavaType != null && !Map.class.isAssignableFrom( containerJavaType)) {
 			throw new IllegalArgumentException(
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMixedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMixedImpl.java
index 7c14337989ad..0cf3e8eb6c81 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMixedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMixedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java
index a8133a792021..a1bd57ee7e04 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverInitiator.java
index 6ad3851ff4ba..e5de68ee1481 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverStandardImpl.java
index 2ddb660a0c0b..ff62e8371a72 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/BuiltInPropertyAccessStrategies.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/BuiltInPropertyAccessStrategies.java
index 660bb4bb9766..43f767f2adf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/BuiltInPropertyAccessStrategies.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/BuiltInPropertyAccessStrategies.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterImpl.java
index 8557334bafc4..94c7d98f0cb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterMethodImpl.java
index 4adc182eebd3..4863e1fe4fb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterMethodImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterMethodImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/Getter.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/Getter.java
index e281365b6cf9..acb5e87c47ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/Getter.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/Getter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterFieldImpl.java
index 74647c50717e..17c1fc8eac49 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterFieldImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterFieldImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java
index ed63b969b879..9569c795057c 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/GetterMethodImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccess.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccess.java
index 0b982e022fe8..d60c5b3490bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessBuildingException.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessBuildingException.java
index a8a5437c05f7..51779485c450 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessBuildingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessBuildingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessException.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessException.java
index 30646b4e4c08..5f59b5bf6e74 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessException.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessSerializationException.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessSerializationException.java
index bd3cbf9a59de..3f72129f3008 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessSerializationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessSerializationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategy.java
index 1dc3af90a559..dfe238199a92 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategyResolver.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategyResolver.java
index 2aa812459853..3323e97c8903 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategyResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/PropertyAccessStrategyResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/Setter.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/Setter.java
index 119d6475d6fd..46023bce9ddb 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/Setter.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/Setter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java
index c4a8d49da4d0..f01551dacc5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java
index b9985f3ad5d7..9cad1b9a49fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.property.access.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
index 71ca0665d948..02daa8d6bb48 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractSerializableProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractSerializableProxy.java
index 3055d0890375..11f42ffce16b 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractSerializableProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractSerializableProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 
@@ -10,7 +8,7 @@
 
 /**
  * Convenience base class for the serialized form of {@link AbstractLazyInitializer}.
- * 
+ *
  * @author Gail Badner
  */
 public abstract class AbstractSerializableProxy implements Serializable {
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/EntityNotFoundDelegate.java b/hibernate-core/src/main/java/org/hibernate/proxy/EntityNotFoundDelegate.java
index 266aa2bece45..50451b2a4d41 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/EntityNotFoundDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/EntityNotFoundDelegate.java
@@ -1,19 +1,17 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.proxy;
-
-/**
- * Delegate to handle the scenario of an entity not found by a specified id.
- *
- * @see org.hibernate.cfg.Configuration#setEntityNotFoundDelegate(EntityNotFoundDelegate)
- * @see org.hibernate.boot.SessionFactoryBuilder#applyEntityNotFoundDelegate(EntityNotFoundDelegate)
- *
- * @author Steve Ebersole
- */
-public interface EntityNotFoundDelegate {
-	void handleEntityNotFound(String entityName, Object id);
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.proxy;
+
+/**
+ * Delegate to handle the scenario of an entity not found by a specified id.
+ *
+ * @see org.hibernate.cfg.Configuration#setEntityNotFoundDelegate(EntityNotFoundDelegate)
+ * @see org.hibernate.boot.SessionFactoryBuilder#applyEntityNotFoundDelegate(EntityNotFoundDelegate)
+ *
+ * @author Steve Ebersole
+ */
+public interface EntityNotFoundDelegate {
+	void handleEntityNotFound(String entityName, Object id);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java
index 0abb5e927de9..ac92eb542333 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java
index 41c71441af85..3572bb2e1d27 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java
index 6bc387849be2..4785a6e3528d 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java
index bdd6013c2a72..e30765cb5a38 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapLazyInitializer.java
index 25da3b36c0f7..8591a4d34005 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapLazyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapLazyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java
index 44f08a180be5..5020d5c79e6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java
index bb28e25153fa..5f7532a9df99 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/map/SerializableMapProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/map/SerializableMapProxy.java
index ed27bb55489f..095e40283801 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/map/SerializableMapProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/map/SerializableMapProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
index 4d56431ae0d2..95ac9bdbc431 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/ProxyFactoryHelper.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/ProxyFactoryHelper.java
index cb7b2dce1c0b..0a5205d24073 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/ProxyFactoryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/ProxyFactoryHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
index 3ba692360975..12806d98dc27 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyFactory.java
index 3f25e0fcae54..e5c788828e3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java
index cffc60652430..193f11b8fd0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/SerializableProxy.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/SerializableProxy.java
index f34d8eb631c4..0183b883c2b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/SerializableProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/SerializableProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy.pojo.bytebuddy;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/BindableType.java b/hibernate-core/src/main/java/org/hibernate/query/BindableType.java
index 59a494150ff4..076d7beb3b12 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/BindableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/BindableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/BindingContext.java b/hibernate-core/src/main/java/org/hibernate/query/BindingContext.java
index ad1dcff19136..6d38eff7456c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/BindingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/BindingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
index a6919298aa1a..756b61498b13 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/IllegalMutationQueryException.java b/hibernate-core/src/main/java/org/hibernate/query/IllegalMutationQueryException.java
index a2141415db49..41370163eb0a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/IllegalMutationQueryException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/IllegalMutationQueryException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/IllegalNamedQueryOptionsException.java b/hibernate-core/src/main/java/org/hibernate/query/IllegalNamedQueryOptionsException.java
index 95edab17b5c9..676b2757868d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/IllegalNamedQueryOptionsException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/IllegalNamedQueryOptionsException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java b/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java
index 47af6dd63356..5e88bc411ba5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/IllegalQueryOperationException.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query;
 
 import org.hibernate.QueryException;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/IllegalSelectQueryException.java b/hibernate-core/src/main/java/org/hibernate/query/IllegalSelectQueryException.java
index 912610baa73d..fe858ec0ba1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/IllegalSelectQueryException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/IllegalSelectQueryException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ImmutableEntityUpdateQueryHandlingMode.java b/hibernate-core/src/main/java/org/hibernate/query/ImmutableEntityUpdateQueryHandlingMode.java
index 160cd5e8a157..c2c3104b3605 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ImmutableEntityUpdateQueryHandlingMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ImmutableEntityUpdateQueryHandlingMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java
index 9bb813ab6268..06bfef052660 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/KeyedPage.java b/hibernate-core/src/main/java/org/hibernate/query/KeyedPage.java
index 85b838fec578..fc1990590693 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/KeyedPage.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/KeyedPage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/KeyedResultList.java b/hibernate-core/src/main/java/org/hibernate/query/KeyedResultList.java
index 69f8d72f6151..fac3448058b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/KeyedResultList.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/KeyedResultList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/MutationQuery.java b/hibernate-core/src/main/java/org/hibernate/query/MutationQuery.java
index 9ce0ef89c4cc..e45eeb5d1f42 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/MutationQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/MutationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/NamedQueryValidationException.java b/hibernate-core/src/main/java/org/hibernate/query/NamedQueryValidationException.java
index 71b5d1b6f642..f777dbf620d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/NamedQueryValidationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/NamedQueryValidationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
index 54aab000a9ed..19b2939bf3c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/NotIndexedCollectionException.java b/hibernate-core/src/main/java/org/hibernate/query/NotIndexedCollectionException.java
index ccdc17e0a8a7..ed1ee16dcc6f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/NotIndexedCollectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/NotIndexedCollectionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java b/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java
index 37c12ae99ca9..c0d61179b084 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/Order.java b/hibernate-core/src/main/java/org/hibernate/query/Order.java
index 8b8414f9f02a..da5804fceeb6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/Order.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/OutputableType.java b/hibernate-core/src/main/java/org/hibernate/query/OutputableType.java
index 8871528f1659..d0ce980629ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/OutputableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/OutputableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/Page.java b/hibernate-core/src/main/java/org/hibernate/query/Page.java
index 18a6184ef94e..5a97b404d0ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/Page.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/Page.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ParameterLabelException.java b/hibernate-core/src/main/java/org/hibernate/query/ParameterLabelException.java
index 1867acce4da7..2a75c04edb81 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ParameterLabelException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ParameterLabelException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java
index 919077a380dd..911060da9adb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/PathException.java b/hibernate-core/src/main/java/org/hibernate/query/PathException.java
index d13e0aa71128..21c660a61e13 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/PathException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/PathException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/Query.java b/hibernate-core/src/main/java/org/hibernate/query/Query.java
index 6cf35124cb6f..c284a806e8e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/Query.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/Query.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
index 4357c7d5d649..ee70127c7790 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryFlushMode.java b/hibernate-core/src/main/java/org/hibernate/query/QueryFlushMode.java
index 46b919b7dbf3..a820fcdd4a1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryFlushMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryFlushMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
index e0d2615fd229..71c80b2e9e5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java
index 025e569907f4..4c138e366048 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
index 187545a801c9..449af141a230 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
@@ -402,7 +400,7 @@ public interface QueryProducer {
 	 * found to be invalid
 	 *
 	 * @see jakarta.persistence.EntityManager#createNamedQuery(String)
-	 * 
+	 *
 	 * @deprecated use {@link #createNamedQuery(String, Class)}
 	 */
 	@Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java
index 7109c3668a9a..c0dee06a67c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
index 230f3749fa69..2eb3fca9d08d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java b/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java
index c51cfe20e70b..9ae39e17b7e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java
index b79789a4538a..7a403deee2bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SemanticException.java b/hibernate-core/src/main/java/org/hibernate/query/SemanticException.java
index 0c8f3a8cce94..03a359cb0ac4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/SemanticException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/SemanticException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SortDirection.java b/hibernate-core/src/main/java/org/hibernate/query/SortDirection.java
index e17b8782833d..b6c3948c4936 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/SortDirection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/SortDirection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SynchronizeableQuery.java b/hibernate-core/src/main/java/org/hibernate/query/SynchronizeableQuery.java
index 02602ed39592..41d17a49629f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/SynchronizeableQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/SynchronizeableQuery.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query;
 
 import java.util.Collection;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SyntaxException.java b/hibernate-core/src/main/java/org/hibernate/query/SyntaxException.java
index edae4f8f6a77..2c8d4117f24a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/SyntaxException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/SyntaxException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java
index 7fbdd8b9aa95..92dbfbdd65a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/TypedParameterValue.java b/hibernate-core/src/main/java/org/hibernate/query/TypedParameterValue.java
index 46d7cb45fc9f..5670a1b03b37 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/TypedParameterValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/TypedParameterValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/TypedTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/TypedTupleTransformer.java
index a5ac3443f750..b511a9060152 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/TypedTupleTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/TypedTupleTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/UnknownNamedQueryException.java b/hibernate-core/src/main/java/org/hibernate/query/UnknownNamedQueryException.java
index 69f7d420dbe8..8e356ed888e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/UnknownNamedQueryException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/UnknownNamedQueryException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/UnknownParameterException.java b/hibernate-core/src/main/java/org/hibernate/query/UnknownParameterException.java
index 995541450ac6..2889bb605b84 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/UnknownParameterException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/UnknownParameterException.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query;
 
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/UnknownSqlResultSetMappingException.java b/hibernate-core/src/main/java/org/hibernate/query/UnknownSqlResultSetMappingException.java
index 5e55305dbfc2..e03b85ff02c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/UnknownSqlResultSetMappingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/UnknownSqlResultSetMappingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java
index dbf134b17f50..9400e0f6a8e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/CriteriaDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
index ee86f8664f22..e411d9827917 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java
index 52cc06aee5f4..4f1b45e536b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java
index 47c254d6af87..a5790a2d8ed7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java
index 43fe87d98268..9b5b29a84c24 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictClause.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictClause.java
index 5b1ce25d7707..4d7374580585 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictUpdateAction.java
index bf1307a4b052..cb4c85f2fb02 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictUpdateAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaConflictUpdateAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
@@ -72,7 +70,7 @@ public interface JpaConflictUpdateAction {
 
 	/**
 	 * Modify the update query to restrict the target of the update
-	 * according to the conjunction of the specified restriction 
+	 * according to the conjunction of the specified restriction
 	 * predicates.
 	 * Replaces the previously added restriction(s), if any.
 	 * If no restrictions are specified, any previously added
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java
index ae63d3ea57a6..0a1657be155b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java
index 0cf1615b42e5..674452bde7ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsert.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsert.java
index ec4eb11226fb..8d6b0554cc8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertSelect.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertSelect.java
index 856fc98d9d9a..6ab445784f1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertSelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertSelect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertValues.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertValues.java
index 6ff56f73a7b4..df5980e1ad3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaInsertValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaNode.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaNode.java
index 5d2fd0777084..9b9b317f8eda 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java
index 9c4283d59c47..cb7370746146 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaSelect.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaSelect.java
index 7f7a01d30050..341eca28e7ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaSelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaSelect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java
index 901ff38acccc..b12b7f7048f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCrossJoin.java
index da6be380b3c8..f3b7e05643c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCrossJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java
index 606fcefd7c0a..cdd3d43a2a7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteria.java
index cd269194275b..af0e4a39dcd9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteria.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteria.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaAttribute.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaAttribute.java
index 7dbf3e59714f..d993afee9417 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaType.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaType.java
index a85d86c9cfbb..35aa098214ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCteCriteriaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedFrom.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedFrom.java
index 4a87b151d81c..e1fd811e59f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
@@ -18,5 +16,5 @@ public interface JpaDerivedFrom extends JpaFrom {
 	 * The subquery part for this derived from node.
 	 */
 	JpaSubQuery getQueryPart();
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedJoin.java
index f592b0265b52..4dade29d8e0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedRoot.java
index 5611844050d8..da932d9876f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaDerivedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaEntityJoin.java
index 02b525242ca5..a7ba85b94e83 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaEntityJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java
index 6692ec27ad3e..2a0cb2f4072f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java
index 13b6a130d64d..d44f9acdcc57 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java
index 438d4d864c52..6c4175e5bd21 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java
index 0ca649d877d7..b52b8e3b8d5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFunction.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFunction.java
index 08898af2e337..0c8d8c5f0fd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java
index 1d1de68c5f07..ee79cb15937b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java
index 2901eed32b33..3b4bd61dceaf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java
index 4d785c7c20d1..24d3b1889594 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaManipulationCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaManipulationCriteria.java
index 9498acbe5f46..aa5d34edffbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaManipulationCriteria.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaManipulationCriteria.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java
index 28804cd3fe1e..658d03a62f84 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java
index 9b390f263fcd..1713b8beb4e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java
index d2a4dd7d605a..59ab8680333f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java
index a5cb166f1af1..2212d2939217 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
@@ -16,7 +14,6 @@
 import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.spi.NavigablePath;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPluralJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPluralJoin.java
index e0a6788135e2..472fb4479969 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPluralJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPluralJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java
index 87d4becbad61..3e6784b2b31b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java
index 6d92730e9dcd..7b735fc1bc81 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java
index 2a9226aa13d2..33024227942a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
index 52a70748c1aa..9fe1b621eaec 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java
index 655216967188..33ebeaf6e8ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java
index 607861f58d4e..feaf0429b11d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java
index 54a2378fe5e9..cf8e4e4a4f32 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java
index 25f46eb33e9d..63b0cd8951bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java
index 54d8e42ddff9..7305d230914f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java
index 849941382902..9cb8524d5ad2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java
index 42d23c9ddd69..8eb28c172d8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java
index de73a7126d7d..8f770cf03039 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java
index 8ded391baf33..023eb8d821ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedFrom.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedFrom.java
index 508a8717fab0..a7512f55dca0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedJoin.java
index 81423805a521..eb44bc7a5aa7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedPath.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedPath.java
index c4edfd5aa544..1633b34896b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTreatedPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java
index dac18206a9a0..6d3fc0fdad2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaValues.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaValues.java
index 1787ee4ce629..80cd29af3114 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java
index ed26ea55061f..c9819c84f6b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindow.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java
index bce66d279143..8c61f7107a3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaWindowFrame.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/ValueHandlingMode.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/ValueHandlingMode.java
index ff4d219c40a1..6d19b2105458 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/ValueHandlingMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/ValueHandlingMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java
index a59ed77cc978..eac994273ec7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/NamedCriteriaQueryMementoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/CriteriaBuilderExtension.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/CriteriaBuilderExtension.java
index 8452431b9c6a..0f4a1bd1cfba 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/CriteriaBuilderExtension.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/CriteriaBuilderExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
index e9353ece6ee1..108998808cef 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.criteria.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java
index d1f65dc0b858..cfb47b739b0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java
index d9def95b12f3..952eb0eea336 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java
index 7061d915b1ec..99c51a6e864c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java
index 64be6083d4d5..f7efd82cb2c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java
index 82bda97f790b..29974301d770 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java
index beee4fecd2a7..7dff0953369e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java
index da96f124cc3f..e56439c7ef48 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java
index 17bebcadbc7a..3fb770920bd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java
index ab018d1d7e76..1be701481258 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java
index f000e25a8a3c..f9c0aeee8b39 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java
index be448dc0b16e..8ec345b9a2ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java
index cf9eef2f3891..dc61e2e84159 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.derived;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlInterpretationException.java b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlInterpretationException.java
index 54084c2f3074..dc254a50983c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlInterpretationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlInterpretationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
index 37cdff4c8711..350fdb6029d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlTranslator.java b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlTranslator.java
index ab53051c41e8..b22b061a6e0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java
index b1be2f2a7cd8..ed2fb0783735 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
index c8e9c7c46ab5..0c3ffb536cdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/DomainPathPart.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/DomainPathPart.java
index 8ee17e4f8683..123ae9ee1f73 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/DomainPathPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/DomainPathPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePath.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePath.java
index a07862f4c85d..d1c8348fca7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java
index b6a9ab009567..cb3d5bc1ce50 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java
index b4d5fcb7c5fe..3b3dea9c9eae 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/HqlParseTreeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/HqlParseTreeBuilder.java
index ecf0e5a74dda..5679fa4a0647 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/HqlParseTreeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/HqlParseTreeBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java
index d0ced0f40cc1..d07661291502 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
index d70375526196..c58e961d8dc4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPredicatePathConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPredicatePathConsumer.java
index bc38770ee432..900fc4641486 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPredicatePathConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPredicatePathConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
index b7e40cb8dbcd..327976f8c72c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
index 478002be0542..0c4b86a2c27f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java
index 7739d218befc..c3825f090838 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmTreeCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmTreeCreationHelper.java
index 5d0db288dc8c..ad93326c522f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmTreeCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmTreeCreationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
index 191a6a05940d..ab0d411b77fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/DotIdentifierConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/DotIdentifierConsumer.java
index 944fe657672b..6bdaa1d79dd9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/DotIdentifierConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/DotIdentifierConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
index 3912061a06f4..86408ac46af9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationOptions.java
index 9f8b64dc692a..bca297bf1362 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationProcessingState.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationProcessingState.java
index 52fa2f643f2b..70f1f986e0a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationState.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationState.java
index 484fe7ed63dc..a1ceca03c844 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmCreationState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmPathRegistry.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmPathRegistry.java
index 93beb03e0d54..76383163b34a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmPathRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmPathRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmQueryImplementor.java
index e2229853bd36..eee7a138e6d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmQueryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SqmQueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.hql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java
index bb747155343a..c94b9a28e534 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java
index 8bc642c457e0..490025838497 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/DelegatingDomainQueryExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java
index 8a2bc0628d6f..22436c0d7d89 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java
index 46ef50ba5635..2f33cd156ee4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java
index 5c364be71b42..eb1177c5613d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java
index 2606b797c3cb..d3b9df8f1ca3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java
index bf4a270ad213..fcd30ae763bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java
index cf7018807c74..d74da44e1f9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java
index e8d7b6a4e76b..0866175bc508 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedObjectRepositoryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedObjectRepositoryImpl.java
index 7f984c2c20c3..f32c2211c423 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedObjectRepositoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedObjectRepositoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java
index f8b29c6c782b..acc3df628088 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedResultSetMappingMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedResultSetMappingMementoImpl.java
index 738ca8890148..b5f98c45f0f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedResultSetMappingMementoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedResultSetMappingMementoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NullPrecedenceHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NullPrecedenceHelper.java
index b36b54f67ba8..fb3263a939fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/NullPrecedenceHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NullPrecedenceHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
index dda0e91121b4..5bde0e394bfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryEngineImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryEngineImpl.java
index d3988b9131df..3690cbb10799 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryEngineImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryEngineImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java
index fbf9d29aec77..9c30ea01ef5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheDisabledImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheDisabledImpl.java
index eceb715723ce..00f31638edac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheDisabledImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheDisabledImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
index 9c3e036c4d3a..513cb10f079b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
@@ -72,7 +70,7 @@ private StatisticsImplementor getStatistics() {
 		}
 		return statistics;
 	}
-	
+
 	@Override
 	public  SelectQueryPlan resolveSelectQueryPlan(
 			Key key,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryLiteralHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryLiteralHelper.java
index d52e8ad0f0f4..190524908e75 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryLiteralHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryLiteralHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java
index 38166ca1901c..66a1f09c5938 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
index 5f102201ae5b..5c64dff034cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
index c7d08674f1dc..07e2bc5e464a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterNamedImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterNamedImpl.java
index 5b476513dc22..d08dc306c3af 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterNamedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterNamedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterPositionalImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterPositionalImpl.java
index d99b91a9b623..503122f97f66 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterPositionalImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterPositionalImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query.internal;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
index 62d3d215532a..ddbf3e8cd474 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java
index c5ed0626209c..6e4af3e36659 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java
index 56307a0a80f4..2acddfd1ae3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java
index dc748466ba5b..249d3c718c77 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java
index 8c3f1d557b9d..9f973027daf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultSetMappingResolutionContext.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultSetMappingResolutionContext.java
index d3cdb910605c..ed32de761407 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultSetMappingResolutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultSetMappingResolutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
index 7b4e9f22e10b..382cab82b400 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleQueryOptions.java
index 9af32abf3684..300c59a8fbb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleQueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/AbstractNamedQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/AbstractNamedQueryMemento.java
index 068616089a6f..35272112070f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/AbstractNamedQueryMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/AbstractNamedQueryMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/FetchMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/FetchMemento.java
index 4db2538a3097..ce6954296806 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/FetchMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/FetchMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/FetchMementoBasic.java b/hibernate-core/src/main/java/org/hibernate/query/named/FetchMementoBasic.java
index fae9b72625b8..73e1136c2188 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/FetchMementoBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/FetchMementoBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartReferenceMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartReferenceMemento.java
index c031c018213d..ade32d0ba6d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartReferenceMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartReferenceMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMemento.java
index 9da9b233a71b..742458c1b1e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoBasic.java b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoBasic.java
index c8e1c853997e..a6c853ad335e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoCollection.java b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoCollection.java
index 63463f93b51b..c6a65aae9a7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoEntity.java b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoEntity.java
index 84b52fbb4267..65124d4ec9e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ModelPartResultMementoEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java b/hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java
index f240cf8d0414..08bdf7a6d165 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedObjectRepository.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedObjectRepository.java
index 02b18055abf7..80294a4b2e0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedObjectRepository.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedObjectRepository.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java
index 3f56281f3a63..f59bb7a19dfa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java
index 79054a0d42d8..5cbfcc541748 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMappingMementoNode.java b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMappingMementoNode.java
index b670aa61db8e..c8d6bcc38ee7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMappingMementoNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMappingMementoNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java
index 3e7645d14d85..4250e691327e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoBasic.java b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoBasic.java
index 3637bdf605aa..07517631b4fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoEntity.java b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoEntity.java
index 3126406fb3e3..bf972f1b05f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoInstantiation.java
index de6db0c04358..7e3254a92e7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/named/ResultMementoInstantiation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.named;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java
index 37add332cba0..89f27b1a02a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java
index 82f6124ac11e..8d7dd31c86c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.procedure;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/BasicValuedFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/BasicValuedFetchBuilder.java
index 5b4c6e4924e3..2cb5548bcd5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/BasicValuedFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/BasicValuedFetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java
index c8999ed24c84..b541a8ec099e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java
index 7744bedfcd63..956be35b2a13 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java
index 42c4902e82d3..d65dcd580e58 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/FromClauseAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/FromClauseAccessImpl.java
index 1a84f866dfde..f32d457ddde0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/FromClauseAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/FromClauseAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ImplicitAttributeFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/ImplicitAttributeFetchBuilder.java
index a1bd189c3af0..85b141112230 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ImplicitAttributeFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ImplicitAttributeFetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/JdbcValuesMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/JdbcValuesMappingImpl.java
index 973c2bdcfb39..bbb60c605750 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/JdbcValuesMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/JdbcValuesMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/MissingSqlSelectionException.java b/hibernate-core/src/main/java/org/hibernate/query/results/MissingSqlSelectionException.java
index d329d1ed9a5b..c25168e8c5ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/MissingSqlSelectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/MissingSqlSelectionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/PositionalSelectionsNotAllowedException.java b/hibernate-core/src/main/java/org/hibernate/query/results/PositionalSelectionsNotAllowedException.java
index 79af9764f9a5..13222e0add8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/PositionalSelectionsNotAllowedException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/PositionalSelectionsNotAllowedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilder.java
index 13a3efa470b0..8893ec89c631 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderBasicValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderBasicValued.java
index ac0a7b97ec25..7055dc7b1d74 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderBasicValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderBasicValued.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEmbeddable.java
index 1523763cef46..7debb74ce08f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEmbeddable.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
 import java.util.function.BiFunction;
 
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
-import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
index 45abe8c2f74f..7c9d041c151d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderInstantiationValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderInstantiationValued.java
index 6544e97e8893..8f6e81412952 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderInstantiationValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderInstantiationValued.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
index 7a6b6e12f779..433d6e8cf40f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java
index 2669db4a502f..8742d54ca3f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
@@ -29,7 +27,6 @@
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.graph.entity.EntityResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingSqlSelection.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingSqlSelection.java
index f57a1c2eb03f..adea8eb000ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingSqlSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingSqlSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java
index d229ec096214..cf7aabf9580b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/TableGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/TableGroupImpl.java
index 11a8d0b1bd35..0fc53c68e0c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/TableGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/TableGroupImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilder.java
index 74da9c395ad0..7268abf392b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderBasicPart.java
index bc3b9034b5bf..e79924b8febc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderBasicPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderBasicPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
index 68ae55e05739..1441f9538e98 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.BiFunction;
 
@@ -14,11 +11,9 @@
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.ResultSetMappingSqlSelection;
 import org.hibernate.query.results.ResultsHelper;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
@@ -27,7 +22,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.ResultsHelper.impl;
-import static org.hibernate.query.results.ResultsHelper.jdbcPositionToValuesArrayPosition;
 
 /**
  * CompleteFetchBuilder for embeddable-valued ModelParts
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEntityValuedModelPart.java
index 6e5631ca0c3b..65c8e5f71599 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEntityValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderEntityValuedModelPart.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.BiFunction;
 
@@ -16,9 +13,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.ResultSetMappingSqlSelection;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
@@ -28,7 +23,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.ResultsHelper.impl;
-import static org.hibernate.query.results.ResultsHelper.jdbcPositionToValuesArrayPosition;
 
 /**
  * CompleteFetchBuilder for entity-valued ModelParts
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilder.java
index fd85e0ee2b2e..a13fe3b04bfd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicModelPart.java
index 7295dd609a1a..322662a80d24 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicModelPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValued.java
index 81d0a27ccdbd..7c0b20653090 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValued.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java
index e4d5a99dbda6..81e23760f394 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java
index 1191163f9791..bf5db51513de 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollection.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollection.java
index e787805fec7f..eba71c40326e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java
index 42746e0a7b56..c2a49ff867a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderCollectionStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java
index 23f5ece32096..c8a57a185567 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java
index ab3a9e95711d..29fb0c864bbe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityValued.java
index 8e27b8bb73a4..e21eb5fe0266 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityValued.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java
index 23ab29e6fe0c..3baac22da8b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/DelayedFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/DelayedFetchBuilderBasicPart.java
index 94b1df45c144..374ded21ae9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/DelayedFetchBuilderBasicPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/DelayedFetchBuilderBasicPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
@@ -19,7 +17,6 @@
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
-import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/EntityResultImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/EntityResultImpl.java
index bec6b32711c4..488744df13c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/EntityResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/EntityResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReference.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReference.java
index eee1c43962d4..cff49959a9c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceBasic.java
index cc62559cb922..d843e1636894 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceCollection.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceCollection.java
index 7b661b879f48..803b8738dfd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEmbeddable.java
index b47f7d2615e9..d3f218b3bf31 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEntity.java
index bbcb4be0b0cb..010fc989222e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/ModelPartReferenceEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.complete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/AbstractFetchBuilderContainer.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/AbstractFetchBuilderContainer.java
index 9c824e690d7a..053e46b5bfda 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/AbstractFetchBuilderContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/AbstractFetchBuilderContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java
index d13f72cebc3b..6b85cc1d2f92 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderContainer.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderContainer.java
index 3d5bbb7e95ae..ed65d1a425be 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java
index f6c26b1a41a0..294b6c1f1dd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java
index b0710a24718c..d7be959e1609 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
@@ -11,9 +9,7 @@
 import java.util.function.BiFunction;
 
 import org.hibernate.engine.FetchTiming;
-import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
-import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.ValuedModelPart;
@@ -32,7 +28,6 @@
 import org.hibernate.sql.results.graph.embeddable.EmbeddableValuedFetchable;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
-import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java
index 511cf7b53af9..c34558872930 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java
index dbcd00651e91..45d2acc31bd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasic.java
index 36f1b27aa069..edd920cdbdfe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java
index 1b617fe59e94..26f4b95a7f94 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java
index cc17a34425db..eda44a2a8820 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntity.java
index 815b326575e3..c55715b4d5b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java
index 2d6258ed9315..c5b4e4837d91 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityCalculated.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java
index 17aab3d40547..6c647b9911b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java
index fc05fb849980..7c353656a23d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderInstantiation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java
index c435509f5b24..2e3e9b694c1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/LegacyFetchResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.dynamic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilder.java
index 9bce54f86649..b92bc20ad542 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderBasic.java
index ee79de00c800..f8ef557352f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
@@ -27,7 +25,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.ResultsHelper.impl;
-import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
index 9592fdb18852..bedb1ffa8956 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEmbeddable.java
index afd88df96de7..a87bec2df4ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntity.java
index 28466640df18..6e6917cfc7e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntity.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntityPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntityPart.java
index 02ea6088c215..86f54f5a97d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntityPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderEntityPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderPlural.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderPlural.java
index 1fb7813b2ec0..b69969368d1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderPlural.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderPlural.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
 import java.util.function.BiFunction;
 
-import org.hibernate.engine.FetchTiming;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
@@ -19,7 +15,6 @@
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
-import static org.hibernate.query.results.ResultsHelper.impl;
 
 /**
  * @author Christian Beikov
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilder.java
index 0b7bf34e6715..413778a2c747 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderBasic.java
index c4aa6eb96014..831ac01a3392 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderBasic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEmbeddable.java
index 79be38de9bcf..d3e8009f2e75 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEntity.java
index dc63366a22e0..acd92e69fa44 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitModelPartResultBuilderEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitResultClassBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitResultClassBuilder.java
index ea8613d15d31..945c9a82ea47 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitResultClassBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitResultClassBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.results.implicit;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
index 5745e87f3e7b..0718818eb6db 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java
index 319e64943689..a2c7436afc4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQueryParameter.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQueryParameter.java
index 5719bc5a2f26..419fd1362a05 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQueryParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQueryParameter.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
 import org.hibernate.query.BindableType;
 import org.hibernate.query.QueryLogging;
-import org.hibernate.query.spi.QueryParameterImplementor;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
index e278f9a18a3e..58ed7467b184 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/CloseableIterator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/CloseableIterator.java
index ec87aed7cef4..cba7046a9da0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/CloseableIterator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/CloseableIterator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java
index 97a43585bca4..0d51653f86f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java
index 9b2bd5a0310e..af45de467384 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/DomainQueryExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/HqlInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/spi/HqlInterpretation.java
index 454411d788aa..b96caac3f626 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/HqlInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/HqlInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/Limit.java b/hibernate-core/src/main/java/org/hibernate/query/spi/Limit.java
index 964d4a6495c6..ebd58fa722aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/Limit.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/Limit.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java
index eaca831f959c..c3d170972faf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/NonSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/spi/NonSelectQueryPlan.java
index e4cee5be9314..7c050da7b849 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/NonSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/NonSelectQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java
index 7f8617b18af7..4de36afb32e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
index 143cdd0d4dfa..5c99c22a54d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngine.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngine.java
index c902f0457281..6a83b1241571 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngine.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
@@ -54,4 +52,3 @@ default  HqlInterpretation interpretHql(String hql, Class resultType) {
 		return getInterpretationCache().resolveHqlInterpretation( hql, resultType, getHqlTranslator() );
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngineOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngineOptions.java
index bbfbf4ea6e8c..a30189d2edc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngineOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngineOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java
index 54ea6d4b08a6..96137e347a8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryInterpretationCache.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryInterpretationCache.java
index c108b2103dda..60148cd9b69a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryInterpretationCache.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryInterpretationCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
@@ -12,7 +10,6 @@
 import org.hibernate.Incubating;
 import org.hibernate.query.hql.HqlTranslator;
 import org.hibernate.query.sql.spi.ParameterInterpretation;
-import org.hibernate.query.sqm.tree.SqmStatement;
 
 /**
  * Cache for various parts of translating or interpreting queries.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java
index 1d03d33d9c7b..9b6ddfe5adbb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java
index 2cfdeb0b5091..c4ba842373d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
index 208362f7db8e..e79f1f675040 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
@@ -16,7 +14,6 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
- /**
  * The value/type binding information for a particular query parameter.  Supports
  * both single-valued and multivalued binds
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingTypeResolver.java
index 41b6ff27d405..378337df7a84 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
index 1cc880ad368f..a99776cf4daa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
index 41dc24f27862..4972aea98bdd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterImplementor.java
index 1456ab328e7b..f9e5cfca0623 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java
index 0044485e16b8..f9176def2b8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.Incubating;
 import org.hibernate.query.BindableType;
-import org.hibernate.query.internal.QueryParameterBindingsImpl;
 import org.hibernate.type.Type;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryPlan.java
index 318602779530..1229a13d0cac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
index 09120a10f174..d3db2337a06d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/ScrollableResultsImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/ScrollableResultsImplementor.java
index 2e1fa880bfca..b917e61059f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/ScrollableResultsImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/ScrollableResultsImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java
index df969eabc46a..56835be69e9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SelectQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java
index 58b1a62a21f9..73fae09210ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
index e7b92c9c34aa..5a3ea2fcfdf8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SqmQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SqmQuery.java
index 580f953c6319..73cf46983774 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SqmQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SqmQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/NativeQueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/sql/NativeQueryLogging.java
index 1eeb8084a7a6..24c1c036f72e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/NativeQueryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/NativeQueryLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NamedNativeQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NamedNativeQueryMementoImpl.java
index 57ab71d92442..724869cf4f41 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NamedNativeQueryMementoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NamedNativeQueryMementoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java
index d27e7effadb6..d5b62c9548c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeNonSelectQueryPlanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
index 6eb5bad5500a..691252daa6ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java
index c68cc1c97dac..bd5715aee915 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterParser.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterParser.java
index b8d7abca7969..a8a75b049ce9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterParser.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
 import java.util.BitSet;
-import java.util.Map;
 import org.hibernate.QueryException;
 import org.hibernate.QueryParameterException;
 import org.hibernate.internal.log.DeprecationLogger;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java
index 8fa2b5e71aec..9fcc306483c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
index d655a9bc0e69..07497b9070a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
index 8b35b2f0888d..f9f0e825f40d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java
index c1c815e4389c..5b6018389ecb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryDefinition.java
index 0bad0e217982..2e791d29bbb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryPlan.java
index 1b132142a8f6..06f7597945c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeNonSelectQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java
index 73f166f48b7b..c731bdfa04c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
@@ -323,4 +321,3 @@ NativeQueryImplementor addJoin(
 
 	void addResultTypeClass(Class resultClass);
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java
index 6f8486bc5f97..7036bbed3e64 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryDefinition.java
index 316d5c23a403..f69718d60aca 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryDefinition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
@@ -10,9 +8,6 @@
 import java.util.Set;
 
 import org.hibernate.query.results.ResultSetMapping;
-import org.hibernate.query.spi.QueryParameterImplementor;
-import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
-import org.hibernate.sql.results.spi.RowTransformer;
 
 /**
  * Access the values defining a native select query
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryPlan.java
index bab3680800fe..13c5db73be4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NonSelectInterpretationsKey.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NonSelectInterpretationsKey.java
index 99a5cdc7154e..1ed01fbc5ae3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NonSelectInterpretationsKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NonSelectInterpretationsKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
@@ -11,7 +9,6 @@
 import java.util.HashSet;
 
 import org.hibernate.query.spi.QueryInterpretationCache;
-import org.hibernate.query.sqm.internal.SqmInterpretationsKey;
 
 /**
  * QueryInterpretations key for non-select NativeQuery instances
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterInterpretation.java
index 1a9ec42f4fb9..16dc2d2e6590 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
@@ -10,7 +8,6 @@
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.spi.ParameterMetadataImplementor;
-import org.hibernate.query.spi.QueryParameterImplementor;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterOccurrence.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterOccurrence.java
index 0be95dbe4ff8..951db3d84597 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterOccurrence.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterOccurrence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterRecognizer.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterRecognizer.java
index 7aa08bffbdbe..6269a0eba3b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterRecognizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/ParameterRecognizer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/SelectInterpretationsKey.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/SelectInterpretationsKey.java
index 439c7187be49..613ad93b2aaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/SelectInterpretationsKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/SelectInterpretationsKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/AliasCollisionException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/AliasCollisionException.java
index ff33ec9d77a3..78481c098f7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/AliasCollisionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/AliasCollisionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/BinaryArithmeticOperator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/BinaryArithmeticOperator.java
index 3f3b985685ef..4c22f7071a19 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/BinaryArithmeticOperator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/BinaryArithmeticOperator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
index dcfa44e1c7de..e0fdfa179b82 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/ComparisonOperator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/ComparisonOperator.java
index 91ba8a6a83db..be03e984a6d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/ComparisonOperator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/ComparisonOperator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/DynamicInstantiationNature.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/DynamicInstantiationNature.java
index cb30155a4ca9..380840c11832 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/DynamicInstantiationNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/DynamicInstantiationNature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/EntityTypeException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/EntityTypeException.java
index 02e6e16829ca..d0674fc9c5f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/EntityTypeException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/EntityTypeException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java
index b35552c283f8..3adf79c2fdd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/FetchClauseType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java
index 4df33105faa9..edc0418ecc87 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameExclusion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java
index 2f31269629bb..3a03f9059839 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java
index 9048aeaeaac7..7c9d3095e857 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/FrameMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/InterpretationException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/InterpretationException.java
index 2d6ba087cb04..a4d1d2afaddf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/InterpretationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/InterpretationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java
index 911600865bc0..d2d0e7bfbec8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/IntervalType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/LiteralNumberFormatException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/LiteralNumberFormatException.java
index d32933070198..e16fc685d243 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/LiteralNumberFormatException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/LiteralNumberFormatException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
index 9f200c8548fd..6ad255e81abb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/ParsingException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/ParsingException.java
index 07cabdd99f29..26bb4b7a3ef4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/ParsingException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/ParsingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/PathElementException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/PathElementException.java
index 10371c064c87..be22bc1763aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/PathElementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/PathElementException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java
index 089ac6722005..d7af9a5dbe4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
@@ -241,7 +239,7 @@ default T visitSingularJoin(SqmSingularJoin join) {
 	T visitFkExpression(SqmFkExpression fkExpression);
 
 	T visitDiscriminatorPath(DiscriminatorSqmPath sqmPath);
-	
+
 	T visitIndexedPluralAccessPath(SqmIndexedCollectionAccessPath path);
 
 	T visitElementAggregateFunction(SqmElementAggregateFunction path);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SetOperator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SetOperator.java
index 80cb35135ccb..ac04cf8e7efd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SetOperator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SetOperator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java
index 68290fdf18f8..4bdd0d25be8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmJoinable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmJoinable.java
index f9e8b6ab6209..df6af1d5fa68 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmJoinable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmJoinable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
index 1155915e92ff..c9832dac3556 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmQuerySource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmQuerySource.java
index b3c77f76e932..ca281cfa9824 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmQuerySource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmQuerySource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmSelectionQuery.java
index 677d569f9838..b8d70c436ee3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmSelectionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeCreationLogger.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeCreationLogger.java
index 6a6aeaf20ce7..478c4882215a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeCreationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeCreationLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeTransformationLogger.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeTransformationLogger.java
index 91811f3acd41..9e1bc4557a8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeTransformationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmTreeTransformationLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/StrictJpaComplianceViolation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/StrictJpaComplianceViolation.java
index a44d41ac60d3..6f5628807208 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/StrictJpaComplianceViolation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/StrictJpaComplianceViolation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java
index b5aca3a27226..d08fbce6ea21 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/TemporalUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/TerminalPathException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/TerminalPathException.java
index 31ddfe8d23d0..acc78d021265 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/TerminalPathException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/TerminalPathException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/TreatException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/TreatException.java
index 036af656f543..659ced266e0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/TreatException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/TreatException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/TrimSpec.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/TrimSpec.java
index ffd53607e7ad..aa7d84c9473e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/TrimSpec.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/TrimSpec.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnaryArithmeticOperator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnaryArithmeticOperator.java
index ca82822f7aac..62d4f6967f14 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnaryArithmeticOperator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnaryArithmeticOperator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownEntityException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownEntityException.java
index ef159ee9ee12..7af13d27a5fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownEntityException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownEntityException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
index 9d14f4229df8..a5a0a55957e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java
index bd0a21f11f62..b67a6b1e211d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
@@ -238,4 +236,3 @@ protected  SelfRenderingSqmWindowFunction generateSqmWindowFunctionExpress
 		);
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java
index 3eaf8d80aa3b..666baa5c7641 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionKind.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionKind.java
index 13a72c282445..ed58b09c133c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java
index e7d82be11e0f..55eac8ef12e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java
index ae228aa5d4ad..2ee63693b31f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java
index 3819be976b64..bb5afbb536fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java
index 888d64cc6c03..c2b046f56e5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java
index 3b2652797717..ecdee9203106 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java
index ea169d784de4..ecc21666d85f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java
index 1094685c80e4..d0ef77eede72 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java
index bf7bd2119fe5..ced252e75665 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
index 7e0c436331ee..99dde026c2b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
index d8fb2c371ae2..17e23dac0d90 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
index 53d871da8f12..c41a9e4ef179 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
index fce709eb7119..b30dc3882b60 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java
index 6a12bf8f2810..e22e828662a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java
index 30a671ce7f08..1092f73aba78 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
@@ -178,16 +176,16 @@ default  SelfRenderingSqmFunction generateSqmExpression(
 	 * 
      
 	 * Instances of this interface are usually used for rendering of functions.
 	 * However, there are cases where Hibernate needs to consume a fragment
-	 * and decide if a token represents a function name.  In cases where the 
+	 * and decide if a token represents a function name.  In cases where the
 	 * token is followed by an opening parenthesis, we can safely assume the
-	 * token is a function name. Bur if the next token is not an opening 
-	 * parenthesis, the token might still represent a function if the function 
+	 * token is a function name. Bur if the next token is not an opening
+	 * parenthesis, the token might still represent a function if the function
 	 * has a "no paren" form in the case of no arguments.
 	 * 
      
-	 * For example, many databases do not require parentheses for functions 
-	 * like {@code current_timestamp} and friends. This method helps account 
+	 * For example, many databases do not require parentheses for functions
+	 * like {@code current_timestamp} and friends. This method helps account
 	 * for those cases.
-	 * 
+	 *
 	 * @apiNote The most common case, by far, is that a function call requires
 	 *          the parentheses. So this method returns true by default.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
index 78fb9af2eaa4..ba391a48f834 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
index 64a4b2e4f641..5f8f4cedaa5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedNonSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedNonSelectQueryPlanImpl.java
index 70f2ff18508e..d2528bd55516 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedNonSelectQueryPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedNonSelectQueryPlanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedSelectQueryPlanImpl.java
index 577e4e037f27..95a7419b47d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedSelectQueryPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AggregatedSelectQueryPlanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AppliedGraphs.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AppliedGraphs.java
index 0dc27869feaf..9cda89f18ce4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AppliedGraphs.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AppliedGraphs.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
index 376e9e62accb..e1eabc85bd90 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
index 8368de1c20c0..d75cd8ed1193 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
index f1eb6eabab1d..008488658f9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java
index bb72abb36918..725c26ebaa7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableDeleteQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableDeleteQueryPlan.java
index d641da765f08..fda803a2f100 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableDeleteQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableDeleteQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableInsertQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableInsertQueryPlan.java
index 3e79db5d3feb..4d0e3ebc30a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableInsertQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableInsertQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableUpdateQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableUpdateQueryPlan.java
index 7564a3641ed2..420a6cab8c61 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableUpdateQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/MultiTableUpdateQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
@@ -11,7 +9,6 @@
 import org.hibernate.query.spi.NonSelectQueryPlan;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
 import org.hibernate.query.sqm.tree.update.SqmUpdateStatement;
-import org.hibernate.sql.exec.spi.ExecutionContext;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/NoParamSqmCopyContext.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/NoParamSqmCopyContext.java
index 8a3d960a2a05..1f9dea0272b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/NoParamSqmCopyContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/NoParamSqmCopyContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ParameterCollector.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ParameterCollector.java
index 21b36b3f0a88..51a43f281f86 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ParameterCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ParameterCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
index 3d90b520945e..288cbc0171ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
index f5f9b525af84..126158e3b358 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java
index 04126df5eb61..74a127540f12 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleInsertQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleSqmCopyContext.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleSqmCopyContext.java
index 37e61b8d4145..86d301b9f1a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleSqmCopyContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleSqmCopyContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java
index 39c3d5ce066c..94b703343bc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleUpdateQueryPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationOptionsStandard.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationOptionsStandard.java
index fb3969228e12..3e34e81be427 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationOptionsStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationOptionsStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationProcessingStateImpl.java
index 4f4ea4ab73a4..e3bfe6390f78 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationProcessingStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCreationProcessingStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
index 6339000cb999..c3b742123dd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmDmlCreationProcessingState.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmDmlCreationProcessingState.java
index bf4cad1fab18..385f6372f2f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmDmlCreationProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmDmlCreationProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
index ea7d5859c949..bb71d5af60ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java
index 76853d86382d..d334860d2ac8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java
index 8f8296fa9858..80ea73487410 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmPathVisitor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmPathVisitor.java
index c7a8165eef66..8fd0ccad4585 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmPathVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmPathVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryPartCreationProcessingStateStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryPartCreationProcessingStateStandardImpl.java
index b97a8f2c3224..de7b9047f2de 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryPartCreationProcessingStateStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryPartCreationProcessingStateStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
index a493fd62df9f..20e78d57696b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java
index c96363c03b5e..ff6aa3176076 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
index 9110f34bddc9..4cae5391943a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
index 073174a5b997..6a2e1e6afef3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java
index 06bb963dcd04..53de5451adcc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/ExpressionDomainResultProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/ExpressionDomainResultProducer.java
index 048f37106f7b..50a95afc3588 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/ExpressionDomainResultProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/ExpressionDomainResultProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
@@ -15,7 +13,6 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 
 /**
  * A wrapper around a basic {@link Expression} that produces a {@link BasicResult} as domain result.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/Handler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/Handler.java
index bc6bfce2b895..057c3be9141e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/Handler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/Handler.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
 import org.hibernate.query.spi.DomainQueryExecutionContext;
-import org.hibernate.sql.exec.spi.ExecutionContext;
 
 /**
  * Simply as a matter of code structuring it is often worthwhile to  put all of the execution code into a separate
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/InsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/InsertHandler.java
index da81a3a761fa..3f1580050c01 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/InsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/InsertHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
index 572d1b9ebdf8..af5e100c1dbe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java
index aec541d37035..42569f88f708 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MutationQueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MutationQueryLogging.java
index ff2a3e71df50..c4aa7a675c5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MutationQueryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MutationQueryLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SelectableMappingExpressionConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SelectableMappingExpressionConverter.java
index 073cec206771..4c4f57c126dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SelectableMappingExpressionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SelectableMappingExpressionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmInsertStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmInsertStrategyHelper.java
index 5aab9a0c56d0..ca60c81bb219 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmInsertStrategyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmInsertStrategyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderInitiator.java
index abaf8410440f..31de8ea1e1aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderStandard.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderStandard.java
index 35f371c6f65e..b376fab9a7b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMultiTableMutationStrategyProviderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
index cdec88808e9c..42c17c41f1f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/TableKeyExpressionCollector.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/TableKeyExpressionCollector.java
index 2f9ce22f280f..ecd38113e310 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/TableKeyExpressionCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/TableKeyExpressionCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java
index 5d24873169b8..da5e1d8ea784 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
index 8b3dd2c81688..3e540c8659cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java
index dcf24a527579..d556546fb93d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
@@ -16,7 +14,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.mutation.internal.DeleteHandler;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
index 2b9ac4937810..6dc881e6a82b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
index 4aac6f499231..c86e4c45ff83 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
index 9f2a73270d87..078385388a5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
index aacdca0504e8..bf2b59a02916 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
@@ -11,7 +9,6 @@
 import java.util.List;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java
index a8daf6864306..7eaec24836f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java
index 4dcd8a4ecc75..5615bd25e0ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InPredicateRestrictionProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.inline;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
index 47139ba176dd..3863403344b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.inline;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineMutationStrategy.java
index 736588814ede..fa42d510df8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineMutationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.inline;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
index 046da5451903..6275c1467b18 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.inline;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/MatchingIdRestrictionProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/MatchingIdRestrictionProducer.java
index fb8c8b33c163..1889a7f53018 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/MatchingIdRestrictionProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/MatchingIdRestrictionProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.inline;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AbstractDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AbstractDeleteExecutionDelegate.java
index 5697406d8015..26ba78db0d2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AbstractDeleteExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AbstractDeleteExecutionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AfterUseAction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AfterUseAction.java
index 26741fc79a8a..9efb0bd3931d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AfterUseAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/AfterUseAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/BeforeUseAction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/BeforeUseAction.java
index d32bfc78a6d0..aff07f857aae 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/BeforeUseAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/BeforeUseAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ColumnReferenceCheckingSqlAstWalker.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ColumnReferenceCheckingSqlAstWalker.java
index 37dd491b47d2..4a1161c8710d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ColumnReferenceCheckingSqlAstWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ColumnReferenceCheckingSqlAstWalker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
index 8186a59ba91c..9654a70a6565 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
@@ -40,7 +38,6 @@
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithoutIdTableHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithoutIdTableHelper.java
index 094256721f5d..d2c947f3f616 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithoutIdTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithoutIdTableHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableInsertStrategy.java
index 2e4b35b75d62..e814d0150a65 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableInsertStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableMutationStrategy.java
index 4ee46670b0ca..a6b4c8599d2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableMutationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java
index 3de4bdbd0cca..a6584f88e4d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/GlobalTemporaryTableStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java
index fea490c555ac..d62bd4199f19 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/InsertExecutionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableInsertStrategy.java
index b83e3482224e..0c1b510f9a57 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableInsertStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableMutationStrategy.java
index 9892b1a1bfc5..37537a7e4fee 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableMutationStrategy.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
 import org.hibernate.dialect.temptable.TemporaryTable;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java
index ba6247291818..11ea5d18ba74 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableInsertStrategy.java
index c439d96043ec..830b9ba5f925 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableInsertStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableMutationStrategy.java
index 9992d310e7ad..cb759ca41940 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableMutationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java
index e3db49d89171..458b54af2775 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java
index c2fc2dd4f7dc..1a3785c1db95 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java
index beaccedf9bd2..ae5890345f36 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
index b95a336de631..8765d9f6f6b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
index f1918afc18d7..a3a5ddb7be3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
index 12cefd5658fa..29574c877aa0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
index ee95537c3c79..2d97bef6b5fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/AbstractMutationHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/AbstractMutationHandler.java
index 7c6e66800183..cfbc41239979 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/AbstractMutationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/AbstractMutationHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableInsertStrategy.java
index fecffd7644d3..e7456c90e556 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableInsertStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java
index 997d01a016d3..c890dc990c50 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategyProvider.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategyProvider.java
index ff52dd6a38e3..a358a92f8e7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategyProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategyProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.mutation.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java
index 73a29eee7ca5..1764e642cc58 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java
index eab2fd6cf178..fa52c9db066d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentException.java
index a366be2260c6..b7096ef534d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java
index c1710b5dbebf..f37d6516367d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionArgumentTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java
index 2564f6626448..24381e8bfb37 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionParameterType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
@@ -85,7 +83,7 @@ public enum FunctionParameterType {
 	STRING_OR_CLOB,
 	/**
 	 * Indicates that the argument should be a spatial type
-	 * @see org.hibernate.type.SqlTypes#isSpatialType(int) 
+	 * @see org.hibernate.type.SqlTypes#isSpatialType(int)
 	 */
 	SPATIAL,
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java
index bb7a7d770d03..3ddc1c933dd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/NamedFunctionDescriptorBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/NamedFunctionDescriptorBuilder.java
index 574510ee07dc..bd0be06ff460 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/NamedFunctionDescriptorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/NamedFunctionDescriptorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/PatternFunctionDescriptorBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/PatternFunctionDescriptorBuilder.java
index 55366860737b..41d6922a77b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/PatternFunctionDescriptorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/PatternFunctionDescriptorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java
index 2a17a478ae7e..4908482e3c09 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardArgumentsValidators.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
-import org.hibernate.QueryException;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
 import org.hibernate.type.spi.TypeConfiguration;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java
index 5abd08be1bd9..a9f00c2d0c24 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionArgumentTypeResolvers.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java
index eca56d466d02..6fe0c0f56212 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function;
 
-import java.sql.Types;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Supplier;
@@ -15,17 +12,14 @@
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
 import org.hibernate.query.sqm.tree.expression.NullSqmExpressible;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.type.BasicType;
-import org.hibernate.type.SqlTypes;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java
index 9b2d224a482d..7bb73c05464a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.produce.function.internal;
 
@@ -20,9 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Delegate for handling function "templates".
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java
index dc10b75e9661..39df3ecfe58d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java
index 1c5ba392e9c6..2872a08bf34a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/JdbcParameterBySqmParameterAccess.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/JdbcParameterBySqmParameterAccess.java
index 3318a5cacadf..cc5f105ef1af 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/JdbcParameterBySqmParameterAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/JdbcParameterBySqmParameterAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/NamedSqmQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/NamedSqmQueryMemento.java
index 056344f461be..6a0090e860cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/NamedSqmQueryMemento.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/NamedSqmQueryMemento.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query.sqm.spi;
 
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/ParameterDeclarationContext.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/ParameterDeclarationContext.java
index b6de7fd3bd50..64627ace9b44 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/ParameterDeclarationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/ParameterDeclarationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationContext.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationContext.java
index ecba1dde608c..e5f27d525868 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
index 55ae90e0c7d3..8b2ac39d116a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmParameterMappingModelResolutionAccess.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmParameterMappingModelResolutionAccess.java
index cc04bd53ec5e..33088965848c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmParameterMappingModelResolutionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmParameterMappingModelResolutionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmSelectionQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmSelectionQueryImplementor.java
index d61c522f998c..cfceba34af5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmSelectionQueryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmSelectionQueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/AggregateColumnAssignmentHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/AggregateColumnAssignmentHandler.java
index 747b84fd54e2..f780df875257 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/AggregateColumnAssignmentHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/AggregateColumnAssignmentHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
index b68b2fc88c0f..4e3b5ac48aa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
@@ -8941,10 +8939,10 @@ public boolean isAssociationKeyVisited(AssociationKey associationKey) {
 	@Override
 	public boolean isRegisteringVisitedAssociationKeys() {
 		/*
-			 We need to avoid loops in case of eager self-referencing associations
+			We need to avoid loops in case of eager self-referencing associations
 
-			 	E.g.
-			 	@NamedEntityGraphs({
+				E.g.
+				@NamedEntityGraphs({
 				@NamedEntityGraph(
 						name = "User.overview",
 						attributeNodes = { @NamedAttributeNode("name") })
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/ConversionException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/ConversionException.java
index d170302dfaac..d336b215e560 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/ConversionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/ConversionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FakeSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FakeSqmToSqlAstConverter.java
index 02ffca60282d..4c340277185b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FakeSqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FakeSqmToSqlAstConverter.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FromClauseIndex.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FromClauseIndex.java
index 09eda6d1d969..d6836bbedf99 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FromClauseIndex.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/FromClauseIndex.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.query.sqm.sql;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmToSqlAstConverter.java
index e932d9a4a9a4..60e43cc21e95 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmToSqlAstConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslation.java
index 09fbedea07a9..8c1e00f44e34 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslator.java
index d67a83e24ef3..c6b8e166b42f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslatorFactory.java
index 1c0a8d61ae37..cacbfe2b971a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/SqmTranslatorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
@@ -11,16 +9,10 @@
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.tree.SqmDmlStatement;
-import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
-import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
-import org.hibernate.query.sqm.tree.update.SqmUpdateStatement;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.tree.MutationStatement;
-import org.hibernate.sql.ast.tree.delete.DeleteStatement;
-import org.hibernate.sql.ast.tree.insert.InsertStatement;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.ast.tree.update.UpdateStatement;
 
 /**
  * Factory for various
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslation.java
index ea8993270196..1281932af427 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslatorFactory.java
index 0d539040713c..1c0fd8998315 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/StandardSqmTranslatorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java
index 9da10d927764..55292af90824 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqmPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqmPathInterpretation.java
index 3c8da0541d96..95232a60b2d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqmPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqmPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AnyDiscriminatorPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AnyDiscriminatorPathInterpretation.java
index 1b0367411460..570d285634ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AnyDiscriminatorPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AnyDiscriminatorPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
@@ -17,8 +15,6 @@
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
-import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
 
 public class AnyDiscriminatorPathInterpretation extends AbstractSqmPathInterpretation {
 	private final Expression expression;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AsWrappedExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AsWrappedExpression.java
index d45b128bafd3..9202289f1b54 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AsWrappedExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AsWrappedExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java
index 9a0035cc3bd9..bd0a6ca4bde8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
index 26a5d70d7872..89e42620e196 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.domain.SqmAnyValuedSimplePath;
 import org.hibernate.sql.ast.SqlAstWalker;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatorPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatorPathInterpretation.java
index 7091a824b337..ccba4d1af202 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatorPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatorPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DomainResultProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DomainResultProducer.java
index a8d32d181bf3..b9fa03297b0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DomainResultProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DomainResultProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedExpression.java
index d477397522da..1df059387981 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
index a874bcecf709..627d59dc40ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java
index 0eb0826f87fb..4739648165fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/InstantiationException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/InstantiationException.java
index 1d37b213249d..f48af0ccb3df 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/InstantiationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/InstantiationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/NonAggregatedCompositeValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/NonAggregatedCompositeValuedPathInterpretation.java
index 2eb512065844..7a98b67236d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/NonAggregatedCompositeValuedPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/NonAggregatedCompositeValuedPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/PluralValuedSimplePathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/PluralValuedSimplePathInterpretation.java
index eb4f2c2592d3..22239edcba1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/PluralValuedSimplePathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/PluralValuedSimplePathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java
index 7e71f2b985fa..a69af6e70f44 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java
index 44cb50db33dc..ff7236c8014c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryPartProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryPartProcessingStateImpl.java
index 8ee18fa3ba13..a6071ecc88bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryPartProcessingStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryPartProcessingStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmMapEntryResult.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmMapEntryResult.java
index d914ddea2fcb..a9d3b1ad2638 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmMapEntryResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmMapEntryResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java
index c4fb775d729f..7c9d5a5fa6aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmPathInterpretation.java
index bfe8477aa2d0..130b41a27872 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmPathInterpretation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/StandardSqmTranslator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/StandardSqmTranslator.java
index 65347cbe2137..ad47605c5cfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/StandardSqmTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/StandardSqmTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
index d35526fc5be8..98aa50f5687c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmNode.java
index 4118364e1db0..df53bff46e80 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
index 84cbdcee4264..e9befcfcee7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
index fcf3b7409146..c451ac4bc19c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCopyContext.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCopyContext.java
index b57278264f01..86a15d044d30 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCopyContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmCopyContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDeleteOrUpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDeleteOrUpdateStatement.java
index b8eac0596134..3c5efb8b9d74 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDeleteOrUpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDeleteOrUpdateStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDmlStatement.java
index 21efa33d2b64..0a71ef1be689 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDmlStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmDmlStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmExpressibleAccessor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmExpressibleAccessor.java
index 6c4d64a9ca27..56e3aa67b97d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmExpressibleAccessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmExpressibleAccessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java
index b740d553016c..b9b45ac6f509 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmNode.java
index 2cdde430705b..554f3dac7a3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmQuery.java
index ae1010aa09ee..aaeebde17acf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmStatement.java
index 420ad9c70f1c..80eec3797468 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmTypedNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmTypedNode.java
index 8b6ac9c9dc6b..70bb4b2518d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmTypedNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmTypedNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmVisitableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmVisitableNode.java
index a4ff9a76450c..784af8ce22e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmVisitableNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmVisitableNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteContainer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteContainer.java
index 5297a574d27b..7da9716ede23 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
index 4601194730e0..3d556fb70ab7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java
index cbaafd48b326..50367af595d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.cte;
 
@@ -18,7 +16,6 @@
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.select.SqmSelectQuery;
-import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlSelection;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTableColumn.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTableColumn.java
index e7d5f4945e5f..6b556eb86f28 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTableColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTableColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java
index 0856280ea84b..ec6181441957 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmSearchClauseSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
index e7bbd827c9af..8792512df624 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.delete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java
index f1827326b4ae..c7871ea1212b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
index 1d25c8d88236..58f193d29b2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
index f13848ee47be..962d3cbedd92 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
index f7f050b451fe..e26fdf01ffce 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java
index 96f36b1eb690..5da285afe1de 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
index f0ad3c937fb3..07d17b03d251 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSpecificPluralPartPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSpecificPluralPartPath.java
index db1a8451fad7..454c3d73507d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSpecificPluralPartPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSpecificPluralPartPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
index 0b6ebfaf098f..c6dd7a087e8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.sqm.TreatException;
-import org.hibernate.query.sqm.produce.function.FunctionArgumentException;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.PathException;
 import org.hibernate.query.sqm.NodeBuilder;
@@ -88,5 +85,5 @@ public  SqmTreatedPath treatAs(Class treatJavaType, String
 	public  SqmTreatedPath treatAs(EntityDomainType treatTarget, String alias, boolean fetch) {
 		throw new TreatException( "Non-aggregate composite paths cannot be TREAT-ed" );
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
index a2997188a821..872a3cfbefa0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
index 2bc8d65d7a92..55a5efc27aae 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
index 0cbe86a6f013..caf70389110c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
index 5be2a68f4cb0..6ad24c1b5e43 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
index c840868f636d..457cfa042fbd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
index 7f86f21c07cb..05c9ea9347e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedJoin.java
index 3cf407433f07..d4e9705b512b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
index 56b60796ce80..54d40acd34b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
index 0b6de5d6cea8..33bde8a253ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
index 87e6ca3eb52d..8c46587c94ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
index 46b6a2e6cccc..b7da16437f3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
index 87ceaf079e12..5c37804d5523 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
index 00d49131e4d9..00c422cb9868 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
index 01177bbe590a..6407758776b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularValuedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularValuedJoin.java
index 65079fde1451..9d1ce6e55b20 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularValuedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularValuedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelation.java
index 7fefa651b133..054205c66d2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
index 0ab8f7479c4b..de07e9343fde 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
index 158b9a3a4a94..7188003893f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
index 7fb909d8fbf6..608678463a9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
index fec33a2d995f..906d11c590ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.TreatException;
-import org.hibernate.query.sqm.produce.function.FunctionArgumentException;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.type.descriptor.java.JavaType;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
index 913b8123fad4..4e9eb78e3aac 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
index 0755432253ba..1ec52c4ef5e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
index a87524336aad..0f8874f40e2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
index e33f9844e7f6..ff0124ba047b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
index 635abe1ec1b6..5150cc7ae40e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
index 7b8c25805afc..95ee8f5cec4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
index ec34c4807f6a..498e41c1cbec 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
index af27b7689b09..d77de586f33c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
index f57d326461fc..63369de6a830 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
@@ -11,7 +9,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.metamodel.MapAttribute;
 import jakarta.persistence.metamodel.PluralAttribute;
 import jakarta.persistence.metamodel.SingularAttribute;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPathWrapper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPathWrapper.java
index 01002be94fd5..e3c90a6163b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPathWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPathWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
index 7a5aeb5d1517..c5d71c5cd452 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
index cb0a1e0b5294..4d8c24e116d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java
index ba6a5d029ce3..765689d70c74 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
@@ -13,7 +11,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.function.Consumer;
 
 import static java.util.Collections.unmodifiableMap;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
index 108d42c07d74..75fcffad527a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSimplePath.java
index 97fa20179202..5e016726330d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
index 0aea46d9e9d7..76e8c63e7c86 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularValuedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularValuedJoin.java
index 8b5023586fc9..a9911ab564e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularValuedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularValuedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
index de3f541c48f7..aa065f5b77b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedCrossJoin.java
index 39325900c60a..e9f885f98a07 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedCrossJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
index f927e9ce6ac4..6b7ebf61da90 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
 import org.hibernate.metamodel.model.domain.EmbeddableDomainType;
-import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.hql.spi.SqmCreationState;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmPathSource;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
index 2ba8b136a293..8a3d0797b67f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
index fc68b00d01a9..bfe67d57108c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedFrom.java
index 341b657bbef1..4ccf93e6cf70 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedJoin.java
index 57eb4c17f761..8f1704b2d67d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
index 361b5a4120dd..3f18fb05c302 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
index 2242cad2c09d..c064d8314032 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPath.java
index d034ba1592ff..df18d2ae8e3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
index 5bdf5d4a2018..fee1cd07f08e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
index a92edc90c4db..e6f392fc7da9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
index 46580ea8b698..021267deea4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
index 871732155910..9db9c5d7df95 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
index 2ab2c9a0b101..51805b525af3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java
index 014c2b44ad46..6c56e14b9d5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
index 0167a0b61091..33a35f8b0d7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java
index d3be23caef20..ca6f66f5229e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AsWrapperSqmExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Compatibility.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Compatibility.java
index 689a3841fd75..d0394ae54caf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Compatibility.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Compatibility.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java
index 857642cefe20..27a139c45b0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java
index c198f9d69f26..89ee5cf734aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java
index b4a51568794b..a7dc78c508e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
index 0e91733e8a53..b9f644422ead 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAggregateFunction.java
index 3247c6038aff..a06fb1877a26 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAliasedNodeRef.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAliasedNodeRef.java
index 2562ede5b707..64ca8b68e549 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAliasedNodeRef.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAliasedNodeRef.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
index 87d6343ce649..1397bb9fb94a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
index b6dc3ec9c84d..1cad32036250 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
index dc80903ec5f2..b2cbdf75e5aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
@@ -14,7 +12,6 @@
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static org.hibernate.query.sqm.BinaryArithmeticOperator.ADD;
 import static org.hibernate.query.sqm.BinaryArithmeticOperator.SUBTRACT;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java
index 22a5173ee37f..a21ca1ff2855 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
index b70f102b7fbd..17aebe2a4a35 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
index 3eadc1ce8dfc..89ce82fefd11 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java
index cca7a7a3d098..5b2accedf235 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
index 9ffea6b339e8..a7695e78b3cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollation.java
index 789a1df7afe9..67a455a82a85 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollectionSize.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollectionSize.java
index dcf1268bccd1..979e58270694 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollectionSize.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCollectionSize.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
index 3f9a818ddd01..769cc6ee370d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java
index fd714b1667d4..eb8a1d3773c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
@@ -56,5 +54,3 @@ public void appendHqlString(StringBuilder sb) {
 		sb.append( unit );
 	}
 }
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
index cd8b4b6c6a5c..d4f35e3d3117 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
index d9e1e1c3656f..c65c9c80ddd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java
index d5938301cfe0..07a900be38a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
index 7a919ec5f293..6abea94a89ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java
index 285b1ed4c239..4784ef43761b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
@@ -56,5 +54,3 @@ public void appendHqlString(StringBuilder sb) {
 		sb.append( unit );
 	}
 }
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
index 917c79db7990..1d9e8673bce5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFormat.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFormat.java
index f9d4d11b071a..bc38d0b7bafc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFormat.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFormat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
index c7d9ce26c07d..3bf5a30b5e9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
index f27bae151b08..1f99e76f4ab4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
index 0dbdc0154e7c..a6da602650cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
index 4b6cda0387a8..737897c096c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
@@ -23,7 +21,7 @@
  *     
    • some.JavaEnum.VALUE
      • 
  *     
    • etc
      • 
  * 
    
- * 
+ *
  * @author Steve Ebersole
  */
 public class SqmLiteral extends AbstractSqmExpression {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
index 40c912bc7810..bad4f0f4f38d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
index 0954d2952fad..c0796ef36a8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
index 40e9225b1b91..988ddf6cad16 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
index eae6f1eec5f5..cb79ef0ccf2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
index 723961c1e893..5fe8d104ae67 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOrderedSetAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOrderedSetAggregateFunction.java
index e3a2d4e89a7b..f5ae4a07b9ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOrderedSetAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOrderedSetAggregateFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
index 0decadee7b56..5126edd72fa6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
index 99e25ef35076..dde085641330 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameter.java
index d91e03ba58b1..800df60da250 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
index a2f16cfc9e73..c94f1ac3d98c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
index 81600f883a24..c7a0d69cf8ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
index 122f0bde0df0..42893d6869cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmStar.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmStar.java
index 0aa35a275c95..35d99465442c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmStar.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmStar.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
index 777061919fab..64777fe4da4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
index 26e365534b91..e5e06077f080 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
@@ -72,5 +70,3 @@ public void appendHqlString(StringBuilder sb) {
 		sb.append( unit.getUnit() );
 	}
 }
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTrimSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTrimSpecification.java
index 549b208edf96..4bb1a1e739a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTrimSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTrimSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
index 57502bc223c2..bd1c8ac7b027 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
index ba626e6d0a7f..d41f52564039 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
-import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.UnaryArithmeticOperator;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java
index 576dc4738dd3..0ee8be5f535f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindow.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java
index b335f2f46b57..7ae0783a15c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFrame.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFunction.java
index c351dbcc522a..8097ccdb1373 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmWindowFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
index 395741dbd6b6..644f9853bd75 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/DowncastLocation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/DowncastLocation.java
index 895739aef7ea..4fba904594c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/DowncastLocation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/DowncastLocation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmAttributeJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmAttributeJoin.java
index 77fbbddd03c2..5b228817de18 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmAttributeJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmAttributeJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
index e38ca31807cf..6edc0d904634 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
index 5b29a091a307..7dedb0cca43f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
index afcb944e0ec8..46269fa000c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
index 102adb999605..33e43e72d0a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java
index 0e06c6f7e3e2..76bcdaa120eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClause.java
index f453e67b0887..f409736718a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClauseContainer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClauseContainer.java
index 28a05d122c57..7193023de769 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClauseContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFromClauseContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java
index e02c5d7dd095..634674e2859e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
index c5f7f28776d9..af8f3a9672ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
@@ -13,7 +11,6 @@
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.sqm.TreatException;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedFrom;
-import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.PathException;
 import org.hibernate.query.criteria.JpaRoot;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmTreatedAttributeJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmTreatedAttributeJoin.java
index 65f44d327c5c..67c561e05345 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmTreatedAttributeJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmTreatedAttributeJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/AbstractSqmInsertStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/AbstractSqmInsertStatement.java
index df91cff68a0b..81c01754989e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/AbstractSqmInsertStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/AbstractSqmInsertStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
@@ -14,7 +12,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.criteria.JpaConflictClause;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
index 547e03d94d6c..f8826cc2193f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
index ebf93008ba20..c1b71b847233 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
index dc596c011772..88510e6bdb83 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertStatement.java
index 7aba91cb4b01..9efe3876e897 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
index 27056c4d393d..8433acca594c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmValues.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmValues.java
index 70365defaef6..bb9c058ac833 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaSelection.java
index 2b27869ec8f4..49e814d387ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaTupleElement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaTupleElement.java
index 3d9a2607c90e..4136acc5537b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaTupleElement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/AbstractJpaTupleElement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
index f2d04eaca227..152f67c2f610 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.jpa;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractNegatableSqmPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractNegatableSqmPredicate.java
index 6dd467bde9eb..5067c87ed19c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractNegatableSqmPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractNegatableSqmPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java
index 16ba1a5ff3d8..27d88037fc50 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBetweenPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBetweenPredicate.java
index ad32ec85bde7..6165ea9ec140 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBetweenPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBetweenPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java
index aa77091c80aa..0beca4e04dcf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmComparisonPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmComparisonPredicate.java
index 3b8830480264..b5c6c5636533 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmComparisonPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmComparisonPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmEmptinessPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmEmptinessPredicate.java
index 9c5554c8cdda..c28c42d6b70e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmEmptinessPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmEmptinessPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmExistsPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmExistsPredicate.java
index d8710906a5fe..554b809d23c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmExistsPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmExistsPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java
index 0ae9a64ef67e..4aa0caa4d1cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
index 9b591ec49f27..798d5a2b2e68 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInPredicate.java
index 09f7598c594a..4571221ca949 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
index 571cfed1fb4d..4768cd65e759 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmJunctionPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmJunctionPredicate.java
index b36d4fcd2313..a9381e4ba26d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmJunctionPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmJunctionPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmLikePredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmLikePredicate.java
index 7f6f38e37d74..d748c8607b9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmLikePredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmLikePredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmMemberOfPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmMemberOfPredicate.java
index fa10ab3661d0..788207c82f00 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmMemberOfPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmMemberOfPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatablePredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatablePredicate.java
index 83a902f583ab..ec222a5aad25 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatablePredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatablePredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java
index 57e1a9cf936b..3368df71f31f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNullnessPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNullnessPredicate.java
index d8607a95467d..64789cc63e7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNullnessPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNullnessPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicate.java
index b56dfba10e27..dd1c66a30a4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicateCollection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicateCollection.java
index 8352d877b7d8..422579e6282a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicateCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmPredicateCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmTruthnessPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmTruthnessPredicate.java
index c48a5a9178cb..dba0583a1c76 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmTruthnessPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmTruthnessPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClause.java
index a3fd1dfe82af..4181352f907d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClauseContainer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClauseContainer.java
index 807bcabf3423..8ab58d287817 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClauseContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmWhereClauseContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
index 05cc41b5580b..53ebc748bdb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedExpressionContainer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedExpressionContainer.java
index 2d7b9f94eafb..585664dcabd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedExpressionContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedExpressionContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java
index e164b3c53561..dafada706b0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
index 0f531a2ca666..5418070855a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationArgument.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationArgument.java
index f286e40cdb10..640e956fb780 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationArgument.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationArgument.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java
index f93547b59a39..9a1a428385bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
index c5fbb5ff16e2..cef43e909df8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmOrderByClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmOrderByClause.java
index adb5301a63d5..6319ddfefe57 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmOrderByClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmOrderByClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
index f90c532e59b7..445de1cb4c5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java
index 230ca8cf1eb6..8c7b69b6b940 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
index 512e4de37b66..bb663d8a624f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java
index 324ccef9b6ba..1383612685c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectQuery.java
index 94428ace84f9..826abc1cda0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
index 6bb0f72a5a71..e8bae90fffa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
index a8da9a186005..310b73ca845f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java
index 16432dbafd67..4de8dc98aaf9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java
index 603b523efb3b..2d28925d885b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSortSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
index 8c35e882915d..1054896721ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmAssignment.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmAssignment.java
index a9d429bfa74f..4ed9ce938bf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmAssignment.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmAssignment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmSetClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmSetClause.java
index c8848244665f..dd2e40384d0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmSetClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmSetClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
index 8c0217853b19..908838d5a35b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.query.sqm.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
index 0c16161a0fcb..4825c5f506f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.relational;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java b/hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java
index 9a41847b31ce..baa501551887 100644
--- a/hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/relational/internal/SchemaManagerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.relational.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java
index 7ed909c3001c..f455c9155014 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java
index ed4535d1d203..c0eedf902feb 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java
index d7f1603a0b19..fc9045a6b6d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
@@ -31,8 +29,8 @@ public BeanManager getUsableBeanManager() {
 
 	@Override
 	protected  ContainedBeanImplementor createBean(
-			Class beanType, 
-			BeanLifecycleStrategy lifecycleStrategy, 
+			Class beanType,
+			BeanLifecycleStrategy lifecycleStrategy,
 			BeanInstanceProducer fallbackProducer) {
 		return new BeanImpl<>( beanType, lifecycleStrategy, fallbackProducer );
 	}
@@ -55,7 +53,7 @@ private class BeanImpl implements ContainedBeanImplementor {
 
 		private BeanImpl(
 				Class beanType,
-				BeanLifecycleStrategy lifecycleStrategy, 
+				BeanLifecycleStrategy lifecycleStrategy,
 				BeanInstanceProducer fallbackProducer) {
 			this.beanType = beanType;
 			this.lifecycleStrategy = lifecycleStrategy;
@@ -94,7 +92,7 @@ private class NamedBeanImpl implements ContainedBeanImplementor {
 		private NamedBeanImpl(
 				String name,
 				Class beanType,
-				BeanLifecycleStrategy lifecycleStrategy, 
+				BeanLifecycleStrategy lifecycleStrategy,
 				BeanInstanceProducer fallbackProducer) {
 			this.name = name;
 			this.beanType = beanType;
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java
index d7ff9713c8bc..3437c8296d27 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
@@ -145,7 +143,7 @@ private class NamedBeanImpl implements ContainedBeanImplementor {
 		private NamedBeanImpl(
 				String name,
 				Class beanType,
-				BeanLifecycleStrategy lifecycleStrategy, 
+				BeanLifecycleStrategy lifecycleStrategy,
 				BeanInstanceProducer fallbackProducer) {
 			this.name = name;
 			this.beanType = beanType;
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java
index 904d88e3b908..bb58944e4643 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java
index 50f4acee8eac..b0203d39c68f 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java
index 63f745796707..729ead08c3eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java
index 0b1b4def7e79..6e919654517b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java
index f7fab74213ab..d51e28d3751a 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NotYetReadyException.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NotYetReadyException.java
index 7867e957ff93..d0d821d82351 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NotYetReadyException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NotYetReadyException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/AbstractCdiBeanContainer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/AbstractCdiBeanContainer.java
index 9fe34fe11440..3d7b63e320f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/AbstractCdiBeanContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/AbstractCdiBeanContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanContainer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanContainer.java
index 26274dd9d432..836726dfed7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanLifecycleStrategy.java
index 117e0b034600..978029681a71 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanLifecycleStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/BeanLifecycleStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBean.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBean.java
index f4eb5cf1ee4a..99df240d7ebf 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBean.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBeanImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBeanImplementor.java
index 66428d9b5e76..7cf2f5f34d53 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBeanImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBeanImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java
index ac20806eb034..fdf3ace2f435 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/FallbackContainedBean.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/FallbackContainedBean.java
index 294a8ce84c78..b5f301afb541 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/FallbackContainedBean.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/FallbackContainedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.container.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
index e04b7a9212ef..83b9c8e8364b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/FallbackBeanInstanceProducer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/FallbackBeanInstanceProducer.java
index 0faffa65656d..e325fb787d5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/FallbackBeanInstanceProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/FallbackBeanInstanceProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java
index e59e93cf0773..0ad1b0bd735e 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java
index d57f5f95c8b3..0e6834c9b588 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/BeanInstanceProducer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/BeanInstanceProducer.java
index d10a93a1e5ad..d3563254a4ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/BeanInstanceProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/BeanInstanceProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBean.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBean.java
index 075d168ae516..9b9e64e4aa06 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBean.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistry.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistry.java
index 501d937f202f..1e563c94ca8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java
index 06b997f8200d..37546bb64ed4 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ProvidedInstanceManagedBeanImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ProvidedInstanceManagedBeanImpl.java
index ec608e764a10..13a82274c0dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ProvidedInstanceManagedBeanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ProvidedInstanceManagedBeanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.beans.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/LogicalConnection.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/LogicalConnection.java
index a2d3dcd030a7..6387fb5560df 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/LogicalConnection.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/LogicalConnection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/ResourceRegistry.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/ResourceRegistry.java
index 91cc3ed7f06d..7e3b91354abd 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/ResourceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/ResourceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
index 9da3578a7eed..5198021bff83 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/EmptyStatementInspector.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/EmptyStatementInspector.java
index 58f3c9434a56..8e33c173faee 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/EmptyStatementInspector.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/EmptyStatementInspector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
index 67e103c9d273..943672d4d217 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
index b65e3371e512..67dbc1c72c4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryStandardImpl.java
index b1170b14c2d8..32e6c24a9363 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcEventHandler.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcEventHandler.java
index bf6cf043926d..a8317b70463f 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcEventHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcEventHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionContext.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionContext.java
index 09b138d6b2f8..a88aaf16b5c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java
index b94b04d96c36..249d62624d62 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
index 90852f81b415..fd0fb3846801 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java
index 1b0f609714ac..9c3a126161df 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalJdbcTransaction.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalJdbcTransaction.java
index 0eab942ea529..8acb949fb247 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalJdbcTransaction.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalJdbcTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/StatementInspector.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/StatementInspector.java
index 83ecf4c21a89..695fe58c235c 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/StatementInspector.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/StatementInspector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/LocalSynchronizationException.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/LocalSynchronizationException.java
index c87ff9c60ba3..d131a9295688 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/LocalSynchronizationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/LocalSynchronizationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/NullSynchronizationException.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/NullSynchronizationException.java
index a613b8a3a843..b78ce3ee030f 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/NullSynchronizationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/NullSynchronizationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/TransactionRequiredForJoinException.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/TransactionRequiredForJoinException.java
index 21f70a0bf60b..8f5eba5d5364 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/TransactionRequiredForJoinException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/TransactionRequiredForJoinException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/DdlTransactionIsolatorNonJtaImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/DdlTransactionIsolatorNonJtaImpl.java
index 3f2fe956e29d..a86bc8def41a 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/DdlTransactionIsolatorNonJtaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/DdlTransactionIsolatorNonJtaImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java
index fe5a175fdfed..24a1c7c7ede7 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorBuilderImpl.java
index 3cd9f5cdabdf..b6166811bdbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
index 656f56a227f6..5c0ac4a345a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
index 819a4a2bd563..2d22d4acb85a 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransactionAccess.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransactionAccess.java
index c415c2cb4eb9..3c492d8599df 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransactionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransactionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
index eea868e8a22b..e05c2b9443b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
index 51c1e3f80cd5..8c0012d961ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
@@ -21,7 +19,6 @@
 import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.exception.internal.SQLStateConversionDelegate;
-import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
 import org.hibernate.resource.transaction.spi.IsolationDelegate;
 import org.hibernate.internal.CoreLogging;
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java
index 8d57709dd15c..afc841e74e29 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
index 57a77f7ab30a..03f607af81a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java
index 7f64f6e57b95..ab908c15e569 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java
index ea8363dc0e3b..ffbfe36fa082 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorBuilderImpl.java
index 67fd693cd68d..373daeae5b02 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java
index cbc84fd63f08..e2deb02feefb 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java
index a0178df21f73..7ded72256502 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java
index 069af547639a..21bfff033f75 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java
index 694ef2e0578b..123c1e3ab4b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java
index ee39a47e9552..212dc8f966bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java
index 91086f5cdf40..a8be83ca2a26 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
@@ -12,7 +10,7 @@
 
 /**
  * Manages callbacks from the {@link jakarta.transaction.Synchronization} registered by Hibernate.
- * 
+ *
  * @author Steve Ebersole
  */
 public class SynchronizationCallbackCoordinatorNonTrackingImpl implements SynchronizationCallbackCoordinator {
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorTrackingImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorTrackingImpl.java
index 0716518c2d3b..fb6a4089d3bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorTrackingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorTrackingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java
index cddf5c55bafd..ec605ec0c14a 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.backend.jta.internal.synchronization;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java
index adf70948d202..f9ec74d6049b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java
index 507df02e9fe6..6a3c0a690d44 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/TransactionCoordinatorBuilderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/DdlTransactionIsolator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/DdlTransactionIsolator.java
index 271d30b67052..99cfdb1cb968 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/DdlTransactionIsolator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/DdlTransactionIsolator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/IsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/IsolationDelegate.java
index 06d3db04f8ce..87726eefddf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/IsolationDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/IsolationDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java
index 7a95c9074807..236ce7385c7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java
index 2db00f0dd8c6..157fc57bcf8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
index 9107a8df666a..946c9fefb6b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorBuilder.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorBuilder.java
index 5d01b588916c..23b4ade5dd17 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorOwner.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorOwner.java
index a1560fd00b85..b78bbf763b32 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorOwner.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinatorOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionObserver.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionObserver.java
index 9942760bfb77..108396adf494 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionStatus.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionStatus.java
index 6853878bd1a0..7bda41f5029d 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionStatus.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionStatus.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.resource.transaction.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/NoMoreReturnsException.java b/hibernate-core/src/main/java/org/hibernate/result/NoMoreReturnsException.java
index c09e8e95058d..888944bc2e33 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/NoMoreReturnsException.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/NoMoreReturnsException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/Output.java b/hibernate-core/src/main/java/org/hibernate/result/Output.java
index b5a9869a892d..49a68a704acf 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/Output.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/Output.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/Outputs.java b/hibernate-core/src/main/java/org/hibernate/result/Outputs.java
index 482a9776f279..a20f662d19cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/Outputs.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/Outputs.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/ResultSetOutput.java b/hibernate-core/src/main/java/org/hibernate/result/ResultSetOutput.java
index 6f6fc7d28af5..2c33af5f2e01 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/ResultSetOutput.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/ResultSetOutput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/UpdateCountOutput.java b/hibernate-core/src/main/java/org/hibernate/result/UpdateCountOutput.java
index f8bf81b4820a..955884954600 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/UpdateCountOutput.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/UpdateCountOutput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsExecutionContext.java
index a68caadecd16..cb2baf683c74 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsExecutionContext.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result.internal;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.CallbackImpl;
 import org.hibernate.sql.exec.spi.Callback;
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
index 51285b571d4a..597979fd93fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result.internal;
 
@@ -22,8 +20,6 @@
 import org.hibernate.event.spi.HibernateMonitoringEvent;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.procedure.internal.ProcedureCallImpl;
-import org.hibernate.procedure.internal.ScalarDomainResultBuilder;
-import org.hibernate.query.procedure.ProcedureParameter;
 import org.hibernate.query.results.ResultSetMapping;
 import org.hibernate.result.Output;
 import org.hibernate.result.Outputs;
@@ -39,12 +35,9 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
 import org.hibernate.sql.results.spi.RowReader;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 
 import org.jboss.logging.Logger;
 
-import jakarta.persistence.ParameterMode;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java
index 5f87cd44926f..5b5afba5f78b 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/UpdateCountOutputImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/UpdateCountOutputImpl.java
index 9a4f9082fe6c..277cbdae6096 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/internal/UpdateCountOutputImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/internal/UpdateCountOutputImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/result/spi/ResultContext.java b/hibernate-core/src/main/java/org/hibernate/result/spi/ResultContext.java
index d816dea18188..3f49ecc4e781 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/spi/ResultContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/spi/ResultContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.result.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/JavaServiceLoadable.java b/hibernate-core/src/main/java/org/hibernate/service/JavaServiceLoadable.java
index 87dc6fb9a7df..b000f784cf81 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/JavaServiceLoadable.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/JavaServiceLoadable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/NullServiceException.java b/hibernate-core/src/main/java/org/hibernate/service/NullServiceException.java
index 9b0429e059fc..2150d57ad751 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/NullServiceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/NullServiceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/Service.java b/hibernate-core/src/main/java/org/hibernate/service/Service.java
index b19195e794b5..8a367f601c64 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/Service.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/Service.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
index 85c1974e4f58..a50c631f0c3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
@@ -26,7 +24,7 @@
 public interface ServiceRegistry extends AutoCloseable {
 	/**
 	 * Retrieve this registry's parent registry.
-	 * 
+	 *
 	 * @return The parent registry.  May be null.
 	 */
 	@Nullable ServiceRegistry getParentServiceRegistry();
@@ -39,7 +37,7 @@ public interface ServiceRegistry extends AutoCloseable {
 	 * less likely to cause a {@link NullPointerException} in the client.
 	 *
 	 * @apiNote We cannot return {@code >} here because the service might come from the parent.
-	 * 
+	 *
 	 * @param serviceRole The service role
 	 * @param  The service role type
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
index 66b77f62bf6a..e7d7fccd508c 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
@@ -46,7 +44,7 @@
 
 /**
  * Central definition of the standard set of service initiators defined by Hibernate.
- * 
+ *
  * @author Steve Ebersole
  */
 public final class StandardServiceInitiators {
diff --git a/hibernate-core/src/main/java/org/hibernate/service/UnknownServiceException.java b/hibernate-core/src/main/java/org/hibernate/service/UnknownServiceException.java
index 160c89d67b9b..b471c9b1a421 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/UnknownServiceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/UnknownServiceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 import org.hibernate.service.spi.ServiceException;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/UnknownUnwrapTypeException.java b/hibernate-core/src/main/java/org/hibernate/service/UnknownUnwrapTypeException.java
index 5be5db34e9e0..163938831a3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/UnknownUnwrapTypeException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/UnknownUnwrapTypeException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
index aaca3c5ac117..e7f0c0248633 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ProvidedService.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ProvidedService.java
index a0fc245e11f3..80d4977b2884 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/ProvidedService.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ProvidedService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceDependencyException.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceDependencyException.java
index 49ce8281a4ec..486721030bbb 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceDependencyException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceDependencyException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxyGenerationException.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxyGenerationException.java
index 7a94056eaa3d..417b76cf837c 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxyGenerationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxyGenerationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
@@ -10,7 +8,7 @@
 
 /**
  * Indicates a problem generating a service proxy
- * 
+ *
  * @author Steve Ebersole
  */
 public class ServiceProxyGenerationException extends HibernateException {
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryBuilderImpl.java
index be1a183f007d..9c809d7f84f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
index 70093f9b66bd..9a43faff002f 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
index 12426e146e88..c011a1034455 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java
index f38090af68d9..7229782d2f9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java
index 7917bcf61e28..7b5c7dfb72f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/Configurable.java b/hibernate-core/src/main/java/org/hibernate/service/spi/Configurable.java
index 51c38a683a91..ad05891c15fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/Configurable.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/Configurable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/InjectService.java b/hibernate-core/src/main/java/org/hibernate/service/spi/InjectService.java
index 7ce9a75f564f..487a2086b150 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/InjectService.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/InjectService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 import java.lang.annotation.Retention;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
index 0afb4f46b87e..8d0b2b72e739 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
index 358dc7249e30..3ad064a381fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceException.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceException.java
index daee9aa2fe83..72249cfc4b83 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java
index 8f9bc4916acd..317e53c844e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java
index eda83d23b9db..0a34dfb05dba 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java
index 9e819021d690..1be79d8f7f19 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceContributor.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceContributor.java
index 3ebcbe7b92c4..79a8800a2575 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java
index 7019932b9a6b..506d22cfab01 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiatorContext.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiatorContext.java
index c525a43c06bf..989b4cf7d787 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiatorContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiatorContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistry.java
index fb66694e7565..d446a5168c7b 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryBuilder.java
index 970a956b2aa6..4f9aa15e49e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java
index 7202b5342113..adab7aab13eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/Startable.java b/hibernate-core/src/main/java/org/hibernate/service/spi/Startable.java
index 227a0803bbc6..e504ce846c84 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/Startable.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/Startable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/Stoppable.java b/hibernate-core/src/main/java/org/hibernate/service/spi/Stoppable.java
index 6c815399a51f..97192536b04d 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/Stoppable.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/Stoppable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java b/hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java
index 23ef2f2c4de1..97b270f5ff6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.service.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/spi/DotIdentifierSequence.java b/hibernate-core/src/main/java/org/hibernate/spi/DotIdentifierSequence.java
index 0d2576826f93..90614461b325 100644
--- a/hibernate-core/src/main/java/org/hibernate/spi/DotIdentifierSequence.java
+++ b/hibernate-core/src/main/java/org/hibernate/spi/DotIdentifierSequence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/spi/EntityIdentifierNavigablePath.java b/hibernate-core/src/main/java/org/hibernate/spi/EntityIdentifierNavigablePath.java
index 3a005c0475db..1312c69039be 100644
--- a/hibernate-core/src/main/java/org/hibernate/spi/EntityIdentifierNavigablePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/spi/EntityIdentifierNavigablePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java b/hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java
index 1a22b09f169c..8f9826c24746 100644
--- a/hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java b/hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java
index 3b2897732826..9315860b38c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Alias.java b/hibernate-core/src/main/java/org/hibernate/sql/Alias.java
index 2d6b29fb493e..b8b53ad12f1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Alias.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 import org.hibernate.dialect.Dialect;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ComparisonRestriction.java b/hibernate-core/src/main/java/org/hibernate/sql/ComparisonRestriction.java
index 13354d3e1e9f..de2f0d56d241 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ComparisonRestriction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ComparisonRestriction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java b/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java
index 4a60fd9822ba..b71073155a55 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Delete.java b/hibernate-core/src/main/java/org/hibernate/sql/Delete.java
index 60a55c4b5507..bc00167d7021 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Delete.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Delete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java
index 404210c41889..6f034a20d8f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java
index b2f892ee435f..5a17b2ab83c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Insert.java b/hibernate-core/src/main/java/org/hibernate/sql/Insert.java
index 8d303f7dbe1c..e4dbd7d7bd7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Insert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Insert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/NullnessRestriction.java b/hibernate-core/src/main/java/org/hibernate/sql/NullnessRestriction.java
index e538f5bd9dad..b8a1dc581924 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/NullnessRestriction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/NullnessRestriction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Restriction.java b/hibernate-core/src/main/java/org/hibernate/sql/Restriction.java
index 6c1a1d473518..22ba0d3eb1dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Restriction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Restriction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/RestrictionRenderingContext.java b/hibernate-core/src/main/java/org/hibernate/sql/RestrictionRenderingContext.java
index 049314185f80..a2d432d05a66 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/RestrictionRenderingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/RestrictionRenderingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
index ab0cd40dc7bc..4b12127d5c08 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Template.java b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
index 00691092ec1f..2be9d04f1cb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Template.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Update.java b/hibernate-core/src/main/java/org/hibernate/sql/Update.java
index 950a7c71e450..38fe7e62c6d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Update.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Update.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/Clause.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/Clause.java
index 7171a0e14286..ccfda72b1ad6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/Clause.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/Clause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstJoinType.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstJoinType.java
index ba8d1220ae48..c7e88c366325 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstJoinType.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstJoinType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java
index bdf86ed09578..f6933f27bfd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
@@ -17,9 +15,9 @@
  * Another example is a function that renders a function argument into a subquery select and group by item.
  * It can use {@link #INLINE_PARAMETERS} so that a database can match such a select item to a group by item.
  * Without this, such queries would result in a query error.
- * 
+ *
  * @author Christian Beikov
- * @see SqlAstTranslator#render(SqlAstNode, SqlAstNodeRenderingMode) 
+ * @see SqlAstTranslator#render(SqlAstNode, SqlAstNodeRenderingMode)
  */
 public enum SqlAstNodeRenderingMode {
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java
index d81e3914e1e3..e9e65e76f2aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
index 457b15030cc5..366eaea4b40f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java
index 75e0fcbc98c3..cd4c0ada1fce 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstWalker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationException.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationException.java
index 786e5c28d682..8cc6f6abb122 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationLogger.java
index 744576aa5bf8..5edc63e180a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreeCreationLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java
index b57c21429053..dc68d35e1730 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlTreePrinter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java
index 8f3473dc90a1..e6164526e2f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyStandard.java
index 422f747c0136..db7496e8577a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupHelper.java
index 06567a2c02b8..30b4d3b072ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupHelper.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.internal;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupJoinHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupJoinHelper.java
index ae08030149ac..0ac642802437 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupJoinHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TableGroupJoinHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
index 35209b7bf23b..4119f82ac23d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java
index 5f729381c2d5..e558132fd760 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.spi;
 
 import org.hibernate.persister.internal.SqlFragmentPredicate;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
index 2edb1217eb37..7cd580d275b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.spi;
 
 import org.hibernate.query.sqm.tree.expression.Conversion;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java
index 406b4bec6d91..607d49abc58f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java
@@ -1,23 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.spi;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.hibernate.sql.ast.tree.SqlAstNode;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.FunctionTableReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.from.ValuesTableReference;
-import org.hibernate.sql.ast.tree.insert.Values;
 
 /**
  * A simple walker that checks for aggregate functions.
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java
index 8c1edad76e65..e423720680a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ExpressionReplacementWalker.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.spi;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FromClauseAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FromClauseAccess.java
index a31a1d93f089..f3eaa519078b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FromClauseAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FromClauseAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
index a157b3d08d4e..a23f0d71d3ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SimpleFromClauseAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SimpleFromClauseAccessImpl.java
index d6917a2df418..e54a7cc6d396 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SimpleFromClauseAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SimpleFromClauseAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBase.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBase.java
index 7564c9725cc2..425ef7c7bc4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBase.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseConstant.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseConstant.java
index 30491a5b59ee..b2ecea29aefd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseConstant.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseConstant.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseGenerator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseGenerator.java
index 5e2f2494bec9..e87a5cfaa1d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseImpl.java
index b3b72a845757..a2f4d22c4e6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseManager.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseManager.java
index dc09d878a5aa..f419132db5a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasBaseManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasStemHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasStemHelper.java
index 3a0c45723475..b8dbcf831bf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasStemHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAliasStemHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAppender.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAppender.java
index f6797cc15e19..14ea197660cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAppender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java
index 0f2acf53c5ec..6f4250c86892 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationState.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationState.java
index 4ae6d801e270..7c32e8d192d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstCreationState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstProcessingState.java
index 01b22f3a601f..8444146842c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryNodeProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryNodeProcessingState.java
index ef564c649479..d445bd752218 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryNodeProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryNodeProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryPartProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryPartProcessingState.java
index 4b235578a928..e47de42152f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryPartProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstQueryPartProcessingState.java
@@ -1,16 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
-import java.util.Map;
 
-import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.query.sqm.tree.from.SqmFrom;
-import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTreeHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTreeHelper.java
index a9de1469010f..b7dbf5b53ad3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTreeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTreeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionAccess.java
index 1f743bedefb3..a3a3d387f702 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionResolver.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionResolver.java
index 24df6feecb23..b52df9099747 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlExpressionResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
@@ -14,7 +12,6 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.NestedColumnReference;
-import org.hibernate.sql.ast.tree.from.EmbeddableFunctionTableReference;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.type.NullType;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
index 0740695e8d50..72411c2e9155 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java
index d6768c89c349..b528cea4bf30 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java
index ca16a3c3dc09..a1b2c2ded0e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
index 1e907d08ddbc..a76f7444ed67 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StringBuilderSqlAppender.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StringBuilderSqlAppender.java
index 84c217835476..ef2d4e4ff4c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StringBuilderSqlAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StringBuilderSqlAppender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
index b24fde9fc7d3..51b77c33533f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractStatement.java
index 72f940d588b5..6e91f6fbae52 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
index c88426c9f397..5239de5096d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
index 9f13db25b14a..967d4783ba2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstNode.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstNode.java
index 59cfcde5cb9e..1cfe482d0880 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
index 869163c4940d..376f6ec55697 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
 import org.hibernate.internal.log.SubSystemLogging;
-import org.hibernate.sql.ast.SqlTreeCreationLogger;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
index 519bef84e92f..237b1a23ab7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteColumn.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteColumn.java
index cfad01506404..7e8440eb4f30 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteContainer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteContainer.java
index cc210fbd3565..f677f1da4757 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteMaterialization.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteMaterialization.java
index 45c48cfdb77e..056c46722b9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteMaterialization.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteMaterialization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteObject.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteObject.java
index 870caafcf530..852befe89db1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java
index c31c049d1ae4..802593f39d20 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteSearchClauseKind.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java
index 8344c255653d..d4f8c33f047c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
index fc1de86b86ae..f5712cc7091e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java
index dce5b2c8f81c..8e1c1ff6db60 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java
index d38b478a0b83..0cf40ad230cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SearchClauseSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SelfRenderingCteObject.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SelfRenderingCteObject.java
index 3569442698fa..5a960c2f962b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SelfRenderingCteObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/SelfRenderingCteObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.cte;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
index a65fe45a9e1a..17180bd77a8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.delete;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateColumnWriteExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateColumnWriteExpression.java
index 452cd972506e..24c09858ddda 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateColumnWriteExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateColumnWriteExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateFunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateFunctionExpression.java
index 1e7b83099244..a2bed68a43d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateFunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AggregateFunctionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AliasedExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AliasedExpression.java
index f97ce1be1355..c685736002c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AliasedExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AliasedExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Any.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Any.java
index a809b7648f78..f3efc3b14171 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Any.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Any.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
@@ -12,12 +10,10 @@
 import org.hibernate.sql.ast.SqlAstWalker;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
-import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * @author Gavin King
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java
index 4d52f2f9e38b..1aed1ab38a70 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java
index 2b6f436fe11e..2416f15e866d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.tree.expression;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSimpleExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSimpleExpression.java
index a75c1c070581..0daaf2e7a317 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSimpleExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSimpleExpression.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.tree.expression;
 
 import java.io.Serializable;
@@ -20,7 +17,6 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CastTarget.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CastTarget.java
index 7c4b2f334afb..f39b1e92adc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CastTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CastTarget.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
-import org.hibernate.engine.jdbc.Size;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Collation.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Collation.java
index 1aa746c1b412..9ef3b57fcca0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Collation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Collation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java
index c282d8d0c864..b4770f84864b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Distinct.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Distinct.java
index 3c0b28ae429d..e3e9d5dc18b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Distinct.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Distinct.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java
index 600e6f5d171d..ed0ed1f38a63 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java
index 3b27ecf8021b..d1ac619d4a8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
@@ -44,4 +42,3 @@ public void accept(SqlAstWalker sqlTreeWalker) {
 		sqlTreeWalker.visitDurationUnit(this);
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EmbeddableTypeLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EmbeddableTypeLiteral.java
index 4a21443d9511..5a2f60e37372 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EmbeddableTypeLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EmbeddableTypeLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java
index a127cb8fb553..ceb0f203ffb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
@@ -22,7 +20,6 @@
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.java.JavaTypedExpressible;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Every.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Every.java
index c199ff7155b2..b7736279f137 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Every.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Every.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
@@ -12,12 +10,10 @@
 import org.hibernate.sql.ast.SqlAstWalker;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
-import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * @author Gavin King
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Expression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Expression.java
index d56f9677eab3..19aff7a545c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Expression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Expression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java
index 97229db7104d..01baaaa0bbab 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
@@ -43,4 +41,3 @@ public void accept(SqlAstWalker sqlTreeWalker) {
 		sqlTreeWalker.visitExtractUnit( this );
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Format.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Format.java
index df446a9e65d1..ff6ff71e0de7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Format.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Format.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/FunctionExpression.java
index d1f9c46c46a3..6d5d2e60222e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/FunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/FunctionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java
index 16a7f11dad7b..3b90dfe13079 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcParameter.java
index 23f8c9f3777f..d276806cea64 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Literal.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Literal.java
index 039859aab268..3bd9aae1eea9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Literal.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Literal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/LiteralAsParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/LiteralAsParameter.java
index 39385d464abb..3631a63c6b2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/LiteralAsParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/LiteralAsParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ModifiedSubQueryExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ModifiedSubQueryExpression.java
index bf928f7ef0bb..40419140692a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ModifiedSubQueryExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ModifiedSubQueryExpression.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.sql.ast.SqlAstWalker;
-import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/NestedColumnReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/NestedColumnReference.java
index 63249c7f529f..a58dde781271 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/NestedColumnReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/NestedColumnReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/OrderedSetAggregateFunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/OrderedSetAggregateFunctionExpression.java
index c533808d9c72..7ae689216ffc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/OrderedSetAggregateFunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/OrderedSetAggregateFunctionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Over.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Over.java
index 13d4c435ec34..6f065388b461 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Over.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Over.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Overflow.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Overflow.java
index 468723287098..cb184f53fb6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Overflow.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Overflow.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java
index 3e70d4698ef9..18244b7aa828 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryTransformer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryTransformer.java
index 385487869d80..34712a513cdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingExpression.java
index ea7c7463926d..573ce0fb3abb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingSqlFragmentExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingSqlFragmentExpression.java
index 1d19120f7349..6c91092052ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingSqlFragmentExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SelfRenderingSqlFragmentExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlSelectionExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlSelectionExpression.java
index 5a9c685dca02..321458dbf73b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlSelectionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlSelectionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTuple.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTuple.java
index 7545b71fe7a6..211b4abf5624 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTuple.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTuple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTupleContainer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTupleContainer.java
index ef60b1da8234..08789d87eac7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTupleContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/SqlTupleContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Star.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Star.java
index b0112e959cf5..148f033cac00 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Star.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Star.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Summarization.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Summarization.java
index 1113089909fd..47eb02c3137a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Summarization.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Summarization.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/TrimSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/TrimSpecification.java
index 0058f02e0db2..fe10e6af1267 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/TrimSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/TrimSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java
index 31ff474fc2b2..1c7e5e93d281 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.tree.expression;
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
index ea849d43a6cc..ff1d2190bca1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/WindowFunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/WindowFunctionExpression.java
index 41ff8549e024..a3b7ef44fd9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/WindowFunctionExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/WindowFunctionExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.expression;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractColumnReferenceQualifier.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractColumnReferenceQualifier.java
index 87fb4cf6f290..cce5b3915688 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractColumnReferenceQualifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractColumnReferenceQualifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableGroup.java
index cf25b1512d67..597eebe71a78 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableReference.java
index bfb4d372e49d..5cf6866949ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AbstractTableReference.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.ast.tree.from;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CollectionTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CollectionTableGroup.java
index acd3bbb87666..482c1b2aac70 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CollectionTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CollectionTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ColumnReferenceQualifier.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ColumnReferenceQualifier.java
index 450f5fe8b523..b68cb0df7588 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ColumnReferenceQualifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ColumnReferenceQualifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedPluralTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedPluralTableGroup.java
index 9c927b29cb9a..5ba8b98a7943 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedPluralTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedPluralTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedTableGroup.java
index 3309960ca90d..b93babafbf48 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
index 6ca3b35dbedc..a063a31cdc24 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DerivedTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DerivedTableReference.java
index 92e31e31e944..5ce91b18262e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DerivedTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DerivedTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableGroup.java
index b18b08ec4ee0..e2e5be817b5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableReference.java
index 30ecb1830784..47410d4558b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/EmbeddableFunctionTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FromClause.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FromClause.java
index 99d8680790f6..03aa82017671 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FromClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FromClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableGroup.java
index 9ebb6a0581de..6e71a26fb6d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableReference.java
index c53836a24a5e..3315ec11e7ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/FunctionTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/LazyTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/LazyTableGroup.java
index fad670ca5e6a..3a7c8193f642 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/LazyTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/LazyTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MappedByTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MappedByTableGroup.java
index 18beaed17b71..bbe6076a2c08 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MappedByTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MappedByTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MutatingTableReferenceGroupWrapper.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MutatingTableReferenceGroupWrapper.java
index efbaeeeda9af..8ebf330575d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MutatingTableReferenceGroupWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/MutatingTableReferenceGroupWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
index a7ac572f5b3f..b6b937e16ff0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.hibernate.Internal;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstWalker;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
index 5d5b06ef8480..2198cfcb71e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/PluralTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/PluralTableGroup.java
index 18b112cc00d1..183ea9a1cc7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/PluralTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/PluralTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableGroup.java
index ab601446915d..28924edafc70 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableReference.java
index 9cd8e51bafea..f8b29d361753 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/QueryPartTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/RootTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/RootTableGroupProducer.java
index 4b2385f9b747..9aad66ce840c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/RootTableGroupProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/RootTableGroupProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardTableGroup.java
index a13cd574e458..7f9003a400ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardVirtualTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardVirtualTableGroup.java
index 3d6a2f5cc1fb..f57bb42d3d07 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardVirtualTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/StandardVirtualTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableAliasResolver.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableAliasResolver.java
index d91c7703a592..5475b3063b88 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableAliasResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableAliasResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroup.java
index 80a05d4c5033..92abc840310d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
@@ -43,7 +41,7 @@ public interface TableGroup extends SqlAstNode, ColumnReferenceQualifier, SqmPat
 	List getTableGroupJoins();
 
 	List getNestedTableGroupJoins();
-	
+
 	boolean canUseInnerJoins();
 
 	default boolean isLateral() {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
index 4e373cca83f8..63dec532f75e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoinProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoinProducer.java
index d2c795232d6b..fa9a7e194614 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoinProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoinProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupProducer.java
index 7c9353204c23..7d73d365c8a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableJoin.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableJoin.java
index 3b066bd62fbd..267661b0c58a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReference.java
index e30c6f2bccbc..f7a0d39969f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoin.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoin.java
index a0c4e6a3ab57..6dabd5e2e684 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoinPredicateProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoinPredicateProducer.java
index f8950dd83570..1e739eff95b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoinPredicateProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReferenceJoinPredicateProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableGroup.java
index 8d8cd89920d0..e117009d6d8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java
index 6a84e42d49b8..1661077273b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnionTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnknownTableReferenceException.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnknownTableReferenceException.java
index 0a1bad3b2349..c33dcf154f6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnknownTableReferenceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/UnknownTableReferenceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableGroup.java
index a68143891460..54fe7de07f44 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableReference.java
index 770a3514ab3f..086dbb8deffb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/ValuesTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/VirtualTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/VirtualTableGroup.java
index 4d2b4f677dbc..695986cb7770 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/VirtualTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/VirtualTableGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.from;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/ConflictClause.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/ConflictClause.java
index 6400e30b50ed..8932f587f843 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/ConflictClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/ConflictClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
index b08e5485df66..0cf1f68512c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
@@ -1,22 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.insert;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 import org.hibernate.sql.ast.SqlAstWalker;
 import org.hibernate.sql.ast.tree.AbstractMutationStatement;
 import org.hibernate.sql.ast.tree.cte.CteContainer;
-import org.hibernate.sql.ast.tree.cte.CteStatement;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.select.QueryPart;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java
index ae4a9981ff0a..2ac5fd6eea38 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.insert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/Values.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/Values.java
index e9abac3d736d..3473495b18b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/Values.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/Values.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.insert;
 
 import org.hibernate.sql.ast.tree.expression.Expression;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class Values {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/AbstractPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/AbstractPredicate.java
index 06ff894b24b7..f371b7a148ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/AbstractPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/AbstractPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BetweenPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BetweenPredicate.java
index 0b86baf0dc24..babde1027ba2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BetweenPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BetweenPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BooleanExpressionPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BooleanExpressionPredicate.java
index 05a94780f148..a051ec1776e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BooleanExpressionPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/BooleanExpressionPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ComparisonPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ComparisonPredicate.java
index fcc5f94b8e1a..397d06b5db77 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ComparisonPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ComparisonPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ExistsPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ExistsPredicate.java
index 46de89337fa9..4cd03867a17a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ExistsPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ExistsPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/FilterPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/FilterPredicate.java
index c03349dbdd16..cdbd7b4c3523 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/FilterPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/FilterPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/GroupedPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/GroupedPredicate.java
index 7ee4590c12da..c31df5574b94 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/GroupedPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/GroupedPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InArrayPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InArrayPredicate.java
index a6eac9229c04..06c8775a4dd9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InArrayPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InArrayPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InListPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InListPredicate.java
index cfa00a0ab456..f351d9040da3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InListPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InListPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InSubQueryPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InSubQueryPredicate.java
index 5f7846eafca7..527f7787c8de 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InSubQueryPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/InSubQueryPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Junction.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Junction.java
index 4d9cf0491132..b73cf92467ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Junction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Junction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/LikePredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/LikePredicate.java
index b86e7eb2de70..63930bf909d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/LikePredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/LikePredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NegatedPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NegatedPredicate.java
index 60211b3e7120..26d325cc50cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NegatedPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NegatedPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NullnessPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NullnessPredicate.java
index 0fc9f71a6c8a..af79eb0ce165 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NullnessPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/NullnessPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Predicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Predicate.java
index 7a6b49b41b92..bc8434e6f834 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Predicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/Predicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
@@ -16,7 +14,6 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * Models a predicate in the SQL AST
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateCollector.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateCollector.java
index 3e7a004ffb34..c78a4f89c353 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateContainer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateContainer.java
index cdeaf5ed85c1..e17d75223a01 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/PredicateContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/SelfRenderingPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/SelfRenderingPredicate.java
index dd5a7fe9e47e..3549ef02d99f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/SelfRenderingPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/SelfRenderingPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ThruthnessPredicate.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ThruthnessPredicate.java
index 0aa1fe8155ce..44a278e36f37 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ThruthnessPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/predicate/ThruthnessPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.predicate;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
index 02e84d6420a5..61dd9df78a75 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java
index e006275a0fb3..9addd88b2c6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryPart.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QuerySpec.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QuerySpec.java
index 18c99dde1359..e0b9d70d98c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QuerySpec.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QuerySpec.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectClause.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectClause.java
index 45931efd9b68..4258b4547a65 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectClause.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectStatement.java
index d51045d977a5..78bf77285a8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SelectStatement.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
@@ -20,7 +16,6 @@
 import org.hibernate.sql.ast.tree.AbstractStatement;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.cte.CteContainer;
-import org.hibernate.sql.ast.tree.cte.CteStatement;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
index ffffac93e402..999368523120 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.select;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignable.java
index 8c44083b5889..fad3defd93b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignment.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignment.java
index a5c17e3a9461..3c5536133210 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignment.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/Assignment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
index f680d3630f87..1bd79e821830 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.ast.tree.update;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/ExecutionException.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/ExecutionException.java
index f31b3d00ed89..1e8d7f46d8c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/ExecutionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/ExecutionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
index 634269aa1429..0c3eee570982 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java
index 70dcbb35553b..87f9bc4355d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
index aa8e1d668365..e22ad5f7a7f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/BaseExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/BaseExecutionContext.java
index a0a83c0ac145..f77d26f2d4c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/BaseExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/BaseExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java
index 3c51b3727329..dbfa5659d56e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.exec.internal;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java
index 83b4436eeed5..60bc1f2f1c0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/CallbackNoOp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallFunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallFunctionReturnImpl.java
index 0ed4c3869d0e..6c4d3bb9da79 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallFunctionReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallFunctionReturnImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java
index 74d5e3fcaccd..4d3e7a44433a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
@@ -13,7 +11,6 @@
 import java.util.Set;
 
 import org.hibernate.HibernateException;
-import org.hibernate.internal.FilterJdbcParameter;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.exec.spi.JdbcCallFunctionReturn;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java
index 41742f1c0030..a0fc7c7175ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java
index 0a29deeed71e..41d499edf4cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallRefCursorExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallRefCursorExtractorImpl.java
index f9099325b1b1..740df441a574 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallRefCursorExtractorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallRefCursorExtractorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcExecHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcExecHelper.java
index 5bea0aec4a0b..16dd7f5e9dcc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcExecHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcExecHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java
index d5d81bb6d02a..a9c914cebd22 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingImpl.java
index 4d4b3dc3616b..8fe1e02707d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java
index 7d2855208a16..2d5d3a4e3e66 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterImpl.java
index 1b2ee5bda5a0..907f7d23069d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterImpl.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.sql.ast.SqlAstWalker;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParametersImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParametersImpl.java
index 1035f0a7eb5d..a2ac541ef090 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParametersImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParametersImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
index 8fe8e021e9e6..79fe8ce72d66 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/SqlTypedMappingJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/SqlTypedMappingJdbcParameter.java
index aba3138fcaae..c2c53fbb2379 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/SqlTypedMappingJdbcParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/SqlTypedMappingJdbcParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java
index 65250cc6e4f0..bfa75dfaa862 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardStatementCreator.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardStatementCreator.java
index 9247ad511874..9432db463f83 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardStatementCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardStatementCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/VersionTypeSeedParameterSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/VersionTypeSeedParameterSpecification.java
index 510cc39d6ebb..74cee8ca1de0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/VersionTypeSeedParameterSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/VersionTypeSeedParameterSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java
index 19eeeee1e8fa..087fe535ddd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/AbstractJdbcOperationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java
index 5cee5795fd87..e0d0d8430ccd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/Callback.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
index 6978f4ab402f..806eb18104a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java
index ea8bb6aa1616..ba465f577c6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallFunctionReturn.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.exec.spi;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterExtractor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterExtractor.java
index f64d45bc72e8..fc6a90cbc20b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterExtractor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.exec.spi;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterRegistration.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterRegistration.java
index 788401cfb081..baf0875c2f75 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallParameterRegistration.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.exec.spi;
 
 import java.sql.CallableStatement;
 import jakarta.persistence.ParameterMode;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.query.BindableType;
 import org.hibernate.query.OutputableType;
 import org.hibernate.sql.exec.internal.JdbcCallRefCursorExtractorImpl;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallRefCursorExtractor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallRefCursorExtractor.java
index 417a22554804..cc2a6222c082 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallRefCursorExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCallRefCursorExtractor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.exec.spi;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java
index 3be33bff116c..d5cb85ea73cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcLockStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java
index 5a8b65bf0ef6..9eb6d32701a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcMutationExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java
index cd61a1cf0104..cfc8fe9d3da5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java
index 35159deaf60c..23d815a014c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java
index 5dad03c753ec..8ad01e3d9a61 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryAnonBlock.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java
index 221db13cc354..4a49a3237e53 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryCall.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java
index f85b35fc88df..029d7024b2f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java
index dfcefec816b9..42c36c5bb155 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryInsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java
index 3821f74c631a..5f41a0d206cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java
index 7fffdcdcbf26..f12f25f0ca9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryMutationNative.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java
index 80854de2a218..1e49a41b0b10 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQuerySelect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
@@ -83,11 +81,11 @@ public int getMaxRows() {
 	public boolean usesLimitParameters() {
 		return offsetParameter != null || limitParameter != null;
 	}
-	
+
 	public JdbcParameter getOffsetParameter() {
 		return offsetParameter;
 	}
-	
+
 	public JdbcParameter getLimitParameter() {
 		return limitParameter;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java
index 240f37606e3a..c97be409bb98 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcOperationQueryUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinder.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinder.java
index 4bf1ea859b53..7cc71bd4d183 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinding.java
index d3105b97e585..64bca6a61cd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java
index 09da97372e25..cf391fc5da6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameters.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameters.java
index 6a681f6f584a..0e644f4f2a17 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameters.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameters.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParametersList.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParametersList.java
index 3d9e94b4246c..35adfcb56d98 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParametersList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParametersList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java
index 50c9992ec331..d5ac006db009 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
@@ -10,7 +8,6 @@
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Function;
 
 import org.hibernate.FlushMode;
 import org.hibernate.Incubating;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StandardEntityInstanceResolver.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StandardEntityInstanceResolver.java
index 29dc357c9dff..a71e47716e29 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StandardEntityInstanceResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StandardEntityInstanceResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java
index ff556fb03d7d..5a321a25a523 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementOptions.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementOptions.java
index 104a88b4a43c..15dd636aed0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.exec.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/EntityMutationOperationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/EntityMutationOperationGroup.java
index 232e1628ebd5..09e4523849f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/EntityMutationOperationGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/EntityMutationOperationGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
index 1953522f4277..16e3a799b42e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java
index e0296361324b..8add5c8c65f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java
index 585bd9d704ad..235a59e2530a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationOperationGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java
index fe2aaf433c8a..17228ad3a52b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java
index 98627d35793c..d08443faa451 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/MutationType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java
index 9e747cbf78f4..b63e54628594 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/PreparableMutationOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java
index db0f217f8c46..8857826010b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/SelfExecutingUpdateOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
index 50eebe1b27ef..a5a6434513f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java
index 60036f8beed5..9c9be05dc792 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ValuesAnalysis.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java
index 7e1204d54ca7..0350f2b121c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractRestrictedTableMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java
index e5e7a3938b76..76a2a06b541c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java
index 5a0bb19f5112..a8cc83efd7c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableInsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java
index 1d5834e93b0d..3da465de13b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java
index 864f755460ea..f1ceae1a2338 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/AbstractTableUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
index 6107831ecd8f..4f5487e02689 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBindingList.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBindingList.java
index ad72092c740a..42ed823b3b02 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBindingList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBindingList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
index 9c81fe2c1c99..5f0aa4c30b86 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameterList.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameterList.java
index a7acbf5c0e81..0c2e0288634f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameterList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameterList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java
index efe70fc60723..e5391ebb9717 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnWriteFragment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java
index 2c8bd7305b58..7a58c030ae50 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/CustomSqlMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java
index 8eeff60d2ef4..4c8dc4b34d10 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutatingTableReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java
index 5f56d31868a9..866d8120269c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/MutationGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java
index 55a7bca863be..f4250fa3f14d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/RestrictedTableMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java
index d4e32fab43dd..37794c57bb75 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java
index 9409e7587ee3..a91e0c484d1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableInsert.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java
index a7b72f80c596..936207dc0a18 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java
index 5bff5d289238..c92360aa79c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/TableUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java
index 5809d67257dd..c1b461e22c8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractRestrictedTableMutationBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java
index 47d8f1049130..b03e6ac07a6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableInsertBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
@@ -15,7 +13,6 @@
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.TableMapping;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
-import org.hibernate.sql.model.ast.ColumnValueParameter;
 import org.hibernate.sql.model.ast.MutatingTableReference;
 import org.hibernate.sql.model.ast.TableInsert;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java
index 3a2df22b165e..37bd8d842ed7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableMutationBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
index 6bd54b652236..5b8c0f3b675b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteBuilder.java
index 6740de509c1b..f55ad3101583 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteByUpdateSetNullBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteByUpdateSetNullBuilder.java
index 369caade7969..7b1ef0901252 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteByUpdateSetNullBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/CollectionRowDeleteByUpdateSetNullBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
index bff29bd2be8b..527a7ed3350c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
index d7ce9a6864ca..c73891efb435 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
index 743c1456d006..1d09aad6f859 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java
index 434b8c092489..8bff3dc84bb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/RestrictedTableMutationBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java
index 00d522dee98a..cde77286fa31 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java
index 25708868deff..8fdd2ab68d4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderSkipped.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java
index 2d9b6b3abad2..eb500eb578a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableDeleteBuilderStandard.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.TableMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java
index 883c37b94817..ea2a16cb7562 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilder.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
-import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.sql.model.ast.TableInsert;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java
index 0b44b8fe7f44..5481ef321b32 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableInsertBuilderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
index b5d147f68a2e..ba2bada2d162 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java
index e8d4e46a2a73..04622bdf9170 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMutationBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java
index 349f97a2ef73..c12643970316 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java
index b746f640efd7..354aed99c183 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderSkipped.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java
index 3804075c0303..a4a6d8c93eac 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableUpdateBuilderStandard.java
@@ -1,18 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.ast.builder;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.TableMapping;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/EntityMutationOperationGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/EntityMutationOperationGroupStandard.java
index 5237219d0809..0d8eba6f3de8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/EntityMutationOperationGroupStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/EntityMutationOperationGroupStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java
index 13d4b699a5af..cc4c10d0bd48 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupNone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java
index c55c039ee499..06f0a81334e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupSingle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java
index 9d82b5e7fea6..6648fcebac92 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationGroupStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupFactory.java
index 1d7da2cf41de..d99667658ea2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java
index 1b8d455ca848..b73c59c2a003 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/MutationOperationGroupStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableUpdate.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableUpdate.java
index d428d9ed8e7c..314b081b69e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java
index 9bf830d22b06..8d8cee0dca0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteCustomSql.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java
index 04a70a94b4c8..d5e95986afb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableDeleteStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java
index 265790f028e6..ea0f707de88b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertCustomSql.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java
index bb0dcf54a964..1133945848fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableInsertStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java
index abde26a3f752..66dada250ebe 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateCustomSql.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java
index b0337f15448c..51c88af3d45b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java
index 0a57f9754488..0702df832ab8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
index 26e8bd7765c2..043208ee68c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
index 2b629a707ff6..a324e5f5f475 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java
index 09eb9cb3d1ee..b3258e271be4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcDeleteMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java
index 813cf5588830..9579f02abbc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcInsertMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java
index a790df3f1556..0f5104096daf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcMutationOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java
index 8d27ee673a31..166dc29a957a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcUpdateMutation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
index 64b0292adc66..071f98c208b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
index a583d5aee7c7..9f2a369331f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
index 30d35748c942..52b10472b104 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
index 93d85968e8b2..088d9226dd56 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.model.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/DomainResultCreationException.java b/hibernate-core/src/main/java/org/hibernate/sql/results/DomainResultCreationException.java
index 2d93edfd5660..632b5a8eb2bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/DomainResultCreationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/DomainResultCreationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
index e7f167ed431b..7b01ac1df875 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/NoMoreOutputsException.java b/hibernate-core/src/main/java/org/hibernate/sql/results/NoMoreOutputsException.java
index ee0659c08d0a..eee089babf06 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/NoMoreOutputsException.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/NoMoreOutputsException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
index 83f4ea0a5e63..0b9faeb3c314 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/caching/QueryCachePutManager.java b/hibernate-core/src/main/java/org/hibernate/sql/results/caching/QueryCachePutManager.java
index 816d6eafcab1..727765a454fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/caching/QueryCachePutManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/caching/QueryCachePutManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.caching;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/caching/internal/QueryCachePutManagerEnabledImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/caching/internal/QueryCachePutManagerEnabledImpl.java
index 122199b36e55..b74d02a16c5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/caching/internal/QueryCachePutManagerEnabledImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/caching/internal/QueryCachePutManagerEnabledImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.caching.internal;
 
@@ -14,7 +12,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.sql.results.caching.QueryCachePutManager;
 import org.hibernate.sql.results.jdbc.internal.CachedJdbcValuesMetadata;
-import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java
index eaad53d0e938..777954299f00 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java
index 0d2fe6d01c18..ecc524dc7bfe 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
index b3354ab0a868..10e53040f53c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DatabaseSnapshotContributor.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DatabaseSnapshotContributor.java
index 17db5edf224a..e80926fdeccf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DatabaseSnapshotContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DatabaseSnapshotContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResult.java
index c8ae41f2cd41..102aa1c9519a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultAssembler.java
index d717a59ab48c..35eef05fe30e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
index 193e377c4a89..9a798e7e5ac5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import org.hibernate.Incubating;
 import org.hibernate.engine.FetchTiming;
@@ -23,7 +20,6 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
-import org.hibernate.sql.ast.spi.SqlAstQueryPartProcessingState;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
 import org.hibernate.sql.results.graph.entity.EntityResultGraphNode;
@@ -154,7 +150,7 @@ default BasicFetch visitEmbeddableDiscriminatorFetch(EmbeddableResultGraphNod
 	 * We walk fetches via the SqlAstCreationContext because each "context"
 	 * will define differently what should be fetched (HQL versus load)
 	 */
- 	/*
+	/*
 	 * todo (6.0) : centralize the implementation of this
 	 * 		most of the logic in the impls of this is identical.  variations include:
 	 * 				1) given a Fetchable, determine the FetchTiming and `selected`[1].  Tricky as functional
@@ -178,7 +174,7 @@ default BasicFetch visitEmbeddableDiscriminatorFetch(EmbeddableResultGraphNod
 	 * todo (6.0) : wrt the "trickiness" of `selected[1]`, that may no longer be an issue given how TableGroups
 	 * 		are built/accessed.  Comes down to how we'd know whether to join fetch or select fetch.  Simply pass
 	 * 		along FetchStyle?
- 	 */
+	*/
 	ImmutableFetchList visitFetches(FetchParent fetchParent);
 
 	default ImmutableFetchList visitNestedFetches(FetchParent fetchParent) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphNode.java
index addb86bbd96e..27a2c063d6c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java
index a2a83edc2761..dd272270a0b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/EntityGraphTraversalState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/EntityGraphTraversalState.java
index fe09ba76ee30..d405e3e61ff4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/EntityGraphTraversalState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/EntityGraphTraversalState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetch.java
index f5d43761af7a..dab0f8877269 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchList.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchList.java
index 621c68eb094a..a2e9447cf41c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptions.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptions.java
index 4f04a6eabb96..07a730ad5d99 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptionsImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptionsImpl.java
index d8b8edb96e15..67df28399864 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptionsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchOptionsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchParent.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchParent.java
index 1c026ce890da..c1a256cf6311 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchParent.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchParent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchStyleAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchStyleAccess.java
index 4732a6eeeb00..953b7814f0f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchStyleAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchStyleAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchTimingAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchTimingAccess.java
index 2f7924dc9374..25e39cde36cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchTimingAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchTimingAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
index 5b6d6ec71fc3..c2a3421d1c29 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchableContainer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchableContainer.java
index 5f74d3fad677..9fa9308195ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchableContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/FetchableContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Initializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Initializer.java
index bc71d9089fa5..fcb5205348eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Initializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Initializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerData.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerData.java
index 028f5b95ae8e..56212b10c765 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerData.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerData.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
-import java.util.Objects;
 
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerParent.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerParent.java
index b10f8741239b..da2a84ed4567 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerParent.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerParent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerProducer.java
index b6271cbbcbbd..88f346442530 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/InitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedBasicPartResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedBasicPartResultAssembler.java
index e3f26fcb8be1..cdd6c591c192 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedBasicPartResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedBasicPartResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedResultAssembler.java
index d1dc1c4e795e..b3e3103f44bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/UnfetchedResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph;
 
@@ -32,4 +30,3 @@ public JavaType getAssembledJavaType() {
 	}
 
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
index c1c4d2c71c73..50fdcda7d311 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.basic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java
index 944c8610b891..62ea55068159 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.basic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
index f803613d5e5c..da2ea91a35ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.basic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultGraphNode.java
index 95839942d865..1fe6a08c1a30 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.basic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
index 9e164ec1cebe..3c89a5c17637 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.basic;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionInitializer.java
index f3efc1bd183d..3ad7f1b59a76 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionLoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionLoadingLogger.java
index 4ea56445a542..5b6f235a6c48 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionLoadingLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionLoadingLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionResultGraphNode.java
index cd3c49116d84..7c2c1c1ff490 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/CollectionResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/LoadingCollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/LoadingCollectionEntry.java
index 2a642a9b42c3..ba698328761f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/LoadingCollectionEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/LoadingCollectionEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
index 87ed1f0ee4ce..391f46afd122 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
@@ -1,19 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
 import java.util.function.BiConsumer;
 
-import org.hibernate.collection.spi.CollectionSemantics;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CollectionKey;
-import org.hibernate.engine.spi.PersistenceContext;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.spi.NavigablePath;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
index 1f094cc88da9..4408c4f70f88 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
index 89ac0d015ada..3d508cbf1b4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializer.java
index 1417600a7f73..bcde57feaddd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializerProducer.java
index f2994fef7d8f..5390d5be63e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ArrayInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializer.java
index b73643cd4711..845ea9008cdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializerProducer.java
index a32786cbf180..14b41d7c34fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/BagInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionAssembler.java
index 3791659b5082..46e2c882549c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java
index ff4c8c52a110..ff9df461197b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionFetch.java
index 85b099f63e7c..5062b390c4f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionFetch.java
index 83b09319d101..fd8759ace5c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java
index b444afce07b3..cf7ff503e0e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java
index 9cf9e07638be..70705f2f2a91 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializer.java
index 67e9c16a74fb..fbcc113f21ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
@@ -28,7 +26,7 @@
 
 /**
  * CollectionInitializer for PersistentList loading
- * 
+ *
  * @author Steve Ebersole
  */
 public class ListInitializer extends AbstractImmediateCollectionInitializer {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializerProducer.java
index be73e877b6e2..2d2a01da0a8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/ListInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializer.java
index 49c21cc96579..3239ca0527de 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializerProducer.java
index 6f0bcbdfb258..58dd5e35428f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/MapInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionFetch.java
index d5e2e413b9be..a587c9ba2354 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionInitializer.java
index b6d2f4e926e3..ec0edad67efe 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SelectEagerCollectionInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializer.java
index 30909c6ce02d..916a9e52bfd3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializerProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializerProducer.java
index 121e44092f19..93a2842fd666 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializerProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/SetInitializerProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/UnfetchedCollectionAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/UnfetchedCollectionAssembler.java
index 9be2236b6fd1..1eb9f3af676e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/UnfetchedCollectionAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/UnfetchedCollectionAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.collection.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AggregateEmbeddableResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AggregateEmbeddableResultGraphNode.java
index 6aee46e54988..eb30196ae7ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AggregateEmbeddableResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AggregateEmbeddableResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableInitializer.java
index ede2dd6a5b18..4f76516db20a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
@@ -40,7 +38,7 @@ default EmbeddableInitializer asEmbeddableInitializer() {
 
 	/**
 	 * Resets the resolved entity registrations by i.e. removing {@link org.hibernate.engine.spi.EntityHolder}.
-	 * 
+	 *
 	 * This is used after {@link org.hibernate.sql.results.graph.entity.EntityInitializer#resolveEntityKeyOnly(RowProcessingState)}
 	 * to deregister registrations for entities that were only resolved, but not initialized.
 	 * Failing to do this will lead to errors, because {@link org.hibernate.engine.spi.PersistenceContext#postLoad(JdbcValuesSourceProcessingState, Consumer)}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableLoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableLoadingLogger.java
index b3d47099b9f8..2a80eca3153a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableLoadingLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableLoadingLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResult.java
index 7bfe65b6b208..e1033de3a9d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResultGraphNode.java
index 21bb3c4a60f2..09fbb40ece1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableValuedFetchable.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableValuedFetchable.java
index 1670f0dab545..9631bfd2ac6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableValuedFetchable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/EmbeddableValuedFetchable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
index faae83908003..1fa70884593d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableInitializerImpl.java
index 194e9bc539c9..344b3e950fe7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableInitializerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableInitializerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
index b2fc0a6e8976..7bbe3de03a89 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
index fc4131f01f85..96319dd257c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
index 41e19ecd85c7..e30c8ed18ebe 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
index fb358a198210..bd0de61c30aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
index 50f43bc193e9..7a0b91171a54 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableInitializerImpl.java
index f77d77b0fc1f..8c2b11e5c4dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableInitializerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableInitializerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
@@ -44,7 +42,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 import static org.hibernate.sql.results.graph.embeddable.EmbeddableLoadingLogger.EMBEDDED_LOAD_LOGGER;
 import static org.hibernate.sql.results.graph.entity.internal.BatchEntityInsideEmbeddableSelectFetchInitializer.BATCH_PROPERTY;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
index ecc4918b0c02..8c52a36eee75 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
index d98d65cdcb4d..c39e290ad71c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java
index f1de62f0e042..ccb5344cfe76 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingInitializer.java
index 0b4eeba77bed..fd039376b49c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingResult.java
index bf6ca0b481fa..1bbeeaea9187 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractDiscriminatedEntityResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractDiscriminatedEntityResultGraphNode.java
index 2a54be6a7381..ca5f92f2c9d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractDiscriminatedEntityResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractDiscriminatedEntityResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
index f1ac8ddc0fd8..178ae06724d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityFetch.java
index d7d5bd01cf2e..a43547e0ddea 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityInitializer.java
index 23a505bcce5f..4ceee8df1029 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityLoadingLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityLoadingLogging.java
index bef794836c16..7f74dae0e478 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityLoadingLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityLoadingLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
index 4f8778695bbe..0c18970d5f7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResultGraphNode.java
index 556cd71684d4..eb38e9620775 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResultGraphNode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityValuedFetchable.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityValuedFetchable.java
index 38176fca44de..e52414a53b77 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityValuedFetchable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityValuedFetchable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java
index 793a5451b15c..3ba1fd5787ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractBatchEntitySelectFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java
index 7b504a796e90..759a1bfe2fe9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntityInsideEmbeddableSelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntityInsideEmbeddableSelectFetchInitializer.java
index 7c510acb148b..65eddf7a841c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntityInsideEmbeddableSelectFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntityInsideEmbeddableSelectFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
@@ -189,11 +187,11 @@ public void endLoading(BatchEntityInsideEmbeddableSelectFetchInitializerData dat
 					final Object[] loadedState = parentEntityEntry.getLoadedState();
 					if ( loadedState != null ) {
 						/*
-						 E.g.
+						E.g.
 
-						 ParentEntity -> RootEmbeddable -> ParentEmbeddable -> toOneAttributeMapping
+						ParentEntity -> RootEmbeddable -> ParentEmbeddable -> toOneAttributeMapping
 
-						 The value of RootEmbeddable is needed to update the ParentEntity loaded state
+						The value of RootEmbeddable is needed to update the ParentEntity loaded state
 						 */
 						final int parentEntitySubclassId = parentInfo.parentEntitySubclassId;
 						final Object rootEmbeddable = rootEmbeddableGetters[parentEntitySubclassId].get( parentEntityInstance );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntitySelectFetchInitializer.java
index 3eb69b6cd0b6..e220d049888d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntitySelectFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchEntitySelectFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchInitializeEntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchInitializeEntitySelectFetchInitializer.java
index e9ef0e3845f5..2359c1b7292c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchInitializeEntitySelectFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/BatchInitializeEntitySelectFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityFetch.java
index 48c3783bff24..10a8fa413885 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityFetch.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java
index bf7a0cb41893..fd7e6d226f02 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
@@ -32,7 +30,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import static org.hibernate.internal.log.LoggingHelper.toLoggableString;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityResult.java
index 7b8999058bfe..15abc8f93e0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/DiscriminatedEntityResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityAssembler.java
index fdf4b3693dba..ff161d81be21 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchImpl.java
index a051ef92b606..74f72f738437 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
index 665b26c171ee..d1499e2453db 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
index c79712a6f028..75620171ba93 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
index a23dace71847..5701b3ad53e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
index baaca02329f3..d9610b4f03b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
index 7676e696dee5..347ed831f31d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchByUniqueKeyInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchByUniqueKeyInitializer.java
index 0a00eda068c9..a44a74e1af42 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchByUniqueKeyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchByUniqueKeyInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
index 2f2c1c0c758d..0ffb6ba15cf5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializerBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializerBuilder.java
index 17648a30d237..d0b754012d7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializerBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializerBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.entity.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/DynamicInstantiationResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/DynamicInstantiationResult.java
index 3b4723721ba3..569704342477 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/DynamicInstantiationResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/DynamicInstantiationResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentDomainResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentDomainResult.java
index 1c98d5bc7f4a..b5804e5db3f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentDomainResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentDomainResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentReader.java
index 24b0e55f1126..2c55b1c34bc2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/ArgumentReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjection.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjection.java
index 31501b436a62..395717577902 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjection.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjector.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjector.java
index 111368197f80..3de7e90ee41e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjector.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorField.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorField.java
index 6a81637abc3d..3548b339ea15 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorField.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorField.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorSetter.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorSetter.java
index 3f34997e4b94..07de8fc9fd62 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorSetter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/BeanInjectorSetter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
index d8ce0a3165e8..3503f920761b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
index 7218fa7efc38..df8c64811772 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
index 2ecd761733ea..9b029f9ada1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
index 4e328d3da61d..94c3ba256c2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
index cfa72ac6366d..827079ef379e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
index bbd06a9b3aae..444741d2e2a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
@@ -1,13 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.graph.instantiation.internal;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
index 22979c5988d0..e1b05c0c246a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
index ce6c20e6cbd2..077e09aeffe8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/AbstractInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/AbstractInitializer.java
index 0e98006db38f..c1203ae14b72 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/AbstractInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/AbstractInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/ImmutableFetchList.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/ImmutableFetchList.java
index 4f0de3cc186a..dfd19b047183 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/ImmutableFetchList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/internal/ImmutableFetchList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java
index 6dd34d97b92d..a03e142ba8da 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResultAssembler.java
index d6c880561cfe..204e3a03b03d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResultAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.graph.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java
index e5529559692a..53803e7ffc6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
@@ -12,7 +10,6 @@
 
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.entity.internal.EntityInitializerImpl;
-import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 
 /**
  * Internal helper to keep track of the various
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingCollectionEntryImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingCollectionEntryImpl.java
index 835efc0975b8..eb40299b903d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingCollectionEntryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingCollectionEntryImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NavigablePathMapToInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NavigablePathMapToInitializer.java
index 34e2548f7929..d4dcb034412e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NavigablePathMapToInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NavigablePathMapToInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NullValueAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NullValueAssembler.java
index 12dac6b0aec2..30fc604498c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NullValueAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/NullValueAssembler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResolvedSqlSelection.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResolvedSqlSelection.java
index 83b80d8a7027..c61488c782af 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResolvedSqlSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResolvedSqlSelection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
@@ -12,7 +10,6 @@
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 import org.hibernate.type.BasicType;
-import org.hibernate.type.descriptor.ValueExtractor;
 
 /**
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
index 02cf1c08e160..3ae3e2f53abe 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
@@ -1,13 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
-import java.util.List;
-import java.util.function.Supplier;
 
 import org.hibernate.CacheMode;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
@@ -24,24 +20,10 @@
 import org.hibernate.event.spi.HibernateMonitoringEvent;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlAstCreationContext;
-import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.results.ResultsLogger;
-import org.hibernate.sql.results.graph.AssemblerCreationState;
-import org.hibernate.sql.results.graph.DomainResultAssembler;
-import org.hibernate.sql.results.graph.FetchParent;
-import org.hibernate.sql.results.graph.Initializer;
-import org.hibernate.sql.results.graph.InitializerParent;
-import org.hibernate.sql.results.graph.InitializerProducer;
-import org.hibernate.sql.results.graph.collection.internal.AbstractImmediateCollectionInitializer;
-import org.hibernate.sql.results.graph.instantiation.DynamicInstantiationResult;
-import org.hibernate.sql.results.jdbc.internal.StandardJdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingResolution;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java
index 0c02d031c712..9eec1ef39cb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java
index d646707a90fc..307f0d665087 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerCheckingImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerCheckingImpl.java
index 3f2e71c90e48..640d5b7bdc37 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerCheckingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerCheckingImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import org.hibernate.query.QueryTypeMismatchException;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java
index 607451a08377..197350e17222 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import jakarta.persistence.TupleElement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java
index 5d3468412094..179800f7d73c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import jakarta.persistence.Tuple;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java
index 47fe3decbdf3..0010caa2428a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerMapImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerMapImpl.java
index 316b2050aec4..037c6e496ef4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerMapImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import jakarta.persistence.TupleElement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java
index aab993aad858..b94b1abbf3eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import org.hibernate.sql.results.spi.RowTransformer;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java
index 1c23add162d1..720c351b1e01 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerTupleTransformerAdapter.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerTupleTransformerAdapter.java
index a14b7fe8f958..e63375c81e80 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerTupleTransformerAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerTupleTransformerAdapter.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import org.hibernate.query.TupleTransformer;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
index 30c9946d3c3a..daa8e51108c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
index 27e647541462..f3f1492440e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
index e94898dc2c08..1e53ddbffe4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java
index ee7994aea72f..a58d11128dc6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import jakarta.persistence.TupleElement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
index 7869ef50c9a6..a8e2dcc49058 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
index 94fa6966f54d..068265aec13f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.sql.results.internal;
 
 import jakarta.persistence.TupleElement;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java
index 13029ac927c5..edea401c3115 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java
index 257e2d7ffdc4..7160e23b8309 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.internal.domain;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
index e93a9b37dde6..a19ca36aa1df 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
index 6f1e09e24388..1f8fe7734bfc 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
index 7bbc84d99e7c..b6f28ce17aa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
index cebd72306fe3..76c19d5a93af 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
@@ -10,7 +8,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collections;
-import java.util.function.Function;
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
index 34ca7c82cdfd..6bd7d8d0988a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
index a2902861ea7c..8b72d1fa360b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderInitiator.java
index a5708ff43b58..4714ac9ff7ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderStandard.java
index fa95470f6d4f..6afd7daabe20 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerProviderStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
index 5d5b51e5b8bd..27dc89aea471 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
@@ -15,7 +13,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
index 6fc595bbca4e..a0ee9cb2c11c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
index 715940b17d1d..490e7a272543 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
index 185baa2f4211..f666d3302ac7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java
index 9083a60df9f2..8b4da850b96a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
index e76dba82f463..e677bda708dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValues.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValues.java
index 5b4149c75cfc..feb642727eb8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValues.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMapping.java
index f0fb47660de1..ec383113046d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java
index a22fee1be009..8d7058369049 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducerProvider.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducerProvider.java
index 6dd896ed3669..3e52f970c743 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducerProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducerProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
@@ -15,7 +13,7 @@
 /**
  * Pluggable contract for providing custom {@link JdbcValuesMappingProducer} implementations.
  * This is intended for use by hibernate-reactive to provide its custom implementations.
- * 
+ *
  * @author Steve Ebersole
  */
 @Incubating
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingResolution.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingResolution.java
index 8a1450722128..3a03f6180c30 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingResolution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMetadata.java
index 983ec87622a0..5febbba58672 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingOptions.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingOptions.java
index b3a1eae809b0..5ff4a44771fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java
index ea93ec95e752..07da762d3118 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
@@ -10,11 +8,9 @@
 
 import org.hibernate.engine.spi.CollectionKey;
 import org.hibernate.engine.spi.EntityHolder;
-import org.hibernate.engine.spi.EntityUniqueKey;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.PostLoadEvent;
 import org.hibernate.event.spi.PreLoadEvent;
-import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.spi.LoadContexts;
 import org.hibernate.sql.results.graph.collection.LoadingCollectionEntry;
 import org.hibernate.query.spi.QueryOptions;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java
index 70fcb72fbadc..45a7206515c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
index 6519287ee8e2..baca843a066e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
index 6f09ba408336..90dc0738fd5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
@@ -1,19 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
 import org.hibernate.engine.spi.CollectionKey;
-import org.hibernate.engine.spi.EntityKey;
-import org.hibernate.engine.spi.EntityUniqueKey;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.StandardStack;
-import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.collection.LoadingCollectionEntry;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
index 22d9dabeb878..f01fe8109e8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ResultsConsumer.java
index d2aacad7d20f..d54025f74aff 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ResultsConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ResultsConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowReader.java
index 6bed911a4ace..2f61ea91d1f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowTransformer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowTransformer.java
index f0921a461199..2dba51b288de 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/RowTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
index 442a0d9c16d3..5c2b10c541c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
index 0003a9b329d5..d91e5df7ec0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.sql.results.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java
index 99e23b134e91..edc876e64c11 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/CacheableDataStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/CacheableDataStatistics.java
index 9fae01b9a117..d0c12c45490d 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/CacheableDataStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/CacheableDataStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java
index a8fa305f704b..11777d6c820d 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java
index 4a340ef10947..d32e50bb759f 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
index 56281397685c..7f8e3b56ac9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java
index e63fb85ae425..790f490bc1cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java
index a56e54e92ab2..07d345679f91 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
@@ -34,5 +32,5 @@ public interface SessionStatistics {
 	 * currently held within the persistence context.
 	 */
 	Set getCollectionKeys();
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java b/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java
index 99ea603bb174..bd677512b172 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
@@ -51,7 +49,7 @@ public interface Statistics {
 	void logSummary();
 
 
-    /**
+	/**
 	 * Obtain the statistics for the entity with the given name.
 	 *
 	 * @param entityName the entity name
@@ -125,39 +123,39 @@ public interface Statistics {
 	 */
 	@Nullable CacheRegionStatistics getCacheRegionStatistics(String regionName);
 
-    /**
-     * The global number of entity deletes.
+	/**
+	 * The global number of entity deletes.
 	 */
 	long getEntityDeleteCount();
 
-    /**
-     * The global number of entity inserts.
+	/**
+	 * The global number of entity inserts.
 	 */
 	long getEntityInsertCount();
 
-    /**
-     * The global number of entity loads.
+	/**
+	 * The global number of entity loads.
 	 */
 	long getEntityLoadCount();
 
 	/**
-     * The global number of entity fetches.
+	 * The global number of entity fetches.
 	 */
 	long getEntityFetchCount();
 
 	/**
-     * The global number of entity updates.
+	 * The global number of entity updates.
 	 */
 	long getEntityUpdateCount();
 
-    /**
-     * The global number of executed queries.
+	/**
+	 * The global number of executed queries.
 	 */
 	long getQueryExecutionCount();
 
-    /**
-     * The time in milliseconds of the slowest query.
-     */
+	/**
+	 * The time in milliseconds of the slowest query.
+	 */
 	long getQueryExecutionMaxTime();
 
 	/**
@@ -165,21 +163,21 @@ public interface Statistics {
 	 */
 	@Nullable String getQueryExecutionMaxTimeQueryString();
 
-    /**
-     * The global number of cached queries successfully retrieved from
+	/**
+	 * The global number of cached queries successfully retrieved from
 	 * the cache.
-     */
+	 */
 	long getQueryCacheHitCount();
 
-    /**
-     * The global number of cached queries notnot found in the
+	/**
+	 * The global number of cached queries notnot found in the
 	 * cache.
-     */
+	 */
 	long getQueryCacheMissCount();
 
-    /**
-     * The global number of cacheable queries put in cache.
-     */
+	/**
+	 * The global number of cacheable queries put in cache.
+	 */
 	long getQueryCachePutCount();
 
 	/**
@@ -204,43 +202,43 @@ public interface Statistics {
 	 */
 	@Nullable String getNaturalIdQueryExecutionMaxTimeEntity();
 
-    /**
-     * The global number of cached natural id lookups successfully
+	/**
+	 * The global number of cached natural id lookups successfully
 	 * retrieved from the cache.
-     */
+	 */
 	long getNaturalIdCacheHitCount();
 
-    /**
-     * The global number of cached natural id lookups not found
+	/**
+	 * The global number of cached natural id lookups not found
 	 * in the cache.
-     */
+	 */
 	long getNaturalIdCacheMissCount();
 
-    /**
-     * The global number of cacheable natural id lookups put in cache.
-     */
+	/**
+	 * The global number of cacheable natural id lookups put in cache.
+	 */
 	long getNaturalIdCachePutCount();
 
-    /**
-     * The global number of timestamps successfully retrieved from cache.
-     */
+	/**
+	 * The global number of timestamps successfully retrieved from cache.
+	 */
 	long getUpdateTimestampsCacheHitCount();
 
-    /**
-     * The global number of timestamp requests that were not found in the
+	/**
+	 * The global number of timestamp requests that were not found in the
 	 * cache.
-     */
+	 */
 	long getUpdateTimestampsCacheMissCount();
 
-    /**
-     * The global number of timestamps put in cache.
-     */
+	/**
+	 * The global number of timestamps put in cache.
+	 */
 	long getUpdateTimestampsCachePutCount();
 
 	/**
-     * The global number of flush operations executed, including automatic
+	 * The global number of flush operations executed, including automatic
 	 * (either manual or automatic).
-     */
+	 */
 	long getFlushCount();
 
 	/**
@@ -252,15 +250,15 @@ public interface Statistics {
 	long getConnectCount();
 
 	/**
-     * The global number of cacheable entities and collections successfully
+	 * The global number of cacheable entities and collections successfully
 	 * retrieved from the cache.
-     */
+	 */
 	long getSecondLevelCacheHitCount();
 
 	/**
-     * The global number of cacheable entities collections not found in the
+	 * The global number of cacheable entities collections not found in the
 	 * cache and loaded from the database.
-     */
+	 */
 	long getSecondLevelCacheMissCount();
 
 	/**
@@ -297,7 +295,7 @@ public interface Statistics {
 	/**
 	 * The global number of collections removed.
 	 */
-    //even on inverse="true"
+	//even on inverse="true"
 	long getCollectionRemoveCount();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java
index 5abb50e13792..7d3bb39dfb9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/AbstractCacheableDataStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java
index 23d18d570334..56c0a4d7654d 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/CacheRegionStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java
index 49f8e7822855..55cc35503fca 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/CollectionStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java
index 4d8247db080d..8170c4cd1367 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
index 1e5d78cfceb9..e78771c5d768 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java
index b9cd59471de8..3443c24aacdb 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java
index 11f563903a65..6614d7c57eb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
@@ -18,7 +16,7 @@
 public class SessionStatisticsImpl implements SessionStatistics {
 
 	private final SessionImplementor session;
-	
+
 	public SessionStatisticsImpl(SessionImplementor session) {
 		this.session = session;
 	}
@@ -26,19 +24,19 @@ public SessionStatisticsImpl(SessionImplementor session) {
 	public int getEntityCount() {
 		return session.getPersistenceContextInternal().getNumberOfManagedEntities();
 	}
-	
+
 	public int getCollectionCount() {
 		return session.getPersistenceContextInternal().getCollectionEntriesSize();
 	}
-	
+
 	public Set getEntityKeys() {
 		return Collections.unmodifiableSet( session.getPersistenceContextInternal().getEntitiesByKey().keySet() );
 	}
-	
+
 	public Set getCollectionKeys() {
 		return Collections.unmodifiableSet( session.getPersistenceContextInternal().getCollectionsByKey().keySet() );
 	}
-	
+
 	public String toString() {
 		return "SessionStatistics[" +
 				"entity count=" + getEntityCount() +
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
index e8be83b13d64..e5e3347e5785 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
@@ -80,7 +78,7 @@ public class StatisticsImpl implements StatisticsImplementor, Service {
 	private final LongAdder secondLevelCacheHitCount = new LongAdder();
 	private final LongAdder secondLevelCacheMissCount = new LongAdder();
 	private final LongAdder secondLevelCachePutCount = new LongAdder();
-	
+
 	private final LongAdder naturalIdCacheHitCount = new LongAdder();
 	private final LongAdder naturalIdCacheMissCount = new LongAdder();
 	private final LongAdder naturalIdCachePutCount = new LongAdder();
@@ -156,7 +154,7 @@ public void clear() {
 		secondLevelCacheHitCount.reset();
 		secondLevelCacheMissCount.reset();
 		secondLevelCachePutCount.reset();
-		
+
 		naturalIdCacheHitCount.reset();
 		naturalIdCacheMissCount.reset();
 		naturalIdCachePutCount.reset();
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
index d0e8bca64857..f5b67c6eb566 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsHelper.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsHelper.java
index 074a7084b108..e10103e842b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java
index dfb3f1fbcb89..b248fe0e8010 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsFactory.java b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsFactory.java
index 6b92b8094863..77c96a2d088c 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
index f6da7efbba02..30b7b2aa4903 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat.spi;
 
@@ -192,7 +190,7 @@ public interface StatisticsImplementor extends Statistics, Service {
 	 * Callback indicating a get from natural id cache resulted in a hit.
 	 */
 	void naturalIdCacheHit(NavigableRole rootEntityName, String regionName);
-	
+
 	/**
 	 * Callback indicating a get from natural id cache resulted in a miss.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java
index e6fef68d17b7..145299d2a704 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java
index d5750b146f3c..7e2d38cca080 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java
index 0ed4ed0cee95..b35cb9467a44 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/TargetType.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/TargetType.java
index e0346a902e3c..5c1acf073907 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/TargetType.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/TargetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/UniqueConstraintSchemaUpdateStrategy.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/UniqueConstraintSchemaUpdateStrategy.java
index db8c88b6f1ff..4bbdcdc263b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/UniqueConstraintSchemaUpdateStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/UniqueConstraintSchemaUpdateStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema;
 
@@ -14,21 +12,21 @@
  * SchemaUpdate needs to create these constraints, but DB's
  * support for finding existing constraints is extremely inconsistent. Further,
  * non-explicitly-named unique constraints use randomly generated characters.
- * 
+ *
  * @author Brett Meyer
  */
 public enum UniqueConstraintSchemaUpdateStrategy {
-	
+
 	/**
 	 * Attempt to drop, then (re-)create each unique constraint.  Ignore any
 	 * exceptions thrown.  Note that this will require unique keys/constraints
 	 * to be explicitly named.  If Hibernate generates the names (randomly),
 	 * the drop will not work.
-	 * 
+	 *
 	 * DEFAULT
 	 */
 	DROP_RECREATE_QUIETLY,
-	
+
 	/**
 	 * Attempt to (re-)create unique constraints, ignoring exceptions thrown
 	 * (e.g., if the constraint already existed)
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java
index a62a78ddb34d..554f7fe97209 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ColumnInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ColumnInformationImpl.java
index f59db11f9241..ce1d92817dc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ColumnInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ColumnInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java
index 53fa175a89c4..ad0280f6030c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/DatabaseInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java
index d75063444af5..ef9c4ac41c4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ForeignKeyInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ForeignKeyInformationImpl.java
index ede3a467a140..d5de1adff75e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ForeignKeyInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ForeignKeyInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
@@ -35,7 +33,7 @@ public Identifier getForeignKeyIdentifier() {
 	public Iterable getColumnReferenceMappings() {
 		return columnMappingList;
 	}
-	
+
 	public static class ColumnReferenceMappingImpl implements ColumnReferenceMapping {
 		private final ColumnInformation referencing;
 		private final ColumnInformation referenced;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/IndexInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/IndexInformationImpl.java
index 41acaec0b8b7..9f0e7eeca0e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/IndexInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/IndexInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
index 456fb1a9b4b9..0eddf5a1926c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/PrimaryKeyInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/PrimaryKeyInformationImpl.java
index 648d6fada5c9..501c1d87ae1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/PrimaryKeyInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/PrimaryKeyInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java
index 8ee95b26fe20..6b0335a90bd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java
index 3ec37306a87e..cc86ffd9c388 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java
index 0147f6cfbba6..bc0592d8be7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHSQLDBDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHSQLDBDatabaseImpl.java
index 9da2d724301d..b3cf2d97dc13 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHSQLDBDatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHSQLDBDatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorLegacyImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorLegacyImpl.java
index 1b980c813fd4..fc8b062a1a04 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorLegacyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorLegacyImpl.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorMariaDBDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorMariaDBDatabaseImpl.java
index 8016f325e29d..6bfa79e0dd25 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorMariaDBDatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorMariaDBDatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorNoOpImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorNoOpImpl.java
index 76450c9191e6..dae2a6460977 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorNoOpImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorNoOpImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorOracleDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorOracleDatabaseImpl.java
index 31e76ffc57d2..f1737c10b5c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorOracleDatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorOracleDatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorTiDBDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorTiDBDatabaseImpl.java
index bf2ee562c5c0..e2618f3612fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorTiDBDatabaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorTiDBDatabaseImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.tool.schema.extract.internal;
 
 import org.hibernate.boot.model.relational.QualifiedSequenceName;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationImpl.java
index 2c098c1eb8bf..2b65b2a39e8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceNameExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceNameExtractorImpl.java
index 28960447e600..8e4d45822ef7 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceNameExtractorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceNameExtractorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/TableInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/TableInformationImpl.java
index 5afe26fa0eae..4ca77c3c2820 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/TableInformationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/TableInformationImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnInformation.java
index 5f58ed0c1778..01337a9a913f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnTypeInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnTypeInformation.java
index dcd7a7234653..aef06b47850b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnTypeInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ColumnTypeInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java
index fa7d0a4f3bbc..fe0a5f58e517 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/DatabaseInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java
index ddd2d52e3ae7..9e1cde8efa86 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ForeignKeyInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ForeignKeyInformation.java
index 655c8427b691..1e4188e6ac98 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ForeignKeyInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ForeignKeyInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/IndexInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/IndexInformation.java
index 0cb77b718ce0..3ad48420ed62 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/IndexInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/IndexInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/InformationExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/InformationExtractor.java
index d2d21b6f277a..787536354b68 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/InformationExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/InformationExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/NameSpaceTablesInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/NameSpaceTablesInformation.java
index 1481fd514aeb..e5809c207e78 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/NameSpaceTablesInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/NameSpaceTablesInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/PrimaryKeyInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/PrimaryKeyInformation.java
index 9a39acd335bd..6fbba2e92afc 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/PrimaryKeyInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/PrimaryKeyInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SchemaExtractionException.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SchemaExtractionException.java
index c6c8911e4008..535f65c7a6b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SchemaExtractionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SchemaExtractionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformation.java
index e6507dbe7189..7df5913a26b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java
index 71db387969a7..97596f8f83ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/TableInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/TableInformation.java
index 470a7a4946d7..b8dd4797a43e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/TableInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/TableInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.extract.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
index 62207d5efa9b..04e2d6393a36 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaValidator.java
index 990261abe0c0..ecefbe3c4f17 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
index 3b4d608c21f5..caff5a882f2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java
index 90cbe8062c9b..b0204eded3bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DdlTransactionIsolatorProvidedConnectionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilter.java
index b748effd88c8..cfa3c1fe440f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilterProvider.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilterProvider.java
index de39be72e0c7..a793b7c7eb55 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilterProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DefaultSchemaFilterProvider.java
@@ -1,43 +1,41 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.tool.schema.internal;
-
-import org.hibernate.tool.schema.spi.SchemaFilter;
-import org.hibernate.tool.schema.spi.SchemaFilterProvider;
-
-/**
- * Default implementation of the SchemaFilterProvider contract, which returns
- * {@link DefaultSchemaFilter} for all filters.
- */
-public class DefaultSchemaFilterProvider implements SchemaFilterProvider {
-	public static final DefaultSchemaFilterProvider INSTANCE = new DefaultSchemaFilterProvider();
-
-	@Override
-	public SchemaFilter getCreateFilter() {
-		return DefaultSchemaFilter.INSTANCE;
-	}
-
-	@Override
-	public SchemaFilter getDropFilter() {
-		return DefaultSchemaFilter.INSTANCE;
-	}
-
-	@Override
-	public SchemaFilter getMigrateFilter() {
-		return DefaultSchemaFilter.INSTANCE;
-	}
-
-	@Override
-	public SchemaFilter getValidateFilter() {
-		return DefaultSchemaFilter.INSTANCE;
-	}
-
-	@Override
-	public SchemaFilter getTruncatorFilter() {
-		return DefaultSchemaFilter.INSTANCE;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.schema.internal;
+
+import org.hibernate.tool.schema.spi.SchemaFilter;
+import org.hibernate.tool.schema.spi.SchemaFilterProvider;
+
+/**
+ * Default implementation of the SchemaFilterProvider contract, which returns
+ * {@link DefaultSchemaFilter} for all filters.
+ */
+public class DefaultSchemaFilterProvider implements SchemaFilterProvider {
+	public static final DefaultSchemaFilterProvider INSTANCE = new DefaultSchemaFilterProvider();
+
+	@Override
+	public SchemaFilter getCreateFilter() {
+		return DefaultSchemaFilter.INSTANCE;
+	}
+
+	@Override
+	public SchemaFilter getDropFilter() {
+		return DefaultSchemaFilter.INSTANCE;
+	}
+
+	@Override
+	public SchemaFilter getMigrateFilter() {
+		return DefaultSchemaFilter.INSTANCE;
+	}
+
+	@Override
+	public SchemaFilter getValidateFilter() {
+		return DefaultSchemaFilter.INSTANCE;
+	}
+
+	@Override
+	public SchemaFilter getTruncatorFilter() {
+		return DefaultSchemaFilter.INSTANCE;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerCollectingImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerCollectingImpl.java
index 0544ad55e599..d80da180509f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerCollectingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerCollectingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerHaltImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerHaltImpl.java
index 0acc2d97abdc..36c072eff55a 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerHaltImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerHaltImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerLoggedImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerLoggedImpl.java
index 887b508fb089..3f65c1d770ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerLoggedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ExceptionHandlerLoggedImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java
index e5fe09cd9837..f2c276c50e70 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java
index 9240ecf49ecd..22bd44d3dd8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java
index b07e3723a619..0148a0eb8263 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java
index 2ca685f485eb..bb0cf8a0cfdb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java
index cab1bf96a4bb..349aa46b5991 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java
index 0ef9209eed3b..7db87d53a720 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java
index 99a1f5ea2aa9..8caa33f80b2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java
index 4dce97ea744e..62a435998327 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java
index c721f0b85c04..471ee4c505f6 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaTruncatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaTruncatorImpl.java
index 1b84ba6e5f6a..2dc98290ec83 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaTruncatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaTruncatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java
index 773807908b44..248b6fd85f59 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
index d9988f8717c2..619ffab62849 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java
index adf42ac985b6..bfa68b32bb27 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java
index f60dbcb20dbf..82c0e233fd61 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableCleaner.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableCleaner.java
index 5739de52cecc..1981e825a9c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableCleaner.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
index 0f1ed372634d..4341b40f17fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
index ad482fa21790..76d19a2e04ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java
index 989e6fca14e3..cbc14dfdce00 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
@@ -14,7 +12,7 @@
 
 /**
  * An {@link Exporter} for {@linkplain UniqueKey unique constraints}.
- * 
+ *
  * @author Brett Meyer
  */
 public class StandardUniqueKeyExporter implements Exporter {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
index 02241b192f97..d4bec0b50e54 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java
index cf0a9f417211..6d19a6406e62 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java
index fb8b3bc276e1..78839683e171 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
@@ -10,9 +8,6 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.hibernate.internal.CoreLogging;
-import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 import org.hibernate.tool.schema.spi.ScriptSourceInput;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java
index 4bbc41120654..b4168ce93482 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptTargetOutput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTarget.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTarget.java
index fa1e03ac5a1f..1a31524debb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTarget.java
@@ -1,14 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
-import org.hibernate.internal.CoreLogging;
-import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 import org.hibernate.tool.schema.spi.SchemaManagementException;
 import org.hibernate.tool.schema.spi.ScriptSourceInput;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
index 694262cb213b..753e8f5e2db7 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java
index 61e63a300e3b..498381b0f739 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToScript.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java
index c37259fee39d..7934019de86b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToStdout.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java
index a1a27d8898a7..ca341e5caf95 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java
index d9b781a34765..39933a086337 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java
index e9d6ad716e3b..d14d7d7e57d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcContext.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcContext.java
index 184e37b77418..d1ef85336560 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java
index 03c2e5c3dc3a..838365575641 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputAggregate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java
index c8b1d88764ca..a4bdba530e9a 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromFile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java
index 9443167cf7f8..40fc747646ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromUrl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromUrl.java
index 2f85f4a0686d..602c6716eddc 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromUrl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputFromUrl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java
index c3e5d105e9fc..64d929bf6544 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
@@ -12,7 +10,6 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.hibernate.tool.schema.spi.ScriptSourceInput;
 
 /**
  * Used in cases where a specified source cannot be found
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java
index abdc3309efc8..07bab28c0583 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToFile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToStdout.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToStdout.java
index 67d6b5151676..988099d5c987 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToStdout.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToStdout.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java
index f342efb61344..85463d87c966 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToWriter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToWriter.java
index 4095f9958e76..51717fef9181 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToWriter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToWriter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.exec;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
index 34b3e12ceb59..cd3b1073ceef 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.script;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SingleLineSqlScriptExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SingleLineSqlScriptExtractor.java
index d2ba726368ad..11a079d19e2e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SingleLineSqlScriptExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SingleLineSqlScriptExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.script;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java
index 570cde3852d9..74ffdd709faf 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.script;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptVisitor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptVisitor.java
index ebb95951e088..7baebace7f7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal.script;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Cleaner.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Cleaner.java
index 7517cecdab00..a9a4e7df8d14 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Cleaner.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Cleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/CommandAcceptanceException.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/CommandAcceptanceException.java
index 66ef6eb5c104..8ef05ecd1116 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/CommandAcceptanceException.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/CommandAcceptanceException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ContributableMatcher.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ContributableMatcher.java
index 4b1e48921306..17def46f8fac 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ContributableMatcher.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ContributableMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropAction.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropAction.java
index cd98171bf4a4..59b280e541bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistry.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistry.java
index e0afe6ae07f1..4295886d8513 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistryNotAvailableImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistryNotAvailableImpl.java
index edf998f8c1c8..0faea04da901 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistryNotAvailableImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DelayedDropRegistryNotAvailableImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExceptionHandler.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExceptionHandler.java
index c15cb661fa58..7ba56dac6a2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExceptionHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExceptionHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExecutionOptions.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExecutionOptions.java
index 74a2b00b8657..096aac6eae4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExecutionOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExecutionOptions.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
 import java.util.Map;
 
 import org.hibernate.Incubating;
-import org.hibernate.boot.model.relational.Exportable;
 
 /**
  * Parameter object representing options for schema management tool execution
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java
index f5b5e974d390..40cf8aa5c929 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExtractionTool.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExtractionTool.java
index c41aeff2d6bd..d5231e02a0cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExtractionTool.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ExtractionTool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/JpaTargetAndSourceDescriptor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/JpaTargetAndSourceDescriptor.java
index 4fba9010d9c6..d0344b9851ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/JpaTargetAndSourceDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/JpaTargetAndSourceDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java
index 4bf482bdd4fc..cce4549a44b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java
index 105e65b77707..ac5ffd6f0c95 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilter.java
index 7422281ddd66..669cc7f8288e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java
index 4712dec3a148..40c590c4732d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java
@@ -1,54 +1,52 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.tool.schema.spi;
-
-import org.hibernate.Incubating;
-
-/**
- * Used to specify the {@link SchemaFilter}s to be used by create, drop, migrate and validate
- * operations on the database schema. These filters can be used to limit the scope of operations to specific namespaces, 
- * tables and sequences.
- * 
- * @since 5.1
- */
-@Incubating
-public interface SchemaFilterProvider {
-	/**
-	 * Get the filter to be applied to {@link SchemaCreator} processing
-	 *
-	 * @return The {@link SchemaCreator} filter
-	 */
-	SchemaFilter getCreateFilter();
-
-	/**
-	 * Get the filter to be applied to {@link SchemaDropper} processing
-	 *
-	 * @return The {@link SchemaDropper} filter
-	 */
-	SchemaFilter getDropFilter();
-
-	/**
-	 * Get the filter to be applied to {@link SchemaTruncator} processing
-	 *
-	 * @return The {@link SchemaTruncator} filter
-	 */
-	SchemaFilter getTruncatorFilter();
-
-	/**
-	 * Get the filter to be applied to {@link SchemaMigrator} processing
-	 *
-	 * @return The {@link SchemaMigrator} filter
-	 */
-	SchemaFilter getMigrateFilter();
-
-	/**
-	 * Get the filter to be applied to {@link SchemaValidator} processing
-	 *
-	 * @return The {@link SchemaValidator} filter
-	 */
-	SchemaFilter getValidateFilter();
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.schema.spi;
+
+import org.hibernate.Incubating;
+
+/**
+ * Used to specify the {@link SchemaFilter}s to be used by create, drop, migrate and validate
+ * operations on the database schema. These filters can be used to limit the scope of operations to specific namespaces,
+ * tables and sequences.
+ *
+ * @since 5.1
+ */
+@Incubating
+public interface SchemaFilterProvider {
+	/**
+	 * Get the filter to be applied to {@link SchemaCreator} processing
+	 *
+	 * @return The {@link SchemaCreator} filter
+	 */
+	SchemaFilter getCreateFilter();
+
+	/**
+	 * Get the filter to be applied to {@link SchemaDropper} processing
+	 *
+	 * @return The {@link SchemaDropper} filter
+	 */
+	SchemaFilter getDropFilter();
+
+	/**
+	 * Get the filter to be applied to {@link SchemaTruncator} processing
+	 *
+	 * @return The {@link SchemaTruncator} filter
+	 */
+	SchemaFilter getTruncatorFilter();
+
+	/**
+	 * Get the filter to be applied to {@link SchemaMigrator} processing
+	 *
+	 * @return The {@link SchemaMigrator} filter
+	 */
+	SchemaFilter getMigrateFilter();
+
+	/**
+	 * Get the filter to be applied to {@link SchemaValidator} processing
+	 *
+	 * @return The {@link SchemaValidator} filter
+	 */
+	SchemaFilter getValidateFilter();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java
index 0af7ca6676b2..3845c5881b2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java
index 2b751875fe08..8554cdca93bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
index 2365adf23d55..28c0c49f508f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java
index 844b0008f0ad..aa9c4c143fe4 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaTruncator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaTruncator.java
index 13b3ff5c7db8..808244a594a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaTruncator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaTruncator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java
index 6cc38db4a46a..b42deef968f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptSourceInput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptSourceInput.java
index 5c6a25c842f2..2549b445dcf7 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptSourceInput.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptSourceInput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
index 390d77a6b4fc..69e3e73ec03b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SourceDescriptor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SourceDescriptor.java
index 842e7bee5d9d..258b449d1149 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SourceDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SourceDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptCommandExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptCommandExtractor.java
index c5956c93d9d5..0ab6f1a7c238 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptCommandExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptCommandExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.service.Service;
-import org.hibernate.service.ServiceRegistry;
 
 /**
  * Contract for extracting statements from source/import/init scripts.
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptException.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptException.java
index c14430d57da8..803499077d74 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptException.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SqlScriptException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TargetDescriptor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TargetDescriptor.java
index 605e9e11c584..adc991336c36 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TargetDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TargetDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanConstructorResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanConstructorResultTransformer.java
index e93da7c3ae62..e96dabbb0364 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanConstructorResultTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanConstructorResultTransformer.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 
 import java.lang.reflect.Constructor;
 
 import org.hibernate.InstantiationException;
-import org.hibernate.QueryException;
 import org.hibernate.query.TypedTupleTransformer;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanResultTransformer.java
index 90e4456b03fa..707e81995898 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanResultTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/AliasToBeanResultTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 
@@ -61,7 +59,7 @@ public T transformTuple(Object[] tuple, String[] aliases) {
 			else {
 				check( aliases );
 			}
-			
+
 			result = resultClass.newInstance();
 
 			for ( int i = 0; i < aliases.length; i++ ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java
index 6ded74e87dd5..a6793acb0627 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java
index 18f1ee352fc1..c97bdca5ff72 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/ResultTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 
@@ -30,4 +28,3 @@ default List transformList(List resultList) {
 		return resultList;
 	}
 }
-
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/ToListResultTransformer.java b/hibernate-core/src/main/java/org/hibernate/transform/ToListResultTransformer.java
index 46ee51d4563b..6271c2067189 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/ToListResultTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/ToListResultTransformer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/Transformers.java b/hibernate-core/src/main/java/org/hibernate/transform/Transformers.java
index 34d8ee65f915..8dbd835aeab0 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/Transformers.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/Transformers.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.transform;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/AbstractAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/AbstractAttribute.java
index bcfc8c095a6d..78592fc5726c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/AbstractAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/AbstractAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/AbstractNonIdentifierAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/AbstractNonIdentifierAttribute.java
index 5183f8bdb25a..070d2fa8c020 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/AbstractNonIdentifierAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/AbstractNonIdentifierAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/Attribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/Attribute.java
index a90302e83381..278a39a7da94 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/Attribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/Attribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/BaselineAttributeInformation.java b/hibernate-core/src/main/java/org/hibernate/tuple/BaselineAttributeInformation.java
index fed498a92b28..2eb55f65d61a 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/BaselineAttributeInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/BaselineAttributeInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/GenerationTiming.java b/hibernate-core/src/main/java/org/hibernate/tuple/GenerationTiming.java
index 78acbd03484f..c870e4d100a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/GenerationTiming.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/GenerationTiming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierAttribute.java
index 0e15c5cd1cbf..8e8d9a32beef 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierProperty.java b/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierProperty.java
index b54b56955525..6bdb88879524 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierProperty.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/IdentifierProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java
index df3f580fc750..58b5f134b0e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
index ecd7de0a0f68..cded42a70c28 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
@@ -135,7 +133,7 @@ public static NonIdentifierAttribute buildEntityBasedAttribute(
 		// we need to dirty check collections, since they can cause an owner
 		// version number increment
 
-		// we need to dirty check many-to-ones with not-found="ignore" in order 
+		// we need to dirty check many-to-ones with not-found="ignore" in order
 		// to update the cache (not the database), since in this case a null
 		// entity reference can lose information
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java b/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java
index dd672af71e59..57a314ae5121 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/component/AbstractCompositionAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/component/AbstractCompositionAttribute.java
index 27d0828ee97f..4c5a1c32f7e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/component/AbstractCompositionAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/component/AbstractCompositionAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.component;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityBasedAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityBasedAttribute.java
index ea8e7c2ff40a..99cb5e5a4e2e 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityBasedAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityBasedAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
index a1466e010c1f..bb2a24c673ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
@@ -15,7 +13,6 @@
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.Property;
-import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.persister.entity.EntityPersister;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeValueGenerationException.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeValueGenerationException.java
index 605a44d129c7..a0e7e40378c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeValueGenerationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeValueGenerationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java
index 12f5c43717fe..1076f4769c0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedBasicAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedBasicAttribute.java
index b47c7c0f096d..902d91a3b5b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedBasicAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedBasicAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedCompositionAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedCompositionAttribute.java
index acade5fd258e..213cd3553d6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedCompositionAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedCompositionAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
index db4c2666c8f2..317b22f2bcdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java
index 9062b09b4f33..003dbecf7074 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tuple.entity;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractSingleColumnStandardBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractSingleColumnStandardBasicType.java
index 1eac08691d84..298658e6a8cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AbstractSingleColumnStandardBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AbstractSingleColumnStandardBasicType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
index a4a23454aa2d..ac838fb4f4cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractType.java
index 24410895b3b2..cbdf13a2e5cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AbstractType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AbstractType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
index f38b1702a387..5823286683b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
index 45e83c0c2e07..113214c01fc5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -39,7 +37,7 @@
 
 /**
  * Handles "any" mappings
- * 
+ *
  * @author Gavin King
  */
 public class AnyType extends AbstractType implements CompositeType, AssociationType {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
index fbf7471e3927..fa2958d3180f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AssociationType.java b/hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
index af81bc18c352..29e19b54ec3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -31,13 +29,13 @@ public interface AssociationType extends Type {
 	 */
 	boolean useLHSPrimaryKey();
 	/**
-	 * Get the name of a property in the owning entity 
+	 * Get the name of a property in the owning entity
 	 * that provides the join key (null if the identifier)
 	 */
 	String getLHSPropertyName();
-	
+
 	/**
-	 * The name of a unique property of the associated entity 
+	 * The name of a unique property of the associated entity
 	 * that provides the join key (null if the identifier of
 	 * an entity, or key of a collection)
 	 */
@@ -48,7 +46,7 @@ public interface AssociationType extends Type {
 	 * collection persister
 	 */
 	Joinable getAssociatedJoinable(SessionFactoryImplementor factory) throws MappingException;
-	
+
 	/**
 	 * Get the entity name of the associated entity
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BagType.java b/hibernate-core/src/main/java/org/hibernate/type/BagType.java
index db48a334641f..65254c405e71 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BagType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BagType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
index a2bf4c36a264..7252c901d6d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java
index bd40f9e17ff2..7040a1a6ed61 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicPluralType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicPluralType.java
index 7475268c0e73..3047dfe4b584 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicPluralType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicPluralType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java
index 01af2f989f0b..2fbf13369403 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
index 308918c1de2b..e16a8394274f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
index 32727cd4f244..ae308bf8fd2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BottomType.java b/hibernate-core/src/main/java/org/hibernate/type/BottomType.java
index 7b42e1ccbe0f..29bd6d27f192 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BottomType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BottomType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java
index 785f9570cc0f..b896c6fb33cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
index 5dd4ed1cce0a..6a9be0c6007a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
index 9d07dd827919..8a68ee31c6b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CompositeType.java b/hibernate-core/src/main/java/org/hibernate/type/CompositeType.java
index 344bad6f4253..d3d9d07ba586 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CompositeType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CompositeType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java
index d592694b3746..6c7e6a8c3acf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicCollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicCollectionType.java
index 69b862ea859f..f9998eb52052 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicCollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicCollectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java
index 9a785300061a..88ff54a8b723 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
index c44ef7fba483..446c36cd02ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
index 8e1ba1e1156e..795434f0b400 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java
index c8942b64a7e8..179163f9901d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
index d6fc5b00283b..f9f421d7010c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -474,9 +472,9 @@ else if ( value == null ) {
 			if ( lazyInitializer != null ) {
 			/*
 				If the value is a Proxy and the property access is field, the value returned by
-			 	`attributeMapping.getAttributeMetadata().getPropertyAccess().getGetter().get( object )`
-			 	is always null except for the id, we need the to use the proxy implementation to
-			 	extract the property value.
+				`attributeMapping.getAttributeMetadata().getPropertyAccess().getGetter().get( object )`
+				is always null except for the id, we need the to use the proxy implementation to
+				extract the property value.
 			 */
 				value = lazyInitializer.getImplementation();
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
index 0b48a402a779..aaeada5e553f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ForeignKeyDirection.java b/hibernate-core/src/main/java/org/hibernate/type/ForeignKeyDirection.java
index 7185eed5e02d..14addb80c933 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ForeignKeyDirection.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ForeignKeyDirection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java b/hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
index 4458b20169f0..6f4560efd22f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/JavaObjectType.java b/hibernate-core/src/main/java/org/hibernate/type/JavaObjectType.java
index 51646ad5220f..277acaa31ea0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/JavaObjectType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/JavaObjectType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ListType.java b/hibernate-core/src/main/java/org/hibernate/type/ListType.java
index b20a541c4457..80d945171615 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ListType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ListType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
index a866ba6d4a88..9fac9b0fd0ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -177,7 +175,7 @@ public Serializable disassemble(
 			);
 			if ( id == null ) {
 				throw new AssertionFailure(
-						"cannot cache a reference to an object with a null id: " + 
+						"cannot cache a reference to an object with a null id: " +
 						getAssociatedEntityName()
 				);
 			}
@@ -209,7 +207,7 @@ public Object assemble(
 			Serializable oid,
 			SharedSessionContractImplementor session,
 			Object owner) throws HibernateException {
-		
+
 		//TODO: currently broken for unique-key references (does not detect
 		//      change to unique key property of the associated object)
 
@@ -272,7 +270,7 @@ public boolean isDirty(
 			Object newid = getIdentifier( current, session );
 			return getIdentifierType( session ).isDirty( oldid, newid, checkable, session );
 		}
-		
+
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/MapType.java b/hibernate-core/src/main/java/org/hibernate/type/MapType.java
index 7272119608d7..80fb9b7d8095 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/MapType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/MapType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
index 8ee21f39636f..c7d2ebfc197d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -105,7 +103,7 @@ public void nullSafeSet(
 	public String toLoggableString(Object value, SessionFactoryImplementor factory) throws HibernateException {
 		return toXMLString(value, factory);
 	}
-	
+
 	public String toXMLString(Object value, SessionFactoryImplementor factory) throws HibernateException {
 		return (String) value; //value is the entity name
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/NullType.java b/hibernate-core/src/main/java/org/hibernate/type/NullType.java
index 4e127a223156..3528cc3adeed 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/NullType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/NullType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java
index c492358fb086..9e8f70d582f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
index ea562c817457..49c0b7aa46da 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java b/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
index 409ff4e63ccb..52c9edd7c231 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java b/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
index 1e39efbfde25..2d035838de57 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterExtractionAware.java b/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterExtractionAware.java
index 8823c7da5e58..6f64be1d785d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterExtractionAware.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterExtractionAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterNamedBinder.java b/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterNamedBinder.java
index 7395e2acae31..11fcaf90bde2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterNamedBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ProcedureParameterNamedBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/QueryParameterJavaObjectType.java b/hibernate-core/src/main/java/org/hibernate/type/QueryParameterJavaObjectType.java
index d3e6ea86a3ca..5774180b09d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/QueryParameterJavaObjectType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/QueryParameterJavaObjectType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java b/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
index de8a27e2ed9f..a7728a762b17 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SerializableToBlobType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -40,7 +38,7 @@ public class SerializableToBlobType implements BasicType
 		ProcedureParameterExtractionAware,
 		ProcedureParameterNamedBinder,
 		DynamicParameterizedType {
-	
+
 	public static final String CLASS_NAME = "classname";
 
 	private static final long serialVersionUID = 1L;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SerializableType.java b/hibernate-core/src/main/java/org/hibernate/type/SerializableType.java
index dca094c2d143..534b2a8c61f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SerializableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SerializableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SerializationException.java b/hibernate-core/src/main/java/org/hibernate/type/SerializationException.java
index c1f796f65cb3..91f0f3cd1265 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SerializationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SerializationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 import org.hibernate.HibernateException;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SetType.java b/hibernate-core/src/main/java/org/hibernate/type/SetType.java
index 6f4755d5f9d2..fe92a4217b0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SetType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java b/hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
index 8e614abc7d19..b1ecaccc74b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java b/hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
index 361788400496..5c0914d47ab5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java
index f094c7ff57b5..d214bc42b2c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
@@ -19,7 +17,7 @@
 /**
  * A one-to-one association that maps to specific formula(s)
  * instead of the primary key column of the owning entity.
- * 
+ *
  * @author Gavin King
  */
 public class SpecialOneToOneType extends OneToOneType {
@@ -28,7 +26,7 @@ public SpecialOneToOneType(
 			TypeConfiguration typeConfiguration,
 			String referencedEntityName,
 			ForeignKeyDirection foreignKeyType,
-			boolean referenceToPrimaryKey, 
+			boolean referenceToPrimaryKey,
 			String uniqueKeyPropertyName,
 			boolean lazy,
 			boolean unwrapProxy,
@@ -37,13 +35,13 @@ public SpecialOneToOneType(
 			boolean constrained) {
 		super(
 				typeConfiguration,
-				referencedEntityName, 
+				referencedEntityName,
 				foreignKeyType,
-				referenceToPrimaryKey, 
-				uniqueKeyPropertyName, 
+				referenceToPrimaryKey,
+				uniqueKeyPropertyName,
 				lazy,
 				unwrapProxy,
-				entityName, 
+				entityName,
 				propertyName,
 				constrained
 			);
@@ -52,11 +50,11 @@ public SpecialOneToOneType(
 	public SpecialOneToOneType(SpecialOneToOneType original, String superTypeEntityName) {
 		super( original, superTypeEntityName );
 	}
-	
+
 	public int getColumnSpan(MappingContext mapping) throws MappingException {
 		return super.getIdentifierOrUniqueKeyType( mapping ).getColumnSpan( mapping );
 	}
-	
+
 	public int[] getSqlTypeCodes(MappingContext mappingContext) throws MappingException {
 		return super.getIdentifierOrUniqueKeyType( mappingContext ).getSqlTypeCodes( mappingContext );
 	}
@@ -79,8 +77,8 @@ public Serializable disassemble(Object value, SharedSessionContractImplementor s
 			Object id = ForeignKeys.getEntityIdentifierIfNotUnsaved( getAssociatedEntityName(), value, session );
 			if (id==null) {
 				throw new AssertionFailure(
-						"cannot cache a reference to an object with a null id: " + 
-						getAssociatedEntityName() 
+						"cannot cache a reference to an object with a null id: " +
+						getAssociatedEntityName()
 				);
 			}
 			return getIdentifierType(session).disassemble(id, session, owner);
@@ -120,7 +118,7 @@ public Object assemble(Serializable oid, SharedSessionContractImplementor sessio
 			return resolveIdentifier(id, session);
 		}
 	}
-	
+
 
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java b/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
index 081e60f283b3..a056505eea4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypeTemplate.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypeTemplate.java
index e9fa586012da..ceeb54330477 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypeTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypeTemplate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
index 7e0160a3c06d..945aae123981 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBooleanConverter.java
index 3f6fac65c616..67c828c7fbaf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardBooleanConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardBooleanConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java b/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
index dad06af025a6..1bf1185bd3e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java b/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java
index 62397c1b69e6..9b8238e8b1bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/Type.java b/hibernate-core/src/main/java/org/hibernate/type/Type.java
index 514ac3649221..bc4efd237820 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/Type.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/Type.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java b/hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java
index 867ba6881aee..2b48893dcc50 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/UserComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/UserComponentType.java
index a6b2f6e418d7..56959a20d58d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/UserComponentType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/UserComponentType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/WrapperArrayHandling.java b/hibernate-core/src/main/java/org/hibernate/type/WrapperArrayHandling.java
index 28b75fd9016f..1dc979607dc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/WrapperArrayHandling.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/WrapperArrayHandling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java b/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java
index 5f7004573acf..32b9e31f27cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java
index e9df32992e43..498a56771eb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcBindingLogging.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcBindingLogging.java
index 8ad0d92a149b..2ab406f31dc6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcBindingLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcBindingLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcExtractingLogging.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcExtractingLogging.java
index fef6f8b9172b..9287255a7305 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcExtractingLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcExtractingLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java
index 5c7e796e20ce..4a0f403be15c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueBinder.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueBinder.java
index 0d468d8f3a4e..bd3f23afa9be 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueExtractor.java
index 6d2ecc2dcfd3..a9dcf9470a2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/ValueExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/WrapperOptions.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/WrapperOptions.java
index 3149e7ad70db..a18a3faf3c5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/WrapperOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/WrapperOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
index a0319824dd6f..fa228e05adaf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.internal;
 
@@ -83,7 +81,7 @@ public S toRelationalValue(T domainForm) {
 	}
 
 	private S convertFrom(E[] domainArray, Class elementClass) {
-		 //TODO: the following implementation only handles conversion between non-primitive arrays!
+		//TODO: the following implementation only handles conversion between non-primitive arrays!
 		//noinspection unchecked
 		final F[] relationalArray = (F[]) Array.newInstance( elementClass, domainArray.length );
 		for ( int i = 0; i < domainArray.length; i++ ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java
index 21706b073ebd..180e50e86018 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/CollectionConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/CollectionConverter.java
index 51d66c7c6644..6e9c8bcc9938 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/CollectionConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/CollectionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java
index 56e0ed9933af..902a28d92e05 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java
index 77f7c989e98f..17ac66adccbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java
index ab728d13a331..2ba39aadc7be 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java
index 0f623e707576..957663d9fab6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.converter.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
index c0de85c7e4d5..f2ff1e0e7b5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
index d44cb4cb9cfb..ac188c0852ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java
index 8cf2ab18e672..be82cbf4341c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
index d6ec8686e7cf..895d471985eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
index cf821a8e5580..b802b48c688e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
index 49bc40f2d0f9..db71278e10a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 import java.lang.reflect.Array;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
index 5cf831262249..bba75a6f0ea7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicPluralJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicPluralJavaType.java
index eb4f00529a90..7a5a7ccb8173 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicPluralJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicPluralJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
index f78a4df6388a..60cfd9f6f69e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
index bcba7fa9b1bf..f191b96cf48c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
index 1f5515a9dcc6..c5b3717e04fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -138,7 +136,7 @@ else if ( Blob.class.isAssignableFrom( type ) ) {
 		catch ( SQLException e ) {
 			throw new HibernateException( "Unable to access blob stream", e );
 		}
-		
+
 		throw unknownUnwrap( type );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
index fc0e62129cd5..ebfa12121952 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
index da080a0bbb24..e37003deb264 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
index aab63bc890e5..45e8d6d01618 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
index 0aebadbd7012..781ddd50f61a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
index aefc954d8380..cdd82a23b4bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
index c7f0b56789e1..94c3f809ee1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
index cf3fc317f13a..98f20e03cd0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
index d1637fdfd4d8..d2e196caca42 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -19,7 +17,6 @@
 import org.hibernate.type.descriptor.jdbc.AdjustableJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
-import org.hibernate.type.descriptor.jdbc.JdbcTypeJavaClassMappings;
 
 /**
  * Descriptor for {@code Character[]} handling, which disallows {@code null} elements.
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
index cb5d17587e1b..331ec4947c70 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
index d29b963d0b49..408505aa434b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
index cce3fba31b5a..f9d26095924b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -121,7 +119,7 @@ else if ( String.class.isAssignableFrom( type ) ) {
 		catch ( SQLException e ) {
 			throw new HibernateException( "Unable to access clob stream", e );
 		}
-		
+
 		throw unknownUnwrap( type );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClockHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClockHelper.java
index 5252199973b2..d043af1815fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClockHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClockHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionException.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionException.java
index 00286ed0565f..bce67bd0c349 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionHelper.java
index e4ec78a0e298..2e3ac4ad2da1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CoercionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ComponentArrayComparator.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ComponentArrayComparator.java
index adc52fcdcd1f..4e05c769b164 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ComponentArrayComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ComponentArrayComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
index 30a195da33ba..82b6e9aee7aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java
index ea5f34fc73ab..d1fdbfaf941e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
index 20dfbd99c286..4cc39a33f5d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
index c9ca64fc453a..359a92bea1b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
index cb52eab82e34..f792d0b53c08 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
index b0f85b9e493b..41e0c7aa99fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
index 302761828878..22ef049eb948 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
index 7802585055d9..721d51300c5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
index 89cac34032cf..2c71be6c0db3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java
index 3bba6c66d90d..a8b7c3454049 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java
index bbec2228ea9d..dc13dab8c94b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IncomparableComparator.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IncomparableComparator.java
index 92e06e7d79f6..91b2d9399e83 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IncomparableComparator.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IncomparableComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
index 06dcdfe41f9d..0b5397371ec2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
index 8ccf7c2a966c..bc24254179ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
index 6b003a1773a7..05d62a9f7285 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
index 23e7c9ff6940..babebcff86a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
index 15e19f9c34ab..14ca431797f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypeHelper.java
index 29e2c0821e8d..83721d73a855 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypedExpressible.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypedExpressible.java
index 56f92df3b43a..93bc6363f834 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypedExpressible.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypedExpressible.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
index f49b7def0d33..d7ed8d21f9b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
index 73beca06ab00..7be531986363 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
index 7a7d3a5ce7fc..a3d2c98d0b6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java
index cb799ab41186..5c75523909f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -291,7 +289,7 @@ private static long determineLengthForBufferSizing(Clob value) throws SQLExcepti
 	/**
 	 * Make sure we allocate a buffer sized not bigger than 2048,
 	 * not higher than what is actually needed, and at least one.
-	 * 
+	 *
 	 * @param lengthHint the expected size of the full value
 	 * @return the buffer size
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
index 24f026a3150c..1cbe12afedb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
index 6dd17a05d810..a4ae976bcb57 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
index a37070f9832a..e584438a38ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
index b64279ebdfac..13e8fc678e0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
index ef2f6b4e9903..919385fc48c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
index 9315e145b9e4..d0aa6b069b87 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlan.java
index 34225483fca6..770c9a967063 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlanExposer.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlanExposer.java
index aa798e30b3de..4a03becdbe4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlanExposer.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutabilityPlanExposer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
index 9a46469887f8..73c39bd4604b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
index 4533df2e1530..31ddb239e6fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -110,7 +108,7 @@ else if ( NClob.class.isAssignableFrom( type ) ) {
 		catch ( SQLException e ) {
 			throw new HibernateException( "Unable to access nclob stream", e );
 		}
-		
+
 		throw unknownUnwrap( type );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
index d21ba65b9fac..66fc0527ae85 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
index ab0cc34f9ff4..111d05590969 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
index 59ffc790bcc7..0ca2d75b8e01 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
index 1948c5313eba..1a6476765145 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
index 402d7257a45e..f10416ce9ce2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
@@ -37,7 +35,7 @@ public PrimitiveByteArrayJavaType() {
 
 	@Override
 	public boolean areEqual(byte[] one, byte[] another) {
-		return one == another 
+		return one == another
 				|| ( one != null && another != null && Arrays.equals( one, another ) );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
index cdcfa3417228..2bb97fabce9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
index da7625bb7198..f336377a30df 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
index a6e1296c22f1..f1e56a723123 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
index 49f6d7f6273f..bd55333e46af 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
index 5ff95669c728..48a8c2fdcacf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
index 528b99604874..7715abfa4643 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
index 983c686ccd58..c2e5f502e4fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
index 8662d82ad501..86ad87a8a633 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
index 71fae9a46d8e..6173b1895a27 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/VersionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/VersionJavaType.java
index 0c6ec96ceb51..9aa3a6417093 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/VersionJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/VersionJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
index 4efb44d08dda..43950ee3327e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
index c0f738938d8d..5e9296a40613 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
index b5218c59f458..058aa6f20d3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
index e297a9394064..de3b732c2c25 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
index 6386ccdb2342..f773db4b6597 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
index 0b3886879ce3..da0cdb3c8ca9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/DynamicModelJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/DynamicModelJavaType.java
index e3541b999567..c6c087da71a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/DynamicModelJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/DynamicModelJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
index 812bfa9d45c5..d41e91085967 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
index a75f42ca8520..fd22c604f73c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
index 1c0de795ce35..fe2b8a336629 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBaseline.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBaseline.java
index 68cf0c783600..6008588752f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBaseline.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBaseline.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
index cbb4f2895a25..33aaf99078ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
index 37870323b34a..fc0a88c139db 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JdbcTypeRecommendationException.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JdbcTypeRecommendationException.java
index 012280ec31d7..8735d3cde8dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JdbcTypeRecommendationException.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JdbcTypeRecommendationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JsonJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JsonJavaType.java
index 271d35796e82..989b5bf276da 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JsonJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JsonJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
index b8092a84580d..ada08bc431e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/PrimitiveJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/PrimitiveJavaType.java
index 885a54f95f49..f514f4b9af69 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/PrimitiveJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/PrimitiveJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
index 1cf2f2fcd127..b5fc20f206a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
index 5dbf6127c3ca..d9174a6bf32b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/XmlJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/XmlJavaType.java
index a051dd0cb5d6..a656366dd542 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/XmlJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/XmlJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AdjustableJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AdjustableJdbcType.java
index 30763b800bec..6ea88a4ce5c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AdjustableJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AdjustableJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AggregateJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AggregateJdbcType.java
index d35f89f2ef35..85e48975c491 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AggregateJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/AggregateJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
index 82375fde86e9..c568df1bdedc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcTypeConstructor.java
index 717122fe1489..5b91eaf0f14f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcTypeConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
index c50c9a8ec575..bfdbac96dafa 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
index a7f7697f6f29..eb7038453566 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
index b31ad2435577..c44887107538 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
@@ -15,7 +13,6 @@
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterNumericData;
 import org.hibernate.type.spi.TypeConfiguration;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryJdbcType.java
index e04b6e7e214a..52b20c3c63a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 import java.sql.Types;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
index 5cc00d56c44b..d458b4206ba7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
index d76e6f94a16a..24627c430b4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/CharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/CharJdbcType.java
index 69c163d3c9cc..21e63ea98c2d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/CharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/CharJdbcType.java
@@ -1,16 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
 import java.sql.Types;
 
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * Descriptor for {@link Types#CHAR CHAR} handling.
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ClobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ClobJdbcType.java
index 14628792d26c..0d761d4da4cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ClobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ClobJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
index 15eb1bbcf0bd..7c68fae5da7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
index 6494c1d65386..65a968e0b358 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
index ed7adc42a06c..e901f181f036 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
index ffd5e93fe4c0..15c539885d8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
@@ -16,7 +14,6 @@
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterNumericData;
 import org.hibernate.type.spi.TypeConfiguration;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DurationJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DurationJdbcType.java
index 9342b9b5284e..65c29eb8d9ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DurationJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DurationJdbcType.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
 import java.sql.Types;
-import java.time.Duration;
 
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.WrapperOptions;
 
 /**
  * Descriptor for {@link java.time.Duration}.
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/EnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/EnumJdbcType.java
index 2ab7b3d6d3cc..bf65929587c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/EnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/EnumJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
index a9323a80dad5..a9c6b3f68784 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/H2FormatJsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/H2FormatJsonJdbcType.java
index 4409fe7a439b..898f6a100c38 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/H2FormatJsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/H2FormatJsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java
index c1d22c9e3cb4..5e3ab89f0fda 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java
index d3b39d891f5a..624d91343fe6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantJdbcType.java
index 1525d196490d..2d54e2d2b0cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
index 3a235a8f5861..697103781bac 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JavaTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JavaTimeJdbcType.java
index 94c63cc182ad..281718a749f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JavaTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JavaTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java
index 32bd7f03b3ae..f3ba0b12b490 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcLiteralFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
index 4123d1ea3c50..e081f95a0fc5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeConstructor.java
index 5b6b2841247d..a808f5345587 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java
index 4c41b818a2b2..09b07cdf738b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
-import org.hibernate.type.SqlTypes;
 
 import java.sql.Types;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
index abc55badc0f0..40b565135f9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
index 5801185f7c3f..6edb34375ed8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
index 7883b54986d6..f7408eea5c19 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
index ba6c73503193..e7a6a6563c3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LobTypeMappings.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LobTypeMappings.java
index 7d67db44c3c9..f0c207b049bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LobTypeMappings.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LobTypeMappings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateJdbcType.java
index 8165b7fc8c11..c80ada5dc352 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateTimeJdbcType.java
index 04514a81ca01..f25ad233d968 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalDateTimeJdbcType.java
@@ -1,21 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
 import java.time.LocalDateTime;
 
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.internal.AbstractJavaTimeJdbcType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterTemporal;
-import org.hibernate.type.descriptor.jdbc.internal.SetObjectBinder;
 
 import jakarta.persistence.TemporalType;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalTimeJdbcType.java
index 496c52b5de82..769f7e62737e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LocalTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongNVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongNVarcharJdbcType.java
index 777f2d454e4a..6fb3f0501a9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongNVarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongNVarcharJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryJdbcType.java
index 3334aaca4d05..b147796c6ad3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharJdbcType.java
index 4f54cc752476..5740bf3731f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NCharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NCharJdbcType.java
index 8771c311ee9b..b652faa8ae7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NCharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NCharJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
index 24bd37ee22e0..c4eac2161cc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
index 9bbcba4123cf..05479ceb69e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NationalizedTypeMappings.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NationalizedTypeMappings.java
index 30bad1a3962a..2974419f2e9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NationalizedTypeMappings.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NationalizedTypeMappings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NullJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NullJdbcType.java
index 3e44d77bc1b0..fcbd7b79112c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NullJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NullJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NumericJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NumericJdbcType.java
index 4577fcd0a745..32deb273c3ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NumericJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NumericJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
index 5079d5f10204..c19725012eb3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsBinaryTypeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsBinaryTypeJdbcType.java
index a96406ecbf8a..ff981962d301 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsBinaryTypeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsBinaryTypeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsNullTypeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsNullTypeJdbcType.java
index d76ff044e6ef..ffbcea45abf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsNullTypeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullAsNullTypeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullResolvingJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullResolvingJdbcType.java
index b1fd1bdb0178..d5d433f527f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullResolvingJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectNullResolvingJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetDateTimeJdbcType.java
index 7858665386e6..24f044c3ee07 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetDateTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetDateTimeJdbcType.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetTimeJdbcType.java
index b9ca4af0e8a9..dbf244f87c62 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OffsetTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonBlobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonBlobJdbcType.java
index 78a15af2451f..3e34b24809b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonBlobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonBlobJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OrdinalEnumJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OrdinalEnumJdbcType.java
index 70d11301c5b3..cb626f809900 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OrdinalEnumJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OrdinalEnumJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
index 146ef56edf89..9e0e1498f3d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
 import java.sql.Types;
 
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RowIdJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RowIdJdbcType.java
index a8e9e029f69e..b9787edc03a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RowIdJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RowIdJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
index 9fef24f5054a..5ae91a8ff9b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SqlTypedJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SqlTypedJdbcType.java
index 9dccac6581c6..b086667f9fb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SqlTypedJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SqlTypedJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
index fa50243ac1df..77bd03b90a73 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
index 19c4b7584157..c8bc0d724f0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
index 65e3edb170ae..2dea700eac9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
index cb9071ec9f14..e13e2c98296d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
index a6a6b40f35a2..8091a37ff86f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
index de8e462628e1..f8358ae717a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
index c170a889973a..d4dd22fdfb6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
index 22494f8674cf..920bbf65b516 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
index fa2b7f215577..ba7a089b8360 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
index 35b53c557c82..a85f83b430c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
index b775ad000f38..4443691ff10b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterTemporal;
 import org.hibernate.type.spi.TypeConfiguration;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntAsSmallIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntAsSmallIntJdbcType.java
index 47ab3666c198..da886d6713f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntAsSmallIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntAsSmallIntJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
index b0095ce6589a..d27adc77d6c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
@@ -15,7 +13,6 @@
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterNumericData;
 import org.hibernate.type.spi.TypeConfiguration;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/UUIDJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/UUIDJdbcType.java
index aad166afb329..3089dd5fb3ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/UUIDJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/UUIDJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
index 4558aaa133f1..52e59329b4e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
index f5e7fe7ade83..55ac8ef5d374 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
index 741a1978d3ff..d6376c8e1133 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
index 9341bede908a..58dd303d0904 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ZonedDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ZonedDateTimeJdbcType.java
index 8f49642a2550..637e3af589f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ZonedDateTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ZonedDateTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
index 7f24cc31d2d6..7f33b8882065 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
index 26cb402fdf86..f3616dd7bc7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/GetObjectExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/GetObjectExtractor.java
index 2f28f92f00d8..ba977b37307a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/GetObjectExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/GetObjectExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java
index f48de51508e6..d694bdc7f11c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterArray.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBinary.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBinary.java
index 8b6d93adbddc..ef3ef29dc477 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBinary.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBinary.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBoolean.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBoolean.java
index 7edc47fbb90b..cd900f2330e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBoolean.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterBoolean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterCharacterData.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterCharacterData.java
index 9fffd946c8ba..e062af9381bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterCharacterData.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterCharacterData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterNumericData.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterNumericData.java
index 50e2b85b6998..820c9ef9c544 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterNumericData.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterNumericData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java
index 719b2d67de2f..6697f86363aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java
index 57df01290e15..c7dbf742b70e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterUUIDData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcTypeBaseline.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcTypeBaseline.java
index d263053b0b50..3cba38590b03 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcTypeBaseline.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcTypeBaseline.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/SetObjectBinder.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/SetObjectBinder.java
index 1c993c78c8dd..1add99353056 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/SetObjectBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/SetObjectBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/AbstractJdbcLiteralFormatter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/AbstractJdbcLiteralFormatter.java
index bcf0dc8ba898..ef54fefe593b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/AbstractJdbcLiteralFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/AbstractJdbcLiteralFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
index d21161ecb659..8d9b6004fba1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/JdbcTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/JdbcTypeRegistry.java
index 2760d9665968..015fb44e2bfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/JdbcTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/JdbcTypeRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.jdbc.spi;
 
@@ -53,7 +51,7 @@ public class JdbcTypeRegistry implements JdbcTypeBaseline.BaselineTarget, Serial
 	 * {@link JdbcTypeConstructor#resolveType(TypeConfiguration, Dialect, JdbcType, ColumnTypeInformation)} and
 	 * {@link JdbcTypeConstructor#resolveType(TypeConfiguration, Dialect, BasicType, ColumnTypeInformation)} in a single
 	 * map.
- 	 */
+	 */
 	private final ConcurrentHashMap typeConstructorDescriptorMap = new ConcurrentHashMap<>();
 	private final ConcurrentHashMap sqlTypedDescriptorMap = new ConcurrentHashMap<>();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/DdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/DdlType.java
index a3dca0eb66bb..ce2ab06b8c33 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/DdlType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/DdlType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/ArrayDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/ArrayDdlTypeImpl.java
index 69844484b866..3b5a77d66c24 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/ArrayDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/ArrayDdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/BinaryFloatDdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/BinaryFloatDdlType.java
index 6f9aa1fb385d..4c7f3b4f0f61 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/BinaryFloatDdlType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/BinaryFloatDdlType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
index 83dabad4224c..74dadd9a2a10 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
index e588a54f9965..1cba99b9eb1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
index 1438c2f6bd61..3c41ea4c743b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
index c4d6f7369b25..77cc41843327 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
index 13c5737ecfcd..a25565baec1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
index 85d5005ed309..ac3a53bd6ba1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/Scale6IntervalSecondDdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/Scale6IntervalSecondDdlType.java
index 16103aa6a089..c929d1125d0a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/Scale6IntervalSecondDdlType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/Scale6IntervalSecondDdlType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
index 1d8ad5e54472..c0f448a9cdb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.sql.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
index 4a1a6b906055..87f72f87af18 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/FormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/FormatMapper.java
index bc40b45558b4..e616733a53cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/FormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/FormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
index 10460b012e51..3f39583ab77d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jackson;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java
index fe4b41b4f9b9..49b7ec9a83ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonJsonFormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jackson;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
index a463d5903565..a841535f570b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jackson;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JakartaJsonIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JakartaJsonIntegration.java
index 62aed3fec44f..137d32832f2e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JakartaJsonIntegration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JakartaJsonIntegration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jakartajson;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JsonBJsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JsonBJsonFormatMapper.java
index 293174beca35..778847837123 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JsonBJsonFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jakartajson/JsonBJsonFormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jakartajson;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
index 8037d8966bee..629d393ed189 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jaxb;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
index 0ce81eacbf0e..fbc1e8dd9ab6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
index 537cefd28455..faf35c50f987 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java
index baec814be086..354de208cc72 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java
index e2919938538f..c265377ccc15 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedPrimitiveBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedPrimitiveBasicTypeImpl.java
index 8c297a1e8095..59bfc87ed6d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedPrimitiveBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedPrimitiveBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ImmutableNamedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ImmutableNamedBasicTypeImpl.java
index ae8ddf8c5fbb..ccf60841de93 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/ImmutableNamedBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/ImmutableNamedBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/NamedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/NamedBasicTypeImpl.java
index 2a738f01c8c6..b68c88d23e46 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/NamedBasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/NamedBasicTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
index 739d4c4846c1..c53bcc38b09c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
index d02d303bfb6d..28a8d69a9d4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java
index b80184d6b151..d72f7eed70e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeVersionJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeVersionJavaTypeWrapper.java
index c22554a8a40d..0262b3117d4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeVersionJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeVersionJavaTypeWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/CompositeTypeImplementor.java b/hibernate-core/src/main/java/org/hibernate/type/spi/CompositeTypeImplementor.java
index 4792449295c8..fe0bfa6d5508 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/CompositeTypeImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/CompositeTypeImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeBootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeBootstrapContext.java
index 11c398b42f70..e62f28c5e900 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeBootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeBootstrapContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
index 93aa5d361427..11dac8173e26 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfigurationAware.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfigurationAware.java
index 8805751c3e7e..9990e0e0bd90 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfigurationAware.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfigurationAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.spi;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/BaseUserTypeSupport.java b/hibernate-core/src/main/java/org/hibernate/usertype/BaseUserTypeSupport.java
index 7315818a8169..2df98108304f 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/BaseUserTypeSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/BaseUserTypeSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/CompositeUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/CompositeUserType.java
index 994ad30801c8..40856f669a6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/CompositeUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/CompositeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java b/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
index e378246e6677..0ac19ecf9059 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java
index 91027522d5ca..2e1b7b871305 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
@@ -10,7 +8,7 @@
 
 /**
  * A custom type that may function as an identifier or discriminator type
- * 
+ *
  * @author Gavin King
  */
 public interface EnhancedUserType extends UserType {
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/LoggableUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/LoggableUserType.java
index 22be20a34917..202f395a0602 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/LoggableUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/LoggableUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java b/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
index d49af0dbc423..bf8a3e03c894 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java b/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java
index 921a79b1bd02..0732c77ee530 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java
index 8dcb87110206..f05c94214586 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
index 367bd8d75d7e..bbe1c97ecb15 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeLegacyBridge.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeLegacyBridge.java
index 1d43436af86b..bfb11561edca 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeLegacyBridge.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeLegacyBridge.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeSupport.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeSupport.java
index b0eb153d20f8..e316e4da60d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java
index 5183153f1d49..be8b29ed01fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/internal/AbstractTimeZoneStorageCompositeUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/internal/AbstractTimeZoneStorageCompositeUserType.java
index 76e7a38cb90e..e1dfbd5c63f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/internal/AbstractTimeZoneStorageCompositeUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/internal/AbstractTimeZoneStorageCompositeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetDateTimeCompositeUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetDateTimeCompositeUserType.java
index 493781439a50..a744c1a45f72 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetDateTimeCompositeUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetDateTimeCompositeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype.internal;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetTimeCompositeUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetTimeCompositeUserType.java
index 0f29a75eb261..5999e7b4d2fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetTimeCompositeUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/internal/OffsetTimeCompositeUserType.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype.internal;
 
-import java.time.LocalTime;
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/internal/ZonedDateTimeCompositeUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/internal/ZonedDateTimeCompositeUserType.java
index e7f002a41a7e..b0dc2e1cccb3 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/internal/ZonedDateTimeCompositeUserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/internal/ZonedDateTimeCompositeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.usertype.internal;
 
diff --git a/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java b/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java
index 05f831a267c9..3a8c78b109cc 100644
--- a/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java
+++ b/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/NoPackageEntity.java b/hibernate-core/src/test/java/NoPackageEntity.java
index ed58fcb47a1e..eebf78ed3b46 100644
--- a/hibernate-core/src/test/java/NoPackageEntity.java
+++ b/hibernate-core/src/test/java/NoPackageEntity.java
@@ -1,16 +1,8 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-//$Id$
-
-/**
- * @author Emmanuel Bernard
- */
-public class NoPackageEntity {
-	private Integer id;
-	private String name;
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+public class NoPackageEntity {
+	private Integer id;
+	private String name;
+}
diff --git a/hibernate-core/src/test/java/NoPackageTest.java b/hibernate-core/src/test/java/NoPackageTest.java
index 4b1dee44a5a6..2ba659b027e5 100644
--- a/hibernate-core/src/test/java/NoPackageTest.java
+++ b/hibernate-core/src/test/java/NoPackageTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/from/In.java b/hibernate-core/src/test/java/from/In.java
index b3bf830ec446..6cf7664bbff6 100644
--- a/hibernate-core/src/test/java/from/In.java
+++ b/hibernate-core/src/test/java/from/In.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package from;
 
diff --git a/hibernate-core/src/test/java/in/from/Any.java b/hibernate-core/src/test/java/in/from/Any.java
index 12863e473aac..d68eaaa5b566 100644
--- a/hibernate-core/src/test/java/in/from/Any.java
+++ b/hibernate-core/src/test/java/in/from/Any.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package in.from;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java b/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java
index 3a192cd4fa7e..af7143005185 100644
--- a/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolverTest.java b/hibernate-core/src/test/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolverTest.java
index 27dfd9498dc6..26895dcd62af 100644
--- a/hibernate-core/src/test/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
@@ -94,4 +92,4 @@ void resolve_dtd_localResource(String id, String expectedLocalResource) throws X
 				.hasSameContentAs( getClass().getClassLoader().getResourceAsStream( expectedLocalResource ) );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java
index 5978a3ade7f0..3ba93058b2ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java
@@ -1,20 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-import org.hibernate.bytecode.internal.bytebuddy.BasicProxyFactoryImpl;
-import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java
index 020358a6b755..68efa4585cc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java
index fa9a4686fa84..e5a7aa48cd46 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/GenerateProxiesTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/GenerateProxiesTest.java
index b50538855ec2..a1ae08fe2c86 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/GenerateProxiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/GenerateProxiesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.bytecode.internal.bytebuddy;
 
 import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/MappedSuperclassEntity.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/MappedSuperclassEntity.java
index 5b77ab9fffae..3a93ed58b9ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/MappedSuperclassEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/MappedSuperclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java
index 17222c8e6f80..94fc85f31b72 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java
index 3dc8ec4be544..9aeeeb00a0e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/mappedsuperclass/BaseMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/mappedsuperclass/BaseMappedSuperclass.java
index 376a136e32ea..0a46725f97b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/mappedsuperclass/BaseMappedSuperclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/mappedsuperclass/BaseMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.internal.bytebuddy.mappedsuperclass;
 
@@ -12,8 +10,8 @@
 @MappedSuperclass
 public abstract class BaseMappedSuperclass {
 
-  @Id
-  protected Long id;
+@Id
+protected Long id;
 
-  protected long value;
+protected long value;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/spi/ByteCodeHelper.java b/hibernate-core/src/test/java/org/hibernate/bytecode/spi/ByteCodeHelper.java
index 39fe29884497..cb8862486360 100644
--- a/hibernate-core/src/test/java/org/hibernate/bytecode/spi/ByteCodeHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/bytecode/spi/ByteCodeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.bytecode.spi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/DB2iDialectTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/DB2iDialectTest.java
index 4167d5d9dd76..745795f04805 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/DB2iDialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/DB2iDialectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.dialect;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -8,62 +12,62 @@
 
 class DB2iDialectTest {
 
-    private static final String EXPECTED_FOR_UPDATE = " for update with rs";
-    private static final String EXPECTED_FOR_UPDATE_SKIP_LOCK = " for update with rs skip locked data";
+	private static final String EXPECTED_FOR_UPDATE = " for update with rs";
+	private static final String EXPECTED_FOR_UPDATE_SKIP_LOCK = " for update with rs skip locked data";
 
-    private DB2iDialect dialect;
+	private DB2iDialect dialect;
 
-    @BeforeEach
-    void setUp() {
-        dialect = new DB2iDialect();
-    }
+	@BeforeEach
+	void setUp() {
+		dialect = new DB2iDialect();
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getForUpdateString() {
-        String actual = dialect.getForUpdateString();
-        assertEquals(EXPECTED_FOR_UPDATE, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getForUpdateString() {
+		String actual = dialect.getForUpdateString();
+		assertEquals(EXPECTED_FOR_UPDATE, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getForUpdateSkipLockedString() {
-        String actual = dialect.getForUpdateSkipLockedString();
-        assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getForUpdateSkipLockedString() {
+		String actual = dialect.getForUpdateSkipLockedString();
+		assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void testGetForUpdateSkipLockedString() {
-        String actual = dialect.getForUpdateSkipLockedString("alias");
-        assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void testGetForUpdateSkipLockedString() {
+		String actual = dialect.getForUpdateSkipLockedString("alias");
+		assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getWriteLockString_skiplocked() {
-        String actual = dialect.getWriteLockString(-2);
-        assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getWriteLockString_skiplocked() {
+		String actual = dialect.getWriteLockString(-2);
+		assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getWriteLockString() {
-        String actual = dialect.getWriteLockString(0);
-        assertEquals(EXPECTED_FOR_UPDATE, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getWriteLockString() {
+		String actual = dialect.getWriteLockString(0);
+		assertEquals(EXPECTED_FOR_UPDATE, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getReadLockString() {
-        String actual = dialect.getReadLockString(0);
-        assertEquals(EXPECTED_FOR_UPDATE, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getReadLockString() {
+		String actual = dialect.getReadLockString(0);
+		assertEquals(EXPECTED_FOR_UPDATE, actual);
+	}
 
-    @Test
-    @JiraKey("HHH-18560")
-    void getReadLockString_skipLocked() {
-        String actual = dialect.getReadLockString(-2);
-        assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
-    }
+	@Test
+	@JiraKey("HHH-18560")
+	void getReadLockString_skipLocked() {
+		String actual = dialect.getReadLockString(-2);
+		assertEquals(EXPECTED_FOR_UPDATE_SKIP_LOCK, actual);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java
index 0808cedfe4d3..3f6a74a11c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java
@@ -1,26 +1,18 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.dialect;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
-import java.util.EnumSet;
 import java.util.Map;
 
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
-import org.hibernate.orm.test.dialect.resolver.TestingDialectResolutionInfo;
-import org.hibernate.tool.hbm2ddl.SchemaUpdate;
-import org.hibernate.tool.schema.TargetType;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Test;
 
 @RequiresDialect(H2Dialect.class)
@@ -33,7 +25,7 @@ public void snapshotVersion() {
 		Dialect dialect = new H2Dialect( new TestingH2DialectResolutionInfo( version ) );
 		assertEquals(229, dialect.getVersion().getMicro());
 	}
-	
+
 	@Test
 	public void releaseVersion() {
 		String version = "2.2.224 (2023-09-17)";
@@ -98,7 +90,7 @@ public String toString() {
 		public Map getConfigurationValues() {
 			return Map.of();
 		}
-		
+
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java
index f8e061460ac7..944810148fcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.dialect;
 
 import java.util.Map;
@@ -23,7 +27,7 @@ public void versionWithSuffix() {
 		assertEquals(0, dialect.getVersion().getMinor());
 		assertEquals(37, dialect.getVersion().getMicro());
 	}
-	
+
 	@Test
 	public void releaseVersion() {
 		String version = "8.0.37";
@@ -91,7 +95,7 @@ public String toString() {
 		public Map getConfigurationValues() {
 			return Map.of();
 		}
-		
+
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/BlobProxyTest.java b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/BlobProxyTest.java
index dd0068550bed..7f8f1e07e2d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/BlobProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/BlobProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.engine.jdbc;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -11,10 +15,10 @@
 @JiraKey("HHH-17770")
 class BlobProxyTest {
 
-    @Test
-    void testLengthIsNotTruncated() throws SQLException {
-        long THREE_GB = 3 * 1024 * 1024 * 1024L;
-        Blob blob = BlobProxy.generateProxy(null, THREE_GB);
-        assertEquals(THREE_GB, blob.length());
-    }
+	@Test
+	void testLengthIsNotTruncated() throws SQLException {
+		long THREE_GB = 3 * 1024 * 1024 * 1024L;
+		Blob blob = BlobProxy.generateProxy(null, THREE_GB);
+		assertEquals(THREE_GB, blob.length());
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java
index ec7fe8e0b6bf..d30744737e1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.engine.jdbc.env.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java
index 0dd4502be637..7932031d704a 100644
--- a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event;
 
 import jakarta.persistence.Entity;
@@ -32,7 +36,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Override
 	protected void sessionFactoryBuilt(SessionFactoryImplementor factory) {
-        factory.getServiceRegistry().requireService( EventListenerRegistry.class )
+		factory.getServiceRegistry().requireService( EventListenerRegistry.class )
 				.appendListeners( EventType.PRE_UPDATE, event -> true );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java
index bc7e36e1c938..2171cb6dd002 100644
--- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.service.internal;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java
index 3d6d3d479779..6547618fdeb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.service.internal;
 
@@ -15,7 +13,6 @@
 import org.hibernate.event.spi.EventType;
 import org.hibernate.event.spi.MergeEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
@@ -64,7 +61,7 @@ private void runAppendListenerTest(
 			DefaultMergeEventListener mergeEventListener) {
 		inTransaction( session -> {
 
-            EventListenerGroup group =
+			EventListenerGroup group =
 					sessionFactory().getServiceRegistry()
 							.requireService( EventListenerRegistry.class )
 							.getEventListenerGroup( EventType.MERGE );
diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java
index d0816d41bf53..739ce8dd6c23 100644
--- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.service.internal;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
index afcd369b64fe..0e56fba4d9e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java
index af5d11cbacac..b376d5e60e1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterface.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterface.java
index d319dc3fcbd3..797fae242063 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterface.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.cid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java
index f96ac01d7324..f01d5438b91b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java
index c3ce4c5b89d6..2dd243f24b46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Address.java
index afa248d0f658..dbceb8f5ef57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AddressImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AddressImpl.java
index 32bea37a2ad9..7cd4e86590e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AddressImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AddressImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Server.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Server.java
index e89556fcebb4..a46890577883 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Server.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/Server.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/ServerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/ServerImpl.java
index c2739a4bcc23..13d3ed9d1f7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/ServerImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/ServerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.abstractembeddedcomponents.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
index 7fa27c9f9393..2ab479ef2da6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.actionqueue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
index a07c18a1e8e8..72b6195dc2ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.actionqueue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java
index b625d0aa7986..968f22f0e2cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.aggregation;
 
 import java.util.UUID;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320.java
index 3ccbaaab3dbd..f7eb21a0fa53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320b.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320b.java
index c51c3e695836..2d91c2c4d0eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320b.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/A320b.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/AmericaCupClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/AmericaCupClass.java
index ae83c27d52a0..c7e8bb806de2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/AmericaCupClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/AmericaCupClass.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Boat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Boat.java
index 2c16cb3c9e9b..19ed3d7f0da6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Boat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Boat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java
index dd2d6204be29..6fcb8afbb5c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import java.util.Date;
@@ -47,6 +43,6 @@ public void setName(String string) {
 
 	//should be treated as getter
 	private int[] getWorkingHoursPerWeek(Set holidayDays) {
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java
index 6f69d1ea380f..558275932994 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 
 import org.hibernate.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Country.java
index 524b7097f088..957b62795ece 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Country.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java
index be90e5e60c04..653677277969 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations;
 
 import org.hibernate.Session;
@@ -26,188 +30,188 @@
  */
 public class CreationTimestampTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                Event.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				Event.class
+		};
+	}
 
-    @Entity(name = "Event")
-    private static class Event {
+	@Entity(name = "Event")
+	private static class Event {
 
-        @Id
-        @GeneratedValue
-        private Long id;
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        @Column(name = "`date`")
-        @CreationTimestamp
-        private Date date;
+		@Column(name = "`date`")
+		@CreationTimestamp
+		private Date date;
 
-        @Column(name = "`calendar`")
-        @CreationTimestamp
-        private Calendar calendar;
+		@Column(name = "`calendar`")
+		@CreationTimestamp
+		private Calendar calendar;
 
-        @Column(name = "`sqlDate`")
-        @CreationTimestamp
-        private java.sql.Date sqlDate;
+		@Column(name = "`sqlDate`")
+		@CreationTimestamp
+		private java.sql.Date sqlDate;
 
-        @Column(name = "`time`")
-        @CreationTimestamp
-        private Time time;
+		@Column(name = "`time`")
+		@CreationTimestamp
+		private Time time;
 
-        @Column(name = "`timestamp`")
-        @CreationTimestamp
-        private Timestamp timestamp;
+		@Column(name = "`timestamp`")
+		@CreationTimestamp
+		private Timestamp timestamp;
 
-        @Column(name = "`instant`")
-        @CreationTimestamp
-        private Instant instant;
+		@Column(name = "`instant`")
+		@CreationTimestamp
+		private Instant instant;
 
-        @Column(name = "`localDate`")
-        @CreationTimestamp
-        private LocalDate localDate;
+		@Column(name = "`localDate`")
+		@CreationTimestamp
+		private LocalDate localDate;
 
-        @Column(name = "`localDateTime`")
-        @CreationTimestamp
-        private LocalDateTime localDateTime;
+		@Column(name = "`localDateTime`")
+		@CreationTimestamp
+		private LocalDateTime localDateTime;
 
-        @Column(name = "`localTime`")
-        @CreationTimestamp
-        private LocalTime localTime;
-
-        @Column(name = "`monthDay`")
-        @CreationTimestamp
-        private MonthDay monthDay;
-
-        @Column(name = "`offsetDateTime`")
-        @CreationTimestamp
-        private OffsetDateTime offsetDateTime;
-
-        @Column(name = "`offsetTime`")
-        @CreationTimestamp
-        private OffsetTime offsetTime;
-
-        @Column(name = "`year`")
-        @CreationTimestamp
-        private Year year;
-
-        @Column(name = "`yearMonth`")
-        @CreationTimestamp
-        private YearMonth yearMonth;
-
-        @Column(name = "`zonedDateTime`")
-        @CreationTimestamp
-        private ZonedDateTime zonedDateTime;
-
-        public Event() {
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public Date getDate() {
-            return date;
-        }
-
-        public Calendar getCalendar() {
-            return calendar;
-        }
-
-        public java.sql.Date getSqlDate() {
-            return sqlDate;
-        }
-
-        public Time getTime() {
-            return time;
-        }
-
-        public Timestamp getTimestamp() {
-            return timestamp;
-        }
-
-        public Instant getInstant() {
-            return instant;
-        }
-
-        public LocalDate getLocalDate() {
-            return localDate;
-        }
-
-        public LocalDateTime getLocalDateTime() {
-            return localDateTime;
-        }
-
-        public LocalTime getLocalTime() {
-            return localTime;
-        }
-
-        public MonthDay getMonthDay() {
-            return monthDay;
-        }
-
-        public OffsetDateTime getOffsetDateTime() {
-            return offsetDateTime;
-        }
-
-        public OffsetTime getOffsetTime() {
-            return offsetTime;
-        }
-
-        public Year getYear() {
-            return year;
-        }
-
-        public YearMonth getYearMonth() {
-            return yearMonth;
-        }
-
-        public ZonedDateTime getZonedDateTime() {
-            return zonedDateTime;
-        }
-    }
-
-    @Test
-    public void generatesCurrentTimestamp() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Event event = new Event();
-            entityManager.persist(event);
-            entityManager.flush();
-            check( event );
-        });
-    }
-
-    @Test
-    @JiraKey( value = "HHH-16240")
-    public void generatesCurrentTimestampInStatelessSession() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Session session = entityManager.unwrap( Session.class);
-            try (StatelessSession statelessSession = session.getSessionFactory().openStatelessSession()) {
-                Event event = new Event();
-                statelessSession.getTransaction().begin();
-                statelessSession.insert(event);
-                statelessSession.getTransaction().commit();
-                check( event );
-            }
-        });
-    }
-
-    private void check(Event event) {
-        Assert.assertNotNull(event.getDate());
-        Assert.assertNotNull(event.getCalendar());
-        Assert.assertNotNull(event.getSqlDate());
-        Assert.assertNotNull(event.getTime());
-        Assert.assertNotNull(event.getTimestamp());
-        Assert.assertNotNull(event.getInstant());
-        Assert.assertNotNull(event.getLocalDate());
-        Assert.assertNotNull(event.getLocalDateTime());
-        Assert.assertNotNull(event.getLocalTime());
-        Assert.assertNotNull(event.getMonthDay());
-        Assert.assertNotNull(event.getOffsetDateTime());
-        Assert.assertNotNull(event.getOffsetTime());
-        Assert.assertNotNull(event.getYear());
-        Assert.assertNotNull(event.getYearMonth());
-        Assert.assertNotNull(event.getZonedDateTime());
-    }
+		@Column(name = "`localTime`")
+		@CreationTimestamp
+		private LocalTime localTime;
+
+		@Column(name = "`monthDay`")
+		@CreationTimestamp
+		private MonthDay monthDay;
+
+		@Column(name = "`offsetDateTime`")
+		@CreationTimestamp
+		private OffsetDateTime offsetDateTime;
+
+		@Column(name = "`offsetTime`")
+		@CreationTimestamp
+		private OffsetTime offsetTime;
+
+		@Column(name = "`year`")
+		@CreationTimestamp
+		private Year year;
+
+		@Column(name = "`yearMonth`")
+		@CreationTimestamp
+		private YearMonth yearMonth;
+
+		@Column(name = "`zonedDateTime`")
+		@CreationTimestamp
+		private ZonedDateTime zonedDateTime;
+
+		public Event() {
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Date getDate() {
+			return date;
+		}
+
+		public Calendar getCalendar() {
+			return calendar;
+		}
+
+		public java.sql.Date getSqlDate() {
+			return sqlDate;
+		}
+
+		public Time getTime() {
+			return time;
+		}
+
+		public Timestamp getTimestamp() {
+			return timestamp;
+		}
+
+		public Instant getInstant() {
+			return instant;
+		}
+
+		public LocalDate getLocalDate() {
+			return localDate;
+		}
+
+		public LocalDateTime getLocalDateTime() {
+			return localDateTime;
+		}
+
+		public LocalTime getLocalTime() {
+			return localTime;
+		}
+
+		public MonthDay getMonthDay() {
+			return monthDay;
+		}
+
+		public OffsetDateTime getOffsetDateTime() {
+			return offsetDateTime;
+		}
+
+		public OffsetTime getOffsetTime() {
+			return offsetTime;
+		}
+
+		public Year getYear() {
+			return year;
+		}
+
+		public YearMonth getYearMonth() {
+			return yearMonth;
+		}
+
+		public ZonedDateTime getZonedDateTime() {
+			return zonedDateTime;
+		}
+	}
+
+	@Test
+	public void generatesCurrentTimestamp() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Event event = new Event();
+			entityManager.persist(event);
+			entityManager.flush();
+			check( event );
+		});
+	}
+
+	@Test
+	@JiraKey( value = "HHH-16240")
+	public void generatesCurrentTimestampInStatelessSession() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Session session = entityManager.unwrap( Session.class);
+			try (StatelessSession statelessSession = session.getSessionFactory().openStatelessSession()) {
+				Event event = new Event();
+				statelessSession.getTransaction().begin();
+				statelessSession.insert(event);
+				statelessSession.getTransaction().commit();
+				check( event );
+			}
+		});
+	}
+
+	private void check(Event event) {
+		Assert.assertNotNull(event.getDate());
+		Assert.assertNotNull(event.getCalendar());
+		Assert.assertNotNull(event.getSqlDate());
+		Assert.assertNotNull(event.getTime());
+		Assert.assertNotNull(event.getTimestamp());
+		Assert.assertNotNull(event.getInstant());
+		Assert.assertNotNull(event.getLocalDate());
+		Assert.assertNotNull(event.getLocalDateTime());
+		Assert.assertNotNull(event.getLocalTime());
+		Assert.assertNotNull(event.getMonthDay());
+		Assert.assertNotNull(event.getOffsetDateTime());
+		Assert.assertNotNull(event.getOffsetTime());
+		Assert.assertNotNull(event.getYear());
+		Assert.assertNotNull(event.getYearMonth());
+		Assert.assertNotNull(event.getZonedDateTime());
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Customer.java
index f7bbbed1c155..c5cde4a32a2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import java.util.Collection;
@@ -91,4 +87,3 @@ public void setPassport(Passport passport) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java
index 63b93e1de602..48057c79f369 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
@@ -38,81 +36,81 @@
 @JiraKey( "HHH-11096" )
 @RequiresDialectFeature( feature = DialectFeatureChecks.UsesStandardCurrentTimestampFunction.class )
 @Jpa(
-        annotatedClasses = {
-                DatabaseCreationTimestampNullableColumnTest.Person.class
-        }
+		annotatedClasses = {
+				DatabaseCreationTimestampNullableColumnTest.Person.class
+		}
 )
 public class DatabaseCreationTimestampNullableColumnTest {
 
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @NaturalId
-        private String name;
-
-        @Column(nullable = false)
-        @FunctionCreationTimestamp
-        private Date creationDate;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Date getCreationDate() {
-            return creationDate;
-        }
-
-        public void setCreationDate(Date creationDate) {
-            this.creationDate = creationDate;
-        }
-
-    }
-
-    @ValueGenerationType(generatedBy = FunctionCreationValueGeneration.class)
-    @Retention(RetentionPolicy.RUNTIME)
-    public @interface FunctionCreationTimestamp {}
-
-    public static class FunctionCreationValueGeneration implements OnExecutionGenerator {
-        @Override
-        public EnumSet getEventTypes() {
-            return EventTypeSets.INSERT_ONLY;
-        }
-
-        @Override
-        public boolean referenceColumnsInSql(Dialect dialect) {
-            return true;
-        }
-
-        @Override
-        public boolean writePropertyValue() {
-            return false;
-        }
-
-        @Override
-        public String[] getReferencedColumnValues(Dialect dialect) {
-            return new String[] { dialect.currentTimestamp() };
-        }
-    }
-
-    @Test
-    public void generatesCurrentTimestamp(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    Person person = new Person();
-                    person.setName("John Doe");
-                    entityManager.persist(person);
-
-                    entityManager.flush();
-                    Assertions.assertNotNull(person.getCreationDate());
-                }
-        );
-    }
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@NaturalId
+		private String name;
+
+		@Column(nullable = false)
+		@FunctionCreationTimestamp
+		private Date creationDate;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Date getCreationDate() {
+			return creationDate;
+		}
+
+		public void setCreationDate(Date creationDate) {
+			this.creationDate = creationDate;
+		}
+
+	}
+
+	@ValueGenerationType(generatedBy = FunctionCreationValueGeneration.class)
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface FunctionCreationTimestamp {}
+
+	public static class FunctionCreationValueGeneration implements OnExecutionGenerator {
+		@Override
+		public EnumSet getEventTypes() {
+			return EventTypeSets.INSERT_ONLY;
+		}
+
+		@Override
+		public boolean referenceColumnsInSql(Dialect dialect) {
+			return true;
+		}
+
+		@Override
+		public boolean writePropertyValue() {
+			return false;
+		}
+
+		@Override
+		public String[] getReferencedColumnValues(Dialect dialect) {
+			return new String[] { dialect.currentTimestamp() };
+		}
+	}
+
+	@Test
+	public void generatesCurrentTimestamp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Person person = new Person();
+					person.setName("John Doe");
+					entityManager.persist(person);
+
+					entityManager.flush();
+					Assertions.assertNotNull(person.getCreationDate());
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
index f451baf06e7f..a8ffbe4e2b7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
@@ -34,107 +32,107 @@
 @Jpa(annotatedClasses = DatabaseTimestampsColumnTest.Person.class)
 public class DatabaseTimestampsColumnTest {
 
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @NaturalId(mutable = true)
-        private String name;
-
-        @Column(nullable = false)
-        @Timestamp
-        private Date creationDate;
-
-        @Column(nullable = true)
-        @Timestamp(EventType.UPDATE)
-        private Date editionDate;
-
-        @Column(nullable = false, name="version")
-        @Timestamp({ EventType.INSERT, EventType.UPDATE })
-        private Date timestamp;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Date getCreationDate() {
-            return creationDate;
-        }
-
-        public Date getEditionDate() {
-            return editionDate;
-        }
-
-        public Date getTimestamp() {
-            return timestamp;
-        }
-    }
-
-    @ValueGenerationType(generatedBy = TimestampValueGeneration.class)
-    @Retention(RetentionPolicy.RUNTIME)
-    public @interface Timestamp { EventType[] value() default EventType.INSERT; }
-
-    public static class TimestampValueGeneration implements OnExecutionGenerator {
-        private EnumSet events;
-
-        public TimestampValueGeneration(Timestamp annotation, Member member, GeneratorCreationContext context) {
-            events = EventTypeSets.fromArray( annotation.value() );
-        }
-
-        @Override
-        public EnumSet getEventTypes() {
-            return events;
-        }
-
-        @Override
-        public boolean referenceColumnsInSql(Dialect dialect) {
-            return true;
-        }
-
-        @Override
-        public String[] getReferencedColumnValues(Dialect dialect) {
-            return new String[] { dialect.currentTimestamp() };
-        }
-
-        @Override
-        public boolean writePropertyValue() {
-            return false;
-        }
-    }
-
-    @Test
-    public void generatesCurrentTimestamp(EntityManagerFactoryScope scope) {
-        scope.inEntityManager(
-                entityManager -> {
-                    entityManager.getTransaction().begin();
-                    Person person = new Person();
-                    person.setName("John Doe");
-                    entityManager.persist(person);
-                    entityManager.getTransaction().commit();
-                    Date creationDate = person.getCreationDate();
-                    Assertions.assertNotNull(creationDate);
-                    Assertions.assertNull(person.getEditionDate());
-                    Date timestamp = person.getTimestamp();
-                    Assertions.assertNotNull(timestamp);
-
-                    try { Thread.sleep(1_000); } catch (InterruptedException ie) {};
-
-                    entityManager.getTransaction().begin();
-                    person.setName("Jane Doe");
-                    entityManager.getTransaction().commit();
-                    Assertions.assertNotNull(person.getCreationDate());
-                    Assertions.assertEquals(creationDate, person.getCreationDate());
-                    Assertions.assertNotNull(person.getEditionDate());
-                    Assertions.assertNotNull(person.getTimestamp());
-                    Assertions.assertNotEquals(timestamp, person.getTimestamp());
-                }
-        );
-    }
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@NaturalId(mutable = true)
+		private String name;
+
+		@Column(nullable = false)
+		@Timestamp
+		private Date creationDate;
+
+		@Column(nullable = true)
+		@Timestamp(EventType.UPDATE)
+		private Date editionDate;
+
+		@Column(nullable = false, name="version")
+		@Timestamp({ EventType.INSERT, EventType.UPDATE })
+		private Date timestamp;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Date getCreationDate() {
+			return creationDate;
+		}
+
+		public Date getEditionDate() {
+			return editionDate;
+		}
+
+		public Date getTimestamp() {
+			return timestamp;
+		}
+	}
+
+	@ValueGenerationType(generatedBy = TimestampValueGeneration.class)
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface Timestamp { EventType[] value() default EventType.INSERT; }
+
+	public static class TimestampValueGeneration implements OnExecutionGenerator {
+		private EnumSet events;
+
+		public TimestampValueGeneration(Timestamp annotation, Member member, GeneratorCreationContext context) {
+			events = EventTypeSets.fromArray( annotation.value() );
+		}
+
+		@Override
+		public EnumSet getEventTypes() {
+			return events;
+		}
+
+		@Override
+		public boolean referenceColumnsInSql(Dialect dialect) {
+			return true;
+		}
+
+		@Override
+		public String[] getReferencedColumnValues(Dialect dialect) {
+			return new String[] { dialect.currentTimestamp() };
+		}
+
+		@Override
+		public boolean writePropertyValue() {
+			return false;
+		}
+	}
+
+	@Test
+	public void generatesCurrentTimestamp(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					entityManager.getTransaction().begin();
+					Person person = new Person();
+					person.setName("John Doe");
+					entityManager.persist(person);
+					entityManager.getTransaction().commit();
+					Date creationDate = person.getCreationDate();
+					Assertions.assertNotNull(creationDate);
+					Assertions.assertNull(person.getEditionDate());
+					Date timestamp = person.getTimestamp();
+					Assertions.assertNotNull(timestamp);
+
+					try { Thread.sleep(1_000); } catch (InterruptedException ie) {};
+
+					entityManager.getTransaction().begin();
+					person.setName("Jane Doe");
+					entityManager.getTransaction().commit();
+					Assertions.assertNotNull(person.getCreationDate());
+					Assertions.assertEquals(creationDate, person.getCreationDate());
+					Assertions.assertNotNull(person.getEditionDate());
+					Assertions.assertNotNull(person.getTimestamp());
+					Assertions.assertNotEquals(timestamp, person.getTimestamp());
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Discount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Discount.java
index eeb4fb5e8073..ea3ac6253469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Discount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Discount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.CascadeType;
@@ -61,4 +57,3 @@ public void setOwner(Customer customer) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
index 45ee59fe43bf..562b0f5f41af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
@@ -450,4 +448,3 @@ public void runDropSchema(DomainModelScope domainModelScope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ferry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ferry.java
index 467b51aeb16c..a53c6ba4a70e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ferry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ferry.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java
index 19e0000e59a6..2a1d30ab7b93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/FlyingObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/FlyingObject.java
index aa77ba0fedd9..5ef402f1bc8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/FlyingObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/FlyingObject.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/GenericConverterAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/GenericConverterAutoApplyTest.java
index 76ad4277f3b5..ab3d64ca6c34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/GenericConverterAutoApplyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/GenericConverterAutoApplyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations;
 
 import jakarta.persistence.AttributeConverter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java
index 256ac083ab5b..7761e548ac0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations;
 
 import jakarta.persistence.AttributeConverter;
@@ -11,48 +15,48 @@
 
 @JiraKey( value = "HHH-16122" )
 public class HHH16122Test extends BaseEntityManagerFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { ValueConverter.class, SuperClass.class, SubClass.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { ValueConverter.class, SuperClass.class, SubClass.class };
+	}
 
-    @Test
-    public void testGenericSuperClassWithConverter() {
-        // The test is successful if the entity manager factory can be built.
-    }
+	@Test
+	public void testGenericSuperClassWithConverter() {
+		// The test is successful if the entity manager factory can be built.
+	}
 
-    public static class ConvertedValue {
-        public final long value;
-        public ConvertedValue(long value) {
-            this.value = value;
-        }
-    }
+	public static class ConvertedValue {
+		public final long value;
+		public ConvertedValue(long value) {
+			this.value = value;
+		}
+	}
 
-    @Converter(autoApply = true)
-    public static class ValueConverter implements AttributeConverter {
-        @Override
-        public Long convertToDatabaseColumn( ConvertedValue value ) {
-            return value.value;
-        }
-        @Override
-        public ConvertedValue convertToEntityAttribute( Long value ) {
-            return new ConvertedValue(value);
-        }
-    }
+	@Converter(autoApply = true)
+	public static class ValueConverter implements AttributeConverter {
+		@Override
+		public Long convertToDatabaseColumn( ConvertedValue value ) {
+			return value.value;
+		}
+		@Override
+		public ConvertedValue convertToEntityAttribute( Long value ) {
+			return new ConvertedValue(value);
+		}
+	}
 
-    @MappedSuperclass
-    public static abstract class SuperClass {
-        @Id
-        private String id;
-        public ConvertedValue convertedValue = new ConvertedValue( 1 );
-        public ConvertedValue getConvertedValue() {
-            return convertedValue;
-        }
-        public void setConvertedValue(ConvertedValue convertedValue) {
-            this.convertedValue = convertedValue;
-        }
-    }
+	@MappedSuperclass
+	public static abstract class SuperClass {
+		@Id
+		private String id;
+		public ConvertedValue convertedValue = new ConvertedValue( 1 );
+		public ConvertedValue getConvertedValue() {
+			return convertedValue;
+		}
+		public void setConvertedValue(ConvertedValue convertedValue) {
+			this.convertedValue = convertedValue;
+		}
+	}
 
-    @Entity(name = "SubClass")
-    public static class SubClass extends SuperClass {}
+	@Entity(name = "SubClass")
+	public static class SubClass extends SuperClass {}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java
index 1e544842b880..dda61b7133ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java
index bbd6f2a832fe..0539cca71df6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/IncorrectEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/IncorrectEntity.java
index 02707e57009e..663f1e3d0339 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/IncorrectEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/IncorrectEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InvalidAnnotatedClassTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InvalidAnnotatedClassTypesTest.java
index 2e63d35fef07..fb3300e12485 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InvalidAnnotatedClassTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InvalidAnnotatedClassTypesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java
index d8cd686a6ad6..11ac9ff963d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java
index 137b850a8793..156768a634a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClockSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClockSettingProvider.java
index 6ea2dbff1830..4c7aed8d55f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClockSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClockSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Passport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Passport.java
index a80c9b7a02a9..73527693b4c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Passport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Passport.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Plane.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Plane.java
index e100460890ff..23e5a8df6ce8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Plane.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Plane.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Port.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Port.java
index 03f84aa983ad..cdf997070ad1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Port.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Port.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java
index 943444c8d401..24454621eaa4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 
 import org.junit.Test;
@@ -24,7 +20,7 @@
  * @author Emmanuel Bernard
  */
 public class SafeMappingTest {
-    @Test
+	@Test
 	public void testDeclarativeMix() {
 		Configuration cfg = new Configuration();
 		cfg.addAnnotatedClass( IncorrectEntity.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
index 5e122234ad5d..6511049c5cb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Thing.java
index 55e5bda71dcf..8ee9260f5335 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Thing.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import jakarta.persistence.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ticket.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ticket.java
index a0fbf0506de4..dbebe6afa33b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ticket.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Ticket.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -61,4 +57,3 @@ public int hashCode() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/TicketComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/TicketComparator.java
index 9f7df7195ec3..4f265cda716e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/TicketComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/TicketComparator.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations;
 import java.util.Comparator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java
index e526d724386c..f21b064ebce9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java
index 0c9d9c3e4f81..3c27391fabdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations;
 
@@ -32,188 +30,188 @@
  */
 public class UpdateTimestampTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                Event.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				Event.class
+		};
+	}
 
-    @Entity(name = "Event")
-    private static class Event {
+	@Entity(name = "Event")
+	private static class Event {
 
-        @Id
-        @GeneratedValue
-        private Long id;
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        @Column(name = "`date`")
-        @UpdateTimestamp
-        private Date date;
+		@Column(name = "`date`")
+		@UpdateTimestamp
+		private Date date;
 
-        @Column(name = "`calendar`")
-        @UpdateTimestamp
-        private Calendar calendar;
+		@Column(name = "`calendar`")
+		@UpdateTimestamp
+		private Calendar calendar;
 
-        @Column(name = "`sqlDate`")
-        @UpdateTimestamp
-        private java.sql.Date sqlDate;
+		@Column(name = "`sqlDate`")
+		@UpdateTimestamp
+		private java.sql.Date sqlDate;
 
-        @Column(name = "`time`")
-        @UpdateTimestamp
-        private Time time;
+		@Column(name = "`time`")
+		@UpdateTimestamp
+		private Time time;
 
-        @Column(name = "`timestamp`")
-        @UpdateTimestamp
-        private Timestamp timestamp;
+		@Column(name = "`timestamp`")
+		@UpdateTimestamp
+		private Timestamp timestamp;
 
-        @Column(name = "`instant`")
-        @UpdateTimestamp
-        private Instant instant;
+		@Column(name = "`instant`")
+		@UpdateTimestamp
+		private Instant instant;
 
-        @Column(name = "`localDate`")
-        @UpdateTimestamp
-        private LocalDate localDate;
+		@Column(name = "`localDate`")
+		@UpdateTimestamp
+		private LocalDate localDate;
 
-        @Column(name = "`localDateTime`")
-        @UpdateTimestamp
-        private LocalDateTime localDateTime;
+		@Column(name = "`localDateTime`")
+		@UpdateTimestamp
+		private LocalDateTime localDateTime;
 
-        @Column(name = "`localTime`")
-        @UpdateTimestamp
-        private LocalTime localTime;
-
-        @Column(name = "`monthDay`")
-        @UpdateTimestamp
-        private MonthDay monthDay;
-
-        @Column(name = "`offsetDateTime`")
-        @UpdateTimestamp
-        private OffsetDateTime offsetDateTime;
-
-        @Column(name = "`offsetTime`")
-        @UpdateTimestamp
-        private OffsetTime offsetTime;
-
-        @Column(name = "`year`")
-        @UpdateTimestamp
-        private Year year;
-
-        @Column(name = "`yearMonth`")
-        @UpdateTimestamp
-        private YearMonth yearMonth;
-
-        @Column(name = "`zonedDateTime`")
-        @UpdateTimestamp
-        private ZonedDateTime zonedDateTime;
-
-        public Event() {
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public Date getDate() {
-            return date;
-        }
-
-        public Calendar getCalendar() {
-            return calendar;
-        }
-
-        public java.sql.Date getSqlDate() {
-            return sqlDate;
-        }
-
-        public Time getTime() {
-            return time;
-        }
-
-        public Timestamp getTimestamp() {
-            return timestamp;
-        }
-
-        public Instant getInstant() {
-            return instant;
-        }
-
-        public LocalDate getLocalDate() {
-            return localDate;
-        }
-
-        public LocalDateTime getLocalDateTime() {
-            return localDateTime;
-        }
-
-        public LocalTime getLocalTime() {
-            return localTime;
-        }
-
-        public MonthDay getMonthDay() {
-            return monthDay;
-        }
-
-        public OffsetDateTime getOffsetDateTime() {
-            return offsetDateTime;
-        }
-
-        public OffsetTime getOffsetTime() {
-            return offsetTime;
-        }
-
-        public Year getYear() {
-            return year;
-        }
-
-        public YearMonth getYearMonth() {
-            return yearMonth;
-        }
-
-        public ZonedDateTime getZonedDateTime() {
-            return zonedDateTime;
-        }
-    }
-
-    @Test
-    public void generatesCurrentTimestamp() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Event event = new Event();
-            entityManager.persist(event);
-            entityManager.flush();
-            check( event );
-        });
-    }
-
-    @Test
-    @JiraKey( value = "HHH-16240")
-    public void generatesCurrentTimestampInStatelessSession() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Session session = entityManager.unwrap( Session.class);
-            try (StatelessSession statelessSession = session.getSessionFactory().openStatelessSession()) {
-                Event event = new Event();
-                statelessSession.getTransaction().begin();
-                statelessSession.insert(event);
-                statelessSession.getTransaction().commit();
-                check( event );
-            }
-        });
-    }
-
-    private void check(Event event) {
-        Assert.assertNotNull(event.getDate());
-        Assert.assertNotNull(event.getCalendar());
-        Assert.assertNotNull(event.getSqlDate());
-        Assert.assertNotNull(event.getTime());
-        Assert.assertNotNull(event.getTimestamp());
-        Assert.assertNotNull(event.getInstant());
-        Assert.assertNotNull(event.getLocalDate());
-        Assert.assertNotNull(event.getLocalDateTime());
-        Assert.assertNotNull(event.getLocalTime());
-        Assert.assertNotNull(event.getMonthDay());
-        Assert.assertNotNull(event.getOffsetDateTime());
-        Assert.assertNotNull(event.getOffsetTime());
-        Assert.assertNotNull(event.getYear());
-        Assert.assertNotNull(event.getYearMonth());
-        Assert.assertNotNull(event.getZonedDateTime());
-    }
+		@Column(name = "`localTime`")
+		@UpdateTimestamp
+		private LocalTime localTime;
+
+		@Column(name = "`monthDay`")
+		@UpdateTimestamp
+		private MonthDay monthDay;
+
+		@Column(name = "`offsetDateTime`")
+		@UpdateTimestamp
+		private OffsetDateTime offsetDateTime;
+
+		@Column(name = "`offsetTime`")
+		@UpdateTimestamp
+		private OffsetTime offsetTime;
+
+		@Column(name = "`year`")
+		@UpdateTimestamp
+		private Year year;
+
+		@Column(name = "`yearMonth`")
+		@UpdateTimestamp
+		private YearMonth yearMonth;
+
+		@Column(name = "`zonedDateTime`")
+		@UpdateTimestamp
+		private ZonedDateTime zonedDateTime;
+
+		public Event() {
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Date getDate() {
+			return date;
+		}
+
+		public Calendar getCalendar() {
+			return calendar;
+		}
+
+		public java.sql.Date getSqlDate() {
+			return sqlDate;
+		}
+
+		public Time getTime() {
+			return time;
+		}
+
+		public Timestamp getTimestamp() {
+			return timestamp;
+		}
+
+		public Instant getInstant() {
+			return instant;
+		}
+
+		public LocalDate getLocalDate() {
+			return localDate;
+		}
+
+		public LocalDateTime getLocalDateTime() {
+			return localDateTime;
+		}
+
+		public LocalTime getLocalTime() {
+			return localTime;
+		}
+
+		public MonthDay getMonthDay() {
+			return monthDay;
+		}
+
+		public OffsetDateTime getOffsetDateTime() {
+			return offsetDateTime;
+		}
+
+		public OffsetTime getOffsetTime() {
+			return offsetTime;
+		}
+
+		public Year getYear() {
+			return year;
+		}
+
+		public YearMonth getYearMonth() {
+			return yearMonth;
+		}
+
+		public ZonedDateTime getZonedDateTime() {
+			return zonedDateTime;
+		}
+	}
+
+	@Test
+	public void generatesCurrentTimestamp() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Event event = new Event();
+			entityManager.persist(event);
+			entityManager.flush();
+			check( event );
+		});
+	}
+
+	@Test
+	@JiraKey( value = "HHH-16240")
+	public void generatesCurrentTimestampInStatelessSession() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Session session = entityManager.unwrap( Session.class);
+			try (StatelessSession statelessSession = session.getSessionFactory().openStatelessSession()) {
+				Event event = new Event();
+				statelessSession.getTransaction().begin();
+				statelessSession.insert(event);
+				statelessSession.getTransaction().commit();
+				check( event );
+			}
+		});
+	}
+
+	private void check(Event event) {
+		Assert.assertNotNull(event.getDate());
+		Assert.assertNotNull(event.getCalendar());
+		Assert.assertNotNull(event.getSqlDate());
+		Assert.assertNotNull(event.getTime());
+		Assert.assertNotNull(event.getTimestamp());
+		Assert.assertNotNull(event.getInstant());
+		Assert.assertNotNull(event.getLocalDate());
+		Assert.assertNotNull(event.getLocalDateTime());
+		Assert.assertNotNull(event.getLocalTime());
+		Assert.assertNotNull(event.getMonthDay());
+		Assert.assertNotNull(event.getOffsetDateTime());
+		Assert.assertNotNull(event.getOffsetTime());
+		Assert.assertNotNull(event.getYear());
+		Assert.assertNotNull(event.getYearMonth());
+		Assert.assertNotNull(event.getZonedDateTime());
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/ArrayTest.java
index c9b6e6176cdd..c18215b5ebd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/ArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/ArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java
index c5a20f9d0049..1d90187806f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.array;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java
index 9171332f9e18..b2fac240edee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.array;
 
 import jakarta.persistence.CascadeType;
@@ -46,7 +42,7 @@ public Competitor[] getResults() {
 	public void setResults(Competitor[] results) {
 		this.results = results;
 	}
-	
+
 	@ElementCollection
 	@OrderColumn
 	@ListIndexBase( 1 )
@@ -57,8 +53,8 @@ public Month[] getHeldIn() {
 	public void setHeldIn(Month[] heldIn) {
 		this.heldIn = heldIn;
 	}
-	
+
 	public enum Month {
 		January, February, March, April, May, June, July, August, September, October, November, December;
-	}; 
+	};
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/MapAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/MapAttributeOverrideTest.java
index af9db96ccaa4..e529be09368b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/MapAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/MapAttributeOverrideTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.attributeoverride;
 
 import java.time.LocalTime;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Route.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Route.java
index 1e3951ea1c58..d1daa43459af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Route.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Route.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.attributeoverride;
 
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Schedule.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Schedule.java
index 1e5f0356219e..038e071e65c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Schedule.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/attributeoverride/Schedule.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.attributeoverride;
 
 import java.time.LocalTime;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java
index 3a90acee3823..aba46c967133 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.backquotes;
 
 import java.io.PrintWriter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java
index 33efeecf0820..426d4f65157a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.backquotes;
 import java.util.List;
 import jakarta.persistence.Column;
@@ -19,16 +15,16 @@
 
 @Entity
 @Table(indexes = @Index(name="`titleindex`", columnList = "`title`"))
-public class Bug 
+public class Bug
 {
 	@Id
 	@Column(name="`bug_id`")
 	private int id;
-	
+
 	@Column(name="`title`")
 
 	private String title;
-	
+
 	@ManyToMany
 	@JoinTable(name="`bug_category`")
 	private List categories;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java
index 2c8e779be6b3..7b663e68f314 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java
@@ -1,23 +1,19 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.backquotes;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
 @Entity
-public class Category 
+public class Category
 {
 	@Id
 	@Column(name="`cat_id`")
 	private int id;
-	
+
 	@Column(name="`title`")
 	private String title;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java
index d1e0654ef3cc..9e62edf8fad6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.backquotes;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -14,14 +11,14 @@
 @Entity
 @Table(name="`Printer`")
 public class Printer {
-    private Long id;
+	private Long id;
 
-    @Id
-    public Long getId() {
-        return id;
-    }
+	@Id
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java
index 825eb9c0b4bb..a2e75e0048dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.backquotes;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -20,17 +17,17 @@ public class PrinterCable {
 	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@ManyToOne
 	@JoinColumn(name="aId", referencedColumnName="missing")
 	public Printer getPrinter() {
 		return printer;
 	}
-	
+
 	public void setPrinter(Printer a) {
 		this.printer = a;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java
index 8411f38e8412..e1e99b699fac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfByteArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfByteArrayTest.java
index 4bcfc592ede2..f04ecfae4980 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfByteArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfByteArrayTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.basic;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
index 71711123647a..bcac4f0faa79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.basic;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/SetAsBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/SetAsBasicTest.java
index 6e628f143d85..7d73fd92101a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/SetAsBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/SetAsBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/TreeMapAsBasicTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/TreeMapAsBasicTypeTest.java
index 6951cc807291..bb2c069e252d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/TreeMapAsBasicTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/TreeMapAsBasicTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.basic;
 
 import java.util.TreeMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java
index 98830130e595..2e92879123ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java
index 310ed68498bf..d43cae7e5ed6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java
index e5c084248246..a359622f94f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java
index 14f6345b3a96..39bf693ad573 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
index d15234694c79..94accb036cea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java
index 078d020c815e..db0d42f3ecd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java
index d7decc5f1f93..8fb4d9ffb13c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java
index 64383b10d3e9..bd9b5fa11bf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import java.math.BigDecimal;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java
index 4e1bd09bdaa4..77cd87c3ebd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
index e0452522e1b7..11f13110f20c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java
index a3b6ba06f377..75c701c35848 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java
index 54b1f90dc31f..257a3d55c710 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
index 96c904f627f8..f56555eb1576 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/LazyCollectionValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/LazyCollectionValidationTest.java
index 4bbca256e2ad..f376ec8e9590 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/LazyCollectionValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/LazyCollectionValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java
index da71c4701688..a0afe7bf332c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java
index 8acd72244de6..f4a6c23807a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java
index b6578ff878a6..9dbb30834ce4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -25,7 +22,7 @@ public class MinMax {
 
 	@Max(10)
 	@Min(2)
-    @Column(name = "`value`")
+	@Column(name = "`value`")
 	private Integer value;
 
 	private MinMax() {
@@ -35,6 +32,3 @@ public MinMax(Integer value) {
 		this.value = value;
 	}
 }
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java
index 3c79fa6008aa..089bc6757a4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java
index 10df4098b832..69b285210f8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import java.math.BigDecimal;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java
index e9b1d0af27fb..8d9dc93b7848 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.validation.constraints.NotNull;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java
index e84bda522719..de5678f62162 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java
index 7efce0414354..ea34fe010e65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java
index c4290e71a34a..ac3f680dd5dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -65,7 +62,7 @@ public static class Tuner {
 	@Embeddable
 	public static class Recorder {
 		@NotNull
-        @Column(name = "`time`")
+		@Column(name = "`time`")
 		public BigDecimal time;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java
index db70f5720faf..d78962fc17b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.beanvalidation;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java
index 3589894cf654..c17d41f205b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.bytecode;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java
index fe24ca3a8f83..cdbb51ea0e0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.bytecode;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java
index a0b3f695cecd..652d868d298f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.bytecode;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java
index 1e1954e8b106..3ebad8eb8b2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java
index 77f74e5659fc..2858eb97096a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java
index 3f96cf147f83..3868170dcc34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
@@ -28,16 +26,16 @@ public class Child
 	@ManyToOne(cascade=CascadeType.PERSIST)
 	@JoinColumn(name="parentId", nullable=false)
 	Parent parent;
-	
+
 	/** */
 	public Child() {}
-	
+
 	/** */
 	public Child(Parent p)
 	{
 		this.parent = p;
 	}
-	
+
 	/** */
 	public Parent getParent() { return this.parent; }
 	public void setParent(Parent value) { this.parent = value; }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java
index 048f3b87bff5..f09832571fea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java
index 56780ee072dd..4b9790328bb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java
index 07f7a9a4154b..23792256477c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cascade;
 import java.util.Collection;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java
index 13b3e1c1fc6a..b82f119477e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java
index d80b5266cc11..d839d9745750 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
@@ -29,19 +27,19 @@ public class Parent
 	/** */
 	@OneToMany(cascade=CascadeType.ALL, mappedBy="parent")
 	public Set children;
-	
+
 	/** */
 	@OneToOne(cascade=CascadeType.ALL)
 	@JoinColumn(name="defaultChildId", nullable=false)
 	Child defaultChild;
-	
+
 	/** */
 	public Parent() {}
 
 	/** */
 	public Child getDefaultChild() { return this.defaultChild; }
 	public void setDefaultChild(Child value) { this.defaultChild = value; }
-	
+
 	/** */
 	public Set getChildren() { return this.children; }
 	public void setChildren(Set value) { this.children = value; }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java
index 4b03d2468784..7b0da2b3c224 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java
index 95591025ddee..01edcb46841a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java
index 8126f4e2f93f..793cdf68a184 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
@@ -22,7 +18,7 @@ public class Tooth {
 	@Id
 	@GeneratedValue
 	public Integer id;
-    @Column(name = "`type`")
+	@Column(name = "`type`")
 	public String type;
 	@ManyToOne(cascade = CascadeType.PERSIST)
 	public Tooth leftNeighbour;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java
index 4cbf1b810ab2..b74004734e88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,56 +9,56 @@
  */
 @jakarta.persistence.Entity
 public class A extends AbstractEntity {
-    private static final long serialVersionUID = 864804063L;
+	private static final long serialVersionUID = 864804063L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "a")
-    private java.util.Set bCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "a")
+	private java.util.Set bCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "aCollection")
-    private java.util.Set dCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "aCollection")
+	private java.util.Set dCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "a")
-    private java.util.Set cCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "a")
+	private java.util.Set cCollection = new java.util.HashSet();
 
-    public java.util.Set getBCollection() {
-        return bCollection;
-    }
+	public java.util.Set getBCollection() {
+		return bCollection;
+	}
 
-    public void setBCollection(
-        java.util.Set parameter) {
-        this.bCollection = parameter;
-    }
+	public void setBCollection(
+		java.util.Set parameter) {
+		this.bCollection = parameter;
+	}
 
-    public java.util.Set getDCollection() {
-        return dCollection;
-    }
+	public java.util.Set getDCollection() {
+		return dCollection;
+	}
 
-    public void setDCollection(
-        java.util.Set parameter) {
-        this.dCollection = parameter;
-    }
+	public void setDCollection(
+		java.util.Set parameter) {
+		this.dCollection = parameter;
+	}
 
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
 
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
index 0c8fd08c2c31..4c89b9ac6639 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java
index 9f2116cf6bc0..3437efcc0eb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,54 +9,54 @@
  */
 @jakarta.persistence.Entity
 public class B extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "b")
-    private java.util.Set cCollection = new java.util.HashSet();
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private A a;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private F f;
-
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
-
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
-
-    public A getA() {
-        return a;
-    }
-
-    public void setA(A parameter) {
-        this.a = parameter;
-    }
-
-    public F getF() {
-        return f;
-    }
-
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	private static final long serialVersionUID = 325417243L;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "b")
+	private java.util.Set cCollection = new java.util.HashSet();
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private A a;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private F f;
+
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
+
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
+
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A parameter) {
+		this.a = parameter;
+	}
+
+	public F getF() {
+		return f;
+	}
+
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java
index 2308e69d180b..9a6081bd6c1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,53 +9,53 @@
  */
 @jakarta.persistence.Entity
 public class C extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private A a;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private G g;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private B b;
-
-    public A getA() {
-        return a;
-    }
-
-    public void setA(A parameter) {
-        this.a = parameter;
-    }
-
-    public G getG() {
-        return g;
-    }
-
-    public void setG(G parameter) {
-        this.g = parameter;
-    }
-
-    public B getB() {
-        return b;
-    }
-
-    public void setB(B parameter) {
-        this.b = parameter;
-    }
+	private static final long serialVersionUID = 1226955752L;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private A a;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private G g;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private B b;
+
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A parameter) {
+		this.a = parameter;
+	}
+
+	public G getG() {
+		return g;
+	}
+
+	public void setG(G parameter) {
+		this.g = parameter;
+	}
+
+	public B getB() {
+		return b;
+	}
+
+	public void setB(B parameter) {
+		this.b = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java
index c4a3813af240..a6ad015f2a1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java
index be28846419a4..00a9aae14bd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,39 +9,39 @@
  */
 @jakarta.persistence.Entity
 public class D extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private java.util.Set aCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private java.util.Set aCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private java.util.Set eCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private java.util.Set eCollection = new java.util.HashSet();
 
-    public java.util.Set getACollection() {
-        return aCollection;
-    }
+	public java.util.Set getACollection() {
+		return aCollection;
+	}
 
-    public void setACollection(
-        java.util.Set parameter) {
-        this.aCollection = parameter;
-    }
+	public void setACollection(
+		java.util.Set parameter) {
+		this.aCollection = parameter;
+	}
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
 
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java
index cf242af44ac5..553b6afaca4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,21 +9,21 @@
  */
 @jakarta.persistence.Entity
 public class E extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private F f;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private F f;
 
-    public F getF() {
-        return f;
-    }
+	public F getF() {
+		return f;
+	}
 
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java
index 55a7a1d75a67..e8a306f120f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,38 +9,38 @@
  */
 @jakarta.persistence.Entity
 public class F extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "f")
-    private java.util.Set bCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "f")
+	private java.util.Set bCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private H h;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private H h;
 
-    public java.util.Set getBCollection() {
-        return bCollection;
-    }
+	public java.util.Set getBCollection() {
+		return bCollection;
+	}
 
-    public void setBCollection(
-        java.util.Set parameter) {
-        this.bCollection = parameter;
-    }
+	public void setBCollection(
+		java.util.Set parameter) {
+		this.bCollection = parameter;
+	}
 
-    public H getH() {
-        return h;
-    }
+	public H getH() {
+		return h;
+	}
 
-    public void setH(H parameter) {
-        this.h = parameter;
-    }
+	public void setH(H parameter) {
+		this.h = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java
index fe5d9f969f02..9821b74e7a6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,22 +9,22 @@
  */
 @jakarta.persistence.Entity
 public class G extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "g")
-    private java.util.Set cCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "g")
+	private java.util.Set cCollection = new java.util.HashSet();
 
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
 
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java
index 8d5d45cb954f..f4aa2c51acba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
@@ -11,21 +9,21 @@
  */
 @jakarta.persistence.Entity
 public class H extends AbstractEntity {
-    private static final long serialVersionUID = 1226955562L;
+	private static final long serialVersionUID = 1226955562L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private G g;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private G g;
 
-    public G getG() {
-        return g;
-    }
+	public G getG() {
+		return g;
+	}
 
-    public void setG(G parameter) {
-        this.g = parameter;
-    }
+	public void setG(G parameter) {
+		this.g = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java
index e4b38fa078a9..eec65698e583 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,56 +9,56 @@
  */
 @jakarta.persistence.Entity
 public class A extends AbstractEntity {
-    private static final long serialVersionUID = 864804063L;
+	private static final long serialVersionUID = 864804063L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "a")
-    private java.util.Set bCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "a")
+	private java.util.Set bCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "aCollection")
-    private java.util.Set dCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "aCollection")
+	private java.util.Set dCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "a")
-    private java.util.Set cCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "a")
+	private java.util.Set cCollection = new java.util.HashSet();
 
-    public java.util.Set getBCollection() {
-        return bCollection;
-    }
+	public java.util.Set getBCollection() {
+		return bCollection;
+	}
 
-    public void setBCollection(
-        java.util.Set parameter) {
-        this.bCollection = parameter;
-    }
+	public void setBCollection(
+		java.util.Set parameter) {
+		this.bCollection = parameter;
+	}
 
-    public java.util.Set getDCollection() {
-        return dCollection;
-    }
+	public java.util.Set getDCollection() {
+		return dCollection;
+	}
 
-    public void setDCollection(
-        java.util.Set parameter) {
-        this.dCollection = parameter;
-    }
+	public void setDCollection(
+		java.util.Set parameter) {
+		this.dCollection = parameter;
+	}
 
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
 
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
index 2ff2f94c727c..255d7b8d1bd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java
index 5ada1556d8f6..9a7044038393 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,54 +9,54 @@
  */
 @jakarta.persistence.Entity
 public class B extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "b")
-    private java.util.Set cCollection = new java.util.HashSet();
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private A a;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private F f;
-
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
-
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
-
-    public A getA() {
-        return a;
-    }
-
-    public void setA(A parameter) {
-        this.a = parameter;
-    }
-
-    public F getF() {
-        return f;
-    }
-
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	private static final long serialVersionUID = 325417243L;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "b")
+	private java.util.Set cCollection = new java.util.HashSet();
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private A a;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private F f;
+
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
+
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
+
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A parameter) {
+		this.a = parameter;
+	}
+
+	public F getF() {
+		return f;
+	}
+
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java
index a4ad25a6bb60..0f16915ad07f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,53 +9,53 @@
  */
 @jakarta.persistence.Entity
 public class C extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private A a;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private G g;
-
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private B b;
-
-    public A getA() {
-        return a;
-    }
-
-    public void setA(A parameter) {
-        this.a = parameter;
-    }
-
-    public G getG() {
-        return g;
-    }
-
-    public void setG(G parameter) {
-        this.g = parameter;
-    }
-
-    public B getB() {
-        return b;
-    }
-
-    public void setB(B parameter) {
-        this.b = parameter;
-    }
+	private static final long serialVersionUID = 1226955752L;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private A a;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private G g;
+
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private B b;
+
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A parameter) {
+		this.a = parameter;
+	}
+
+	public G getG() {
+		return g;
+	}
+
+	public void setG(G parameter) {
+		this.g = parameter;
+	}
+
+	public B getB() {
+		return b;
+	}
+
+	public void setB(B parameter) {
+		this.b = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java
index 1244682fa627..ee3d0f52a94a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java
index ca27c8d28865..aea2c73d2c6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,39 +9,39 @@
  */
 @jakarta.persistence.Entity
 public class D extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private java.util.Set aCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private java.util.Set aCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private java.util.Set eCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private java.util.Set eCollection = new java.util.HashSet();
 
-    public java.util.Set getACollection() {
-        return aCollection;
-    }
+	public java.util.Set getACollection() {
+		return aCollection;
+	}
 
-    public void setACollection(
-        java.util.Set parameter) {
-        this.aCollection = parameter;
-    }
+	public void setACollection(
+		java.util.Set parameter) {
+		this.aCollection = parameter;
+	}
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
 
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java
index ed58c24a86f6..53b0e432bb86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,21 +9,21 @@
  */
 @jakarta.persistence.Entity
 public class E extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private F f;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private F f;
 
-    public F getF() {
-        return f;
-    }
+	public F getF() {
+		return f;
+	}
 
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java
index 108851bcb6d3..3866d56aa9ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,38 +9,38 @@
  */
 @jakarta.persistence.Entity
 public class F extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "f")
-    private java.util.Set bCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "f")
+	private java.util.Set bCollection = new java.util.HashSet();
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private H h;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private H h;
 
-    public java.util.Set getBCollection() {
-        return bCollection;
-    }
+	public java.util.Set getBCollection() {
+		return bCollection;
+	}
 
-    public void setBCollection(
-        java.util.Set parameter) {
-        this.bCollection = parameter;
-    }
+	public void setBCollection(
+		java.util.Set parameter) {
+		this.bCollection = parameter;
+	}
 
-    public H getH() {
-        return h;
-    }
+	public H getH() {
+		return h;
+	}
 
-    public void setH(H parameter) {
-        this.h = parameter;
-    }
+	public void setH(H parameter) {
+		this.h = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java
index d9f0a3dffd02..9e6bc03dacb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,22 +9,22 @@
  */
 @jakarta.persistence.Entity
 public class G extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "g")
-    private java.util.Set cCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "g")
+	private java.util.Set cCollection = new java.util.HashSet();
 
-    public java.util.Set getCCollection() {
-        return cCollection;
-    }
+	public java.util.Set getCCollection() {
+		return cCollection;
+	}
 
-    public void setCCollection(
-        java.util.Set parameter) {
-        this.cCollection = parameter;
-    }
+	public void setCCollection(
+		java.util.Set parameter) {
+		this.cCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java
index a18c813be8fb..3a80cf303c64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
@@ -11,21 +9,21 @@
  */
 @jakarta.persistence.Entity
 public class H extends AbstractEntity {
-    private static final long serialVersionUID = 1226955562L;
+	private static final long serialVersionUID = 1226955562L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    )
-    private G g;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	)
+	private G g;
 
-    public G getG() {
-        return g;
-    }
+	public G getG() {
+		return g;
+	}
 
-    public void setG(G parameter) {
-        this.g = parameter;
-    }
+	public void setG(G parameter) {
+		this.g = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
index 8ce5a27c852b..b9e5fa1da22a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java
index 90bc210e85f5..72be7b45d7a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class EntityB extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
+	private static final long serialVersionUID = 325417243L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "b")
-    private java.util.Set gCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "b")
+	private java.util.Set gCollection = new java.util.HashSet();
 
 
 	/**
@@ -32,30 +30,30 @@ public class EntityB extends AbstractEntity {
 
 
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private EntityD d;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private EntityD d;
 
-    public java.util.Set getGCollection() {
-        return gCollection;
-    }
+	public java.util.Set getGCollection() {
+		return gCollection;
+	}
 
-    public void setGCollection(
-        java.util.Set parameter) {
-        this.gCollection = parameter;
-    }
+	public void setGCollection(
+		java.util.Set parameter) {
+		this.gCollection = parameter;
+	}
 
-    public EntityC getC() {
-        return c;
-    }
+	public EntityC getC() {
+		return c;
+	}
 
-    public void setC(EntityC parameter) {
-        this.c = parameter;
-    }
+	public void setC(EntityC parameter) {
+		this.c = parameter;
+	}
 
 	public EntityD getD() {
 		return d;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java
index 8d199ebe41b0..e9940b8e203e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -13,7 +11,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityC extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
+	private static final long serialVersionUID = 1226955752L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "c")
 	private Set bCollection = new java.util.HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java
index d7cf03215c3e..3b0571826c9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityD extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "d")
 	private java.util.Set bCollection = new java.util.HashSet();
@@ -22,13 +20,13 @@ public class EntityD extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityE e;
 
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE,
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE,
 			jakarta.persistence.CascadeType.PERSIST,
 			jakarta.persistence.CascadeType.REFRESH},
 			mappedBy = "d"
-    )
-    private java.util.Set fCollection = new java.util.HashSet();
+	)
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public java.util.Set getBCollection() {
 		return bCollection;
@@ -52,12 +50,12 @@ public void setE(EntityE e) {
 		this.e = e;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
 			java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+		this.fCollection = parameter;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java
index 99881cdb5821..73c6ea10a2c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityE extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "e")
 	private java.util.Set dCollection = new java.util.HashSet();
@@ -26,10 +24,10 @@ public void setDCollection(java.util.Set dCollection) {
 		this.dCollection = dCollection;
 	}
 
-    public EntityF getF() {
-        return f;
-    }
-    public void setF(EntityF parameter) {
-        this.f = parameter;
-    }
+	public EntityF getF() {
+		return f;
+	}
+	public void setF(EntityF parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java
index 574f24d3d8fe..8324eaa8c3fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class EntityF extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "f")
-    private java.util.Set eCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "f")
+	private java.util.Set eCollection = new java.util.HashSet();
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityD d;
@@ -27,20 +25,20 @@ public class EntityF extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityG g;
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
-
-    public EntityD getD() {
-        return d;
-    }
-    public void setD(EntityD parameter) {
-        this.d = parameter;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
+
+	public EntityD getD() {
+		return d;
+	}
+	public void setD(EntityD parameter) {
+		this.d = parameter;
+	}
 
 	public EntityG getG() {
 		return g;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java
index 9aeec6a55a13..60a6f2a9b2e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
@@ -11,13 +9,13 @@
  */
 @jakarta.persistence.Entity
 public class EntityG extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityB b;
 
-    @jakarta.persistence.OneToMany(mappedBy = "g")
-    private java.util.Set fCollection = new java.util.HashSet();
+	@jakarta.persistence.OneToMany(mappedBy = "g")
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public EntityB getB() {
 		return b;
@@ -26,11 +24,11 @@ public void setB(EntityB parameter){
 		this.b = parameter;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
-        java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
+		java.util.Set parameter) {
+		this.fCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java
index f6bb3588169f..a6ceda73c95c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
index c01cdc9a1978..acde289b6ff2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java
index 9af65e7b434f..e46b7c8d5f46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class B extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
+	private static final long serialVersionUID = 325417243L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "b")
-    private java.util.Set gCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "b")
+	private java.util.Set gCollection = new java.util.HashSet();
 
 
 	/**
@@ -32,30 +30,30 @@ public class B extends AbstractEntity {
 
 
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private D d;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private D d;
 
-    public java.util.Set getGCollection() {
-        return gCollection;
-    }
+	public java.util.Set getGCollection() {
+		return gCollection;
+	}
 
-    public void setGCollection(
-        java.util.Set parameter) {
-        this.gCollection = parameter;
-    }
+	public void setGCollection(
+		java.util.Set parameter) {
+		this.gCollection = parameter;
+	}
 
-    public C getC() {
-        return c;
-    }
+	public C getC() {
+		return c;
+	}
 
-    public void setC(C parameter) {
-        this.c = parameter;
-    }
+	public void setC(C parameter) {
+		this.c = parameter;
+	}
 
 	public D getD() {
 		return d;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java
index 7f206bb137f9..6ae862cd7c8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -13,7 +11,7 @@
  */
 @jakarta.persistence.Entity
 public class C extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
+	private static final long serialVersionUID = 1226955752L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "c")
 	private Set bCollection = new java.util.HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java
index a1e518eccc81..4b6f1e993d6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class D extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "d")
 	private java.util.Set bCollection = new java.util.HashSet();
@@ -22,11 +20,11 @@ public class D extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private E e;
 
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH},
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH},
 			mappedBy = "d"
-    )
-    private java.util.Set fCollection = new java.util.HashSet();
+	)
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public java.util.Set getBCollection() {
 		return bCollection;
@@ -50,12 +48,12 @@ public void setE(E e) {
 		this.e = e;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
 			java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+		this.fCollection = parameter;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java
index 96c071d5003d..1f6c2a956225 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class E extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "e")
 	private java.util.Set dCollection = new java.util.HashSet();
@@ -26,10 +24,10 @@ public void setDCollection(java.util.Set dCollection) {
 		this.dCollection = dCollection;
 	}
 
-    public F getF() {
-        return f;
-    }
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	public F getF() {
+		return f;
+	}
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java
index 8ea2d592cca0..b219032a80f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class F extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "f")
-    private java.util.Set eCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "f")
+	private java.util.Set eCollection = new java.util.HashSet();
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private D d;
@@ -27,20 +25,20 @@ public class F extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private G g;
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
-
-    public D getD() {
-        return d;
-    }
-    public void setD(D parameter) {
-        this.d = parameter;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
+
+	public D getD() {
+		return d;
+	}
+	public void setD(D parameter) {
+		this.d = parameter;
+	}
 
 	public G getG() {
 		return g;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java
index 318fb1795a4a..8893ef084f62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
@@ -11,13 +9,13 @@
  */
 @jakarta.persistence.Entity
 public class G extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private B b;
 
-    @jakarta.persistence.OneToMany(mappedBy = "g")
-    private java.util.Set fCollection = new java.util.HashSet();
+	@jakarta.persistence.OneToMany(mappedBy = "g")
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public B getB() {
 		return b;
@@ -26,11 +24,11 @@ public void setB(B parameter){
 		this.b = parameter;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
-        java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
+		java.util.Set parameter) {
+		this.fCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java
index 15161001aeef..9634a3da0977 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
index dcf9b1941c68..c2269bf694bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java
index 471d54a7793c..717a1372c4fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java
@@ -1,22 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
 @jakarta.persistence.Entity
 public class EntityB extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
+	private static final long serialVersionUID = 325417243L;
 
-    @jakarta.persistence.OneToMany(mappedBy = "b")
+	@jakarta.persistence.OneToMany(mappedBy = "b")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set gCollection = new java.util.HashSet();
+	private java.util.Set gCollection = new java.util.HashSet();
 
 
 	@jakarta.persistence.ManyToOne(optional = false)
@@ -33,24 +31,24 @@ public class EntityB extends AbstractEntity {
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private EntityD d;
+	private EntityD d;
 
-    public java.util.Set getGCollection() {
-        return gCollection;
-    }
+	public java.util.Set getGCollection() {
+		return gCollection;
+	}
 
-    public void setGCollection(
-        java.util.Set parameter) {
-        this.gCollection = parameter;
-    }
+	public void setGCollection(
+		java.util.Set parameter) {
+		this.gCollection = parameter;
+	}
 
-    public EntityC getC() {
-        return c;
-    }
+	public EntityC getC() {
+		return c;
+	}
 
-    public void setC(EntityC parameter) {
-        this.c = parameter;
-    }
+	public void setC(EntityC parameter) {
+		this.c = parameter;
+	}
 
 	public EntityD getD() {
 		return d;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java
index 3d3bb85c3301..0af388bbeaf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
@@ -13,7 +11,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityC extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
+	private static final long serialVersionUID = 1226955752L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "c")
 	private Set bCollection = new java.util.HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java
index 17c881996e26..90b04520f831 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityD extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "d")
 	private java.util.Set bCollection = new java.util.HashSet();
@@ -22,13 +20,13 @@ public class EntityD extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityE e;
 
-    @jakarta.persistence.OneToMany(mappedBy = "d")
+	@jakarta.persistence.OneToMany(mappedBy = "d")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set fCollection = new java.util.HashSet();
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public java.util.Set getBCollection() {
 		return bCollection;
@@ -52,12 +50,12 @@ public void setE(EntityE e) {
 		this.e = e;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
 			java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+		this.fCollection = parameter;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java
index 3a872b21a03f..b4cd9641d8b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class EntityE extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "e")
 	private java.util.Set dCollection = new java.util.HashSet();
@@ -26,10 +24,10 @@ public void setDCollection(java.util.Set dCollection) {
 		this.dCollection = dCollection;
 	}
 
-    public EntityF getF() {
-        return f;
-    }
-    public void setF(EntityF parameter) {
-        this.f = parameter;
-    }
+	public EntityF getF() {
+		return f;
+	}
+	public void setF(EntityF parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java
index aca37331a9ff..b695eb26ef48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
@@ -11,18 +9,18 @@
  */
 @jakarta.persistence.Entity
 public class EntityF extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(mappedBy = "f")
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(mappedBy = "f")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set eCollection = new java.util.HashSet();
+	private java.util.Set eCollection = new java.util.HashSet();
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityD d;
@@ -30,20 +28,20 @@ public class EntityF extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityG g;
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
-
-    public EntityD getD() {
-        return d;
-    }
-    public void setD(EntityD parameter) {
-        this.d = parameter;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
+
+	public EntityD getD() {
+		return d;
+	}
+	public void setD(EntityD parameter) {
+		this.d = parameter;
+	}
 
 	public EntityG getG() {
 		return g;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java
index 1357c034169e..c33ee54e8b1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
@@ -11,13 +9,13 @@
  */
 @jakarta.persistence.Entity
 public class EntityG extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private EntityB b;
 
-    @jakarta.persistence.OneToMany(mappedBy = "g")
-    private java.util.Set fCollection = new java.util.HashSet();
+	@jakarta.persistence.OneToMany(mappedBy = "g")
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public EntityB getB() {
 		return b;
@@ -26,11 +24,11 @@ public void setB(EntityB parameter){
 		this.b = parameter;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
-        java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
+		java.util.Set parameter) {
+		this.fCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java
index ea580e06b13b..4d96d5f81bcc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
index 46db5b26b549..3a6e0b4953e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java
index b50f2330ad19..0edc03e390a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java
@@ -1,22 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
 @jakarta.persistence.Entity
 public class B extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
+	private static final long serialVersionUID = 325417243L;
 
-    @jakarta.persistence.OneToMany(mappedBy = "b")
+	@jakarta.persistence.OneToMany(mappedBy = "b")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set gCollection = new java.util.HashSet();
+	private java.util.Set gCollection = new java.util.HashSet();
 
 
 	@jakarta.persistence.ManyToOne(optional = false)
@@ -33,24 +31,24 @@ public class B extends AbstractEntity {
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private D d;
+	private D d;
 
-    public java.util.Set getGCollection() {
-        return gCollection;
-    }
+	public java.util.Set getGCollection() {
+		return gCollection;
+	}
 
-    public void setGCollection(
-        java.util.Set parameter) {
-        this.gCollection = parameter;
-    }
+	public void setGCollection(
+		java.util.Set parameter) {
+		this.gCollection = parameter;
+	}
 
-    public C getC() {
-        return c;
-    }
+	public C getC() {
+		return c;
+	}
 
-    public void setC(C parameter) {
-        this.c = parameter;
-    }
+	public void setC(C parameter) {
+		this.c = parameter;
+	}
 
 	public D getD() {
 		return d;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java
index dcc65fcd4b1d..b77d1545712f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
@@ -13,7 +11,7 @@
  */
 @jakarta.persistence.Entity
 public class C extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
+	private static final long serialVersionUID = 1226955752L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "c")
 	private Set bCollection = new java.util.HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java
index acfa50ddb666..6ca94504addb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class D extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "d")
 	private java.util.Set bCollection = new java.util.HashSet();
@@ -22,13 +20,13 @@ public class D extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private E e;
 
-    @jakarta.persistence.OneToMany(mappedBy = "d")
+	@jakarta.persistence.OneToMany(mappedBy = "d")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set fCollection = new java.util.HashSet();
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public java.util.Set getBCollection() {
 		return bCollection;
@@ -52,12 +50,12 @@ public void setE(E e) {
 		this.e = e;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
 			java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+		this.fCollection = parameter;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java
index 80761b4b9200..7fe2cf356a9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class E extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "e")
 	private java.util.Set dCollection = new java.util.HashSet();
@@ -26,10 +24,10 @@ public void setDCollection(java.util.Set dCollection) {
 		this.dCollection = dCollection;
 	}
 
-    public F getF() {
-        return f;
-    }
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	public F getF() {
+		return f;
+	}
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java
index f49655f08b4c..9dabab4c2c81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
@@ -11,18 +9,18 @@
  */
 @jakarta.persistence.Entity
 public class F extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(mappedBy = "f")
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(mappedBy = "f")
 	@org.hibernate.annotations.Cascade({
 			org.hibernate.annotations.CascadeType.PERSIST,
 			org.hibernate.annotations.CascadeType.MERGE,
 			org.hibernate.annotations.CascadeType.REFRESH
 	})
-    private java.util.Set eCollection = new java.util.HashSet();
+	private java.util.Set eCollection = new java.util.HashSet();
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private D d;
@@ -30,20 +28,20 @@ public class F extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private G g;
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
-
-    public D getD() {
-        return d;
-    }
-    public void setD(D parameter) {
-        this.d = parameter;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
+
+	public D getD() {
+		return d;
+	}
+	public void setD(D parameter) {
+		this.d = parameter;
+	}
 
 	public G getG() {
 		return g;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java
index 23149ef5418e..db48fc29a84d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
@@ -11,13 +9,13 @@
  */
 @jakarta.persistence.Entity
 public class G extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private B b;
 
-    @jakarta.persistence.OneToMany(mappedBy = "g")
-    private java.util.Set fCollection = new java.util.HashSet();
+	@jakarta.persistence.OneToMany(mappedBy = "g")
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public B getB() {
 		return b;
@@ -26,11 +24,11 @@ public void setB(B parameter){
 		this.b = parameter;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
-        java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
+		java.util.Set parameter) {
+		this.fCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java
index 8dc766129d4a..5ddb7bf40fdd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
index b7e6e72561b4..46b5bc78c4ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cascade.persist;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
index db485f3a6f07..b5346514b8eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cascade.persist;
 
 import jakarta.persistence.Basic;
@@ -7,12 +11,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import org.hibernate.cfg.JpaComplianceSettings;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java
index b0c573b7b777..51f910f13274 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java
index db3409e1baab..a786ea7573ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java
index 9c9af2b8e4df..a46475c23131 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java
index fb20887d6325..8e77fdd6e87a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java
index 52706dc675bf..21caeebce096 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java
index d1a40150d6dd..12caca214bb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java
index c8ee66cb4c8a..80ad47a573a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java
index 3f65b1a6ce3b..da0ea1eeb199 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java
index 64b2e7c0f67d..818e0f718dba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java
index d7e645f475f4..8f236b7bb161 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java
index 5541168ad48c..90eeba24ef6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdWithOrderedUpdatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdWithOrderedUpdatesTest.java
index e28c19ac6d66..fca3a1048e0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdWithOrderedUpdatesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdWithOrderedUpdatesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Flight.java
index 23185a7bbbf9..07abc6aab591 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Flight.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import jakarta.persistence.*;
@@ -8,32 +12,32 @@
 @Table(name = "flight")
 public class Flight {
 
-    @Id
-    @Column(name = "id")
-    private Integer id;
+	@Id
+	@Column(name = "id")
+	private Integer id;
 
-    @OneToMany(mappedBy = "flight", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private List segments;
+	@OneToMany(mappedBy = "flight", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private List segments;
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    public List getSegments() {
-        return segments;
-    }
+	public List getSegments() {
+		return segments;
+	}
 
-    public void setSegments(List segments) {
-        this.segments = segments;
-    }
+	public void setSegments(List segments) {
+		this.segments = segments;
+	}
 
-    public void addSegment(FlightSegment segment) {
-        segment.setFlight(this);
-        segments.add(segment);
-    }
+	public void addSegment(FlightSegment segment) {
+		segment.setFlight(this);
+		segments.add(segment);
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegment.java
index e46b5cb718c8..aafed09e7e03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegment.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import jakarta.persistence.*;
@@ -7,41 +11,41 @@
 @Table(name = "flight_segment")
 public class FlightSegment {
 
-    @Id
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flight_id", nullable = false)
-    private Flight flight;
+	@Id
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "flight_id", nullable = false)
+	private Flight flight;
 
-    @Id
-    @Column(name = "segment_number")
-    private Integer segmentNumber;
+	@Id
+	@Column(name = "segment_number")
+	private Integer segmentNumber;
 
-    @OneToOne(mappedBy = "segment", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private FlightSegmentConfiguration configuration;
+	@OneToOne(mappedBy = "segment", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private FlightSegmentConfiguration configuration;
 
-    public Flight getFlight() {
-        return flight;
-    }
+	public Flight getFlight() {
+		return flight;
+	}
 
-    public void setFlight(Flight flight) {
-        this.flight = flight;
-    }
+	public void setFlight(Flight flight) {
+		this.flight = flight;
+	}
 
-    public Integer getSegmentNumber() {
-        return segmentNumber;
-    }
+	public Integer getSegmentNumber() {
+		return segmentNumber;
+	}
 
-    public void setSegmentNumber(Integer segmentNumber) {
-        this.segmentNumber = segmentNumber;
-    }
+	public void setSegmentNumber(Integer segmentNumber) {
+		this.segmentNumber = segmentNumber;
+	}
 
-    public FlightSegmentConfiguration getConfiguration() {
-        return configuration;
-    }
+	public FlightSegmentConfiguration getConfiguration() {
+		return configuration;
+	}
 
-    public void setConfiguration(FlightSegmentConfiguration configuration) {
-        configuration.setSegment(this);
-        this.configuration = configuration;
-    }
+	public void setConfiguration(FlightSegmentConfiguration configuration) {
+		configuration.setSegment(this);
+		this.configuration = configuration;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfiguration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfiguration.java
index 7c127dfaf3af..9ecf772586ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfiguration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfiguration.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import jakarta.persistence.*;
@@ -7,18 +11,18 @@
 @Table(name = "flight_segment_configuration")
 public class FlightSegmentConfiguration {
 
-    @Id
-    @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flight_id", referencedColumnName = "flight_id", nullable = false)
-    @JoinColumn(name = "segment_number", referencedColumnName = "segment_number", nullable = false)
-    private FlightSegment segment;
+	@Id
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "flight_id", referencedColumnName = "flight_id", nullable = false)
+	@JoinColumn(name = "segment_number", referencedColumnName = "segment_number", nullable = false)
+	private FlightSegment segment;
 
-    public FlightSegment getSegment() {
-        return segment;
-    }
+	public FlightSegment getSegment() {
+		return segment;
+	}
 
-    public void setSegment(FlightSegment segment) {
-        this.segment = segment;
-    }
+	public void setSegment(FlightSegment segment) {
+		this.segment = segment;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfigurationId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfigurationId.java
index 5b111ead9c15..7e287b65dec9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfigurationId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentConfigurationId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import java.io.Serializable;
@@ -6,41 +10,41 @@
 
 public class FlightSegmentConfigurationId implements Serializable {
 
-    private FlightSegmentId segment;
-
-    public FlightSegmentConfigurationId() {
-    }
-
-    public FlightSegmentConfigurationId(FlightSegmentId segment) {
-        this.segment = segment;
-    }
-
-    public FlightSegmentId getSegment() {
-        return segment;
-    }
-
-    public void setSegment(FlightSegmentId segment) {
-        this.segment = segment;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FlightSegmentConfigurationId that = (FlightSegmentConfigurationId) o;
-        return Objects.equals(segment, that.segment);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(segment);
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", FlightSegmentConfigurationId.class.getSimpleName() + "[", "]")
-                .add("segment=" + segment)
-                .toString();
-    }
+	private FlightSegmentId segment;
+
+	public FlightSegmentConfigurationId() {
+	}
+
+	public FlightSegmentConfigurationId(FlightSegmentId segment) {
+		this.segment = segment;
+	}
+
+	public FlightSegmentId getSegment() {
+		return segment;
+	}
+
+	public void setSegment(FlightSegmentId segment) {
+		this.segment = segment;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		FlightSegmentConfigurationId that = (FlightSegmentConfigurationId) o;
+		return Objects.equals(segment, that.segment);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(segment);
+	}
+
+	@Override
+	public String toString() {
+		return new StringJoiner(", ", FlightSegmentConfigurationId.class.getSimpleName() + "[", "]")
+				.add("segment=" + segment)
+				.toString();
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentId.java
index 0f149f97b3e6..9828f7ccd178 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/FlightSegmentId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import java.io.Serializable;
@@ -6,52 +10,52 @@
 
 public class FlightSegmentId implements Serializable {
 
-    private Integer flight;
-    private Integer segmentNumber;
-
-    public FlightSegmentId() {
-    }
-
-    public FlightSegmentId(Integer flight, Integer segmentNumber) {
-        this.flight = flight;
-        this.segmentNumber = segmentNumber;
-    }
-
-    public Integer getFlight() {
-        return flight;
-    }
-
-    public void setFlight(Integer flight) {
-        this.flight = flight;
-    }
-
-    public Integer getSegmentNumber() {
-        return segmentNumber;
-    }
-
-    public void setSegmentNumber(Integer segmentNumber) {
-        this.segmentNumber = segmentNumber;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FlightSegmentId that = (FlightSegmentId) o;
-        return Objects.equals(flight, that.flight) && Objects.equals(segmentNumber, that.segmentNumber);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(flight, segmentNumber);
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", FlightSegmentId.class.getSimpleName() + "[", "]")
-                .add("flight=" + flight)
-                .add("segmentNumber=" + segmentNumber)
-                .toString();
-    }
+	private Integer flight;
+	private Integer segmentNumber;
+
+	public FlightSegmentId() {
+	}
+
+	public FlightSegmentId(Integer flight, Integer segmentNumber) {
+		this.flight = flight;
+		this.segmentNumber = segmentNumber;
+	}
+
+	public Integer getFlight() {
+		return flight;
+	}
+
+	public void setFlight(Integer flight) {
+		this.flight = flight;
+	}
+
+	public Integer getSegmentNumber() {
+		return segmentNumber;
+	}
+
+	public void setSegmentNumber(Integer segmentNumber) {
+		this.segmentNumber = segmentNumber;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		FlightSegmentId that = (FlightSegmentId) o;
+		return Objects.equals(flight, that.flight) && Objects.equals(segmentNumber, that.segmentNumber);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(flight, segmentNumber);
+	}
+
+	@Override
+	public String toString() {
+		return new StringJoiner(", ", FlightSegmentId.class.getSimpleName() + "[", "]")
+				.add("flight=" + flight)
+				.add("segmentNumber=" + segmentNumber)
+				.toString();
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Freight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Freight.java
index 9f66332111d1..87eb46e85e69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Freight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Freight.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import jakarta.persistence.*;
@@ -6,29 +10,29 @@
 @Table(name = "freight")
 public class Freight {
 
-    @Id
-    @Column(name = "freight_number")
-    private Integer freightNumber;
+	@Id
+	@Column(name = "freight_number")
+	private Integer freightNumber;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flight_id", referencedColumnName = "flight_id")
-    @JoinColumn(name = "segment_number", referencedColumnName = "segment_number")
-    private FlightSegment flightSegment;
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "flight_id", referencedColumnName = "flight_id")
+	@JoinColumn(name = "segment_number", referencedColumnName = "segment_number")
+	private FlightSegment flightSegment;
 
-    public Integer getFreightNumber() {
-        return freightNumber;
-    }
+	public Integer getFreightNumber() {
+		return freightNumber;
+	}
 
-    public void setFreightNumber(Integer freightNumber) {
-        this.freightNumber = freightNumber;
-    }
+	public void setFreightNumber(Integer freightNumber) {
+		this.freightNumber = freightNumber;
+	}
 
-    public FlightSegment getFlightSegment() {
-        return flightSegment;
-    }
+	public FlightSegment getFlightSegment() {
+		return flightSegment;
+	}
 
-    public void setFlightSegment(FlightSegment flightSegment) {
-        this.flightSegment = flightSegment;
-    }
+	public void setFlightSegment(FlightSegment flightSegment) {
+		this.flightSegment = flightSegment;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdLazyTest.java
index 4f845d626dfc..e1a41ed1075a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdLazyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -11,180 +15,180 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Jpa(
-        annotatedClasses = {
-                Flight.class,
-                FlightSegment.class,
-                FlightSegmentConfiguration.class,
-                Freight.class
-        }
+		annotatedClasses = {
+				Flight.class,
+				FlightSegment.class,
+				FlightSegmentConfiguration.class,
+				Freight.class
+		}
 )
 public class HierarchicalCompositeIdLazyTest {
 
-    @Test
-    void testFetchFlightSegmentFromFlight(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    Flight flight = entityManager.find(Flight.class, 1);
-                    assertNotNull(flight);
-                    assertEquals(1, flight.getSegments().get(0).getSegmentNumber());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegment(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment segment = entityManager.find(FlightSegment.class, new FlightSegmentId(1, 1));
-                    assertNotNull(segment);
-                    assertEquals(1, segment.getFlight().getId());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegmentConfiguration(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
-
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-                    flightSegment.setConfiguration(flightSegmentConfiguration);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
-                    FlightSegmentConfiguration configuration = entityManager.find(FlightSegmentConfiguration.class, id);
-                    assertNotNull(configuration);
-                    assertEquals(1, configuration.getSegment().getFlight().getId());
-                    assertNotNull(configuration.getSegment().getConfiguration());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegmentConfigurationViaQuery(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
-
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-                    flightSegment.setConfiguration(flightSegmentConfiguration);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
-                    FlightSegmentConfiguration configuration = entityManager
-                            .createQuery("from FlightSegmentConfiguration where id = :id", FlightSegmentConfiguration.class)
-                            .setParameter("id", id)
-                            .getSingleResult();
-                    assertNotNull(configuration);
-                    assertEquals(1, configuration.getSegment().getFlight().getId());
-                    assertNotNull(configuration.getSegment().getConfiguration());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-
-                    Freight freight = new Freight();
-                    freight.setFreightNumber(1);
-                    freight.setFlightSegment(flightSegment);
-
-                    entityManager.persist(freight);
-
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    Freight freight = entityManager.find(Freight.class, 1);
-                    assertNotNull(freight);
-                    assertEquals(1, freight.getFlightSegment().getFlight().getId());
-                }
-        );
-    }
-
-    @AfterEach
-    void cleanUp(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    entityManager.createQuery("delete from Freight").executeUpdate();
-                    entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
-                    entityManager.createQuery("delete from FlightSegment").executeUpdate();
-                    entityManager.createQuery("delete from Flight").executeUpdate();
-                }
-        );
-    }
+	@Test
+	void testFetchFlightSegmentFromFlight(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					Flight flight = entityManager.find(Flight.class, 1);
+					assertNotNull(flight);
+					assertEquals(1, flight.getSegments().get(0).getSegmentNumber());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegment(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment segment = entityManager.find(FlightSegment.class, new FlightSegmentId(1, 1));
+					assertNotNull(segment);
+					assertEquals(1, segment.getFlight().getId());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegmentConfiguration(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
+
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+					flightSegment.setConfiguration(flightSegmentConfiguration);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
+					FlightSegmentConfiguration configuration = entityManager.find(FlightSegmentConfiguration.class, id);
+					assertNotNull(configuration);
+					assertEquals(1, configuration.getSegment().getFlight().getId());
+					assertNotNull(configuration.getSegment().getConfiguration());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegmentConfigurationViaQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
+
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+					flightSegment.setConfiguration(flightSegmentConfiguration);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
+					FlightSegmentConfiguration configuration = entityManager
+							.createQuery("from FlightSegmentConfiguration where id = :id", FlightSegmentConfiguration.class)
+							.setParameter("id", id)
+							.getSingleResult();
+					assertNotNull(configuration);
+					assertEquals(1, configuration.getSegment().getFlight().getId());
+					assertNotNull(configuration.getSegment().getConfiguration());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+
+					Freight freight = new Freight();
+					freight.setFreightNumber(1);
+					freight.setFlightSegment(flightSegment);
+
+					entityManager.persist(freight);
+
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					Freight freight = entityManager.find(Freight.class, 1);
+					assertNotNull(freight);
+					assertEquals(1, freight.getFlightSegment().getFlight().getId());
+				}
+		);
+	}
+
+	@AfterEach
+	void cleanUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createQuery("delete from Freight").executeUpdate();
+					entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
+					entityManager.createQuery("delete from FlightSegment").executeUpdate();
+					entityManager.createQuery("delete from Flight").executeUpdate();
+				}
+		);
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdMaxDepthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdMaxDepthTest.java
index 302b3ba9021d..31e82cd57245 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdMaxDepthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/HierarchicalCompositeIdMaxDepthTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.cid;
 
 import org.hibernate.cfg.AvailableSettings;
@@ -13,181 +17,181 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Jpa(
-        annotatedClasses = {
-                Flight.class,
-                FlightSegment.class,
-                FlightSegmentConfiguration.class,
-                Freight.class
-        },
-        properties = @Setting(name = AvailableSettings.MAX_FETCH_DEPTH, value = "0")
+		annotatedClasses = {
+				Flight.class,
+				FlightSegment.class,
+				FlightSegmentConfiguration.class,
+				Freight.class
+		},
+		properties = @Setting(name = AvailableSettings.MAX_FETCH_DEPTH, value = "0")
 )
 public class HierarchicalCompositeIdMaxDepthTest {
 
-    @Test
-    void testFetchFlightSegmentFromFlight(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    Flight flight = entityManager.find(Flight.class, 1);
-                    assertNotNull(flight);
-                    assertEquals(1, flight.getSegments().get(0).getSegmentNumber());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegment(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment segment = entityManager.find(FlightSegment.class, new FlightSegmentId(1, 1));
-                    assertNotNull(segment);
-                    assertEquals(1, segment.getFlight().getId());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegmentConfiguration(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
-
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-                    flightSegment.setConfiguration(flightSegmentConfiguration);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
-                    FlightSegmentConfiguration configuration = entityManager.find(FlightSegmentConfiguration.class, id);
-                    assertNotNull(configuration);
-                    assertEquals(1, configuration.getSegment().getFlight().getId());
-                    assertNotNull(configuration.getSegment().getConfiguration());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFlightSegmentConfigurationViaQuery(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
-
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-                    flightSegment.setConfiguration(flightSegmentConfiguration);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
-                    FlightSegmentConfiguration configuration = entityManager
-                            .createQuery("from FlightSegmentConfiguration where id = :id", FlightSegmentConfiguration.class)
-                            .setParameter("id", id)
-                            .getSingleResult();
-                    assertNotNull(configuration);
-                    assertEquals(1, configuration.getSegment().getFlight().getId());
-                    assertNotNull(configuration.getSegment().getConfiguration());
-                }
-        );
-    }
-
-    @Test
-    void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    FlightSegment flightSegment = new FlightSegment();
-                    flightSegment.setSegmentNumber(1);
-
-                    Flight flight = new Flight();
-                    flight.setId(1);
-                    flight.setSegments(new ArrayList<>());
-                    flight.addSegment(flightSegment);
-
-                    entityManager.persist(flight);
-
-                    Freight freight = new Freight();
-                    freight.setFreightNumber(1);
-                    freight.setFlightSegment(flightSegment);
-
-                    entityManager.persist(freight);
-
-                    entityManager.flush();
-                    entityManager.clear();
-                }
-        );
-
-        scope.inTransaction(
-                entityManager -> {
-                    Freight freight = entityManager.find(Freight.class, 1);
-                    assertNotNull(freight);
-                    assertEquals(1, freight.getFlightSegment().getFlight().getId());
-                }
-        );
-    }
-
-    @AfterEach
-    void cleanUp(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    entityManager.createQuery("delete from Freight").executeUpdate();
-                    entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
-                    entityManager.createQuery("delete from FlightSegment").executeUpdate();
-                    entityManager.createQuery("delete from Flight").executeUpdate();
-                }
-        );
-    }
+	@Test
+	void testFetchFlightSegmentFromFlight(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					Flight flight = entityManager.find(Flight.class, 1);
+					assertNotNull(flight);
+					assertEquals(1, flight.getSegments().get(0).getSegmentNumber());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegment(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment segment = entityManager.find(FlightSegment.class, new FlightSegmentId(1, 1));
+					assertNotNull(segment);
+					assertEquals(1, segment.getFlight().getId());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegmentConfiguration(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
+
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+					flightSegment.setConfiguration(flightSegmentConfiguration);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
+					FlightSegmentConfiguration configuration = entityManager.find(FlightSegmentConfiguration.class, id);
+					assertNotNull(configuration);
+					assertEquals(1, configuration.getSegment().getFlight().getId());
+					assertNotNull(configuration.getSegment().getConfiguration());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFlightSegmentConfigurationViaQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfiguration flightSegmentConfiguration = new FlightSegmentConfiguration();
+
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+					flightSegment.setConfiguration(flightSegmentConfiguration);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegmentConfigurationId id = new FlightSegmentConfigurationId(new FlightSegmentId(1, 1));
+					FlightSegmentConfiguration configuration = entityManager
+							.createQuery("from FlightSegmentConfiguration where id = :id", FlightSegmentConfiguration.class)
+							.setParameter("id", id)
+							.getSingleResult();
+					assertNotNull(configuration);
+					assertEquals(1, configuration.getSegment().getFlight().getId());
+					assertNotNull(configuration.getSegment().getConfiguration());
+				}
+		);
+	}
+
+	@Test
+	void testFetchFlightFromFreight(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					FlightSegment flightSegment = new FlightSegment();
+					flightSegment.setSegmentNumber(1);
+
+					Flight flight = new Flight();
+					flight.setId(1);
+					flight.setSegments(new ArrayList<>());
+					flight.addSegment(flightSegment);
+
+					entityManager.persist(flight);
+
+					Freight freight = new Freight();
+					freight.setFreightNumber(1);
+					freight.setFlightSegment(flightSegment);
+
+					entityManager.persist(freight);
+
+					entityManager.flush();
+					entityManager.clear();
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					Freight freight = entityManager.find(Freight.class, 1);
+					assertNotNull(freight);
+					assertEquals(1, freight.getFlightSegment().getFlight().getId());
+				}
+		);
+	}
+
+	@AfterEach
+	void cleanUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createQuery("delete from Freight").executeUpdate();
+					entityManager.createQuery("delete from FlightSegmentConfiguration").executeUpdate();
+					entityManager.createQuery("delete from FlightSegment").executeUpdate();
+					entityManager.createQuery("delete from Flight").executeUpdate();
+				}
+		);
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java
index 3bc1ba1f47fe..e555a417497f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java
index 13819cc479d0..1692a0915569 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
@@ -17,6 +15,6 @@
 @Table(name = "OrderTableFoobar")
 public class Order {
 	@Id
-    @GeneratedValue
-    public Integer id;
+	@GeneratedValue
+	public Integer id;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java
index 010dc5797709..3532cf0c1836 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
@@ -15,8 +13,8 @@
 @Entity
 @IdClass(OrderLinePk.class)
 public class OrderLine {
-    @Id
-    public Order order;
-    @Id
-    public Product product;
+	@Id
+	public Order order;
+	@Id
+	public Product product;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java
index bd1c7a758be7..2ca31e3208a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
@@ -14,9 +12,9 @@
  */
 public class OrderLinePk implements Serializable {
 	@ManyToOne
-    @JoinColumn(name = "foo", nullable = false)
-    public Order order;
+	@JoinColumn(name = "foo", nullable = false)
+	public Order order;
 	@ManyToOne
-    @JoinColumn(name = "bar", nullable = false)
-    public Product product;    
+	@JoinColumn(name = "bar", nullable = false)
+	public Product product;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java
index 9950a28a3ce4..85f0f7da5b94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java
index d13436594e3f..cfdcbe3f9842 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java
index efadba23f0df..c5312d043172 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java
index d03185b7785c..a52360570465 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import jakarta.persistence.Entity;
@@ -14,5 +12,5 @@
 @Entity
 public class Product {
 	@Id
-    public String name;
+	public String name;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java
index 2eb48ded08c0..5e75f6d205fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java
index d9238d9328cb..36564a49b7aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java
index e961aa8020fa..c4cd60c6450b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.util.Date;
 import jakarta.persistence.AssociationOverride;
@@ -28,6 +24,6 @@ public class TvMagazin {
 	@EmbeddedId
 	public TvMagazinPk id;
 	@Temporal(TemporalType.TIME)
-    @Column(name="`time`")
+	@Column(name="`time`")
 	Date time;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java
index 3512d19b1c17..42ded127e0c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
@@ -20,7 +16,7 @@ public class TvMagazinPk implements Serializable {
 	@ManyToOne
 	@JoinColumn(nullable=false)
 	public Channel channel;
-	
+
 	@ManyToOne
 	@JoinColumn(nullable=false)
 	public Presenter presenter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java
index 0c8bfb632401..464dc17943f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.util.Date;
 import jakarta.persistence.AssociationOverride;
@@ -35,7 +31,7 @@ public class TvProgram {
 	public TvMagazinPk id;
 
 	@Temporal( TemporalType.TIME )
-    @Column(name="`time`")
+	@Column(name="`time`")
 	Date time;
 
 	@Column( name = "TXT", table = "TV_PROGRAM_EXT" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java
index f4ddc9496972..a8d758708a81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.cid;
 import java.util.Date;
 import jakarta.persistence.Column;
@@ -34,11 +30,9 @@ public class TvProgramIdClass {
 	public Presenter presenter;
 
 	@Temporal( TemporalType.TIME )
-    @Column(name="`time`")
+	@Column(name="`time`")
 	Date time;
 
 	@Column( name = "TXT", table = "TV_PROGRAM_IDCLASS" )
 	public String text;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java
index ec01d1347def..bf82f9241926 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java
index 8f2609d85cd3..bb194d949a44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
@@ -36,4 +34,3 @@ public void setPrimaryKey(PrimaryKey primaryKey) {
 		this.primaryKey = primaryKey;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
index cb0d75d24359..ab76aa9d82f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java
index 8de25fd388a9..43f475b30ea7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/NestedKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/NestedKeyManyToOneTest.java
index 79aaae5327c4..e0337f34fc37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/NestedKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/NestedKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java
index 291ceb29c2a4..1651051a6949 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java
index f28d4b57d45c..970a416a17e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java
index 2063b24e0e23..ca606ef8fef9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone.association;
 
@@ -37,4 +35,3 @@ public void setPrimaryKey(PrimaryKey primaryKey) {
 		this.primaryKey = primaryKey;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java
index 37c0424b42b8..d48996dc8e15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java
index 78d3391e8f91..7264bbd9f49a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java
index 080587f158d3..9d4ef4161538 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/MySQLCollateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/MySQLCollateTest.java
index 8a86fbc50434..9713d7eecaa6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/MySQLCollateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/MySQLCollateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collate;
 
 import jakarta.persistence.Basic;
@@ -21,21 +25,21 @@
 @SkipForDialect(dialectClass = TiDBDialect.class)
 public class MySQLCollateTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction(session -> session.persist(new Message("Hello, world!")));
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction(session -> session.persist(new Message("Hello, world!")));
+	}
 
-    @Entity(name = "msgs")
-    static class Message {
-        @Id @GeneratedValue
-        Long id;
-        @Basic(optional = false)
-        @Collate("utf8mb4_spanish2_ci")
-        @Column(length = 200)
-        String text;
+	@Entity(name = "msgs")
+	static class Message {
+		@Id @GeneratedValue
+		Long id;
+		@Basic(optional = false)
+		@Collate("utf8mb4_spanish2_ci")
+		@Column(length = 200)
+		String text;
 
-        public Message(String text) {
-            this.text = text;
-        }
-    }
+		public Message(String text) {
+			this.text = text;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
index d7e7bad20afe..6f50c9e89983 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collate;
 
 import jakarta.persistence.Basic;
@@ -18,21 +22,21 @@
 @RequiresDialect(PostgreSQLDialect.class)
 public class PostgresCollateTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction(session -> session.persist(new Message("Hello, world!")));
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction(session -> session.persist(new Message("Hello, world!")));
+	}
 
-    @Entity(name = "msgs")
-    static class Message {
-        @Id @GeneratedValue
-        Long id;
-        @Basic(optional = false)
-        @Collate("en_US")
-        @Column(length = 200)
-        String text;
+	@Entity(name = "msgs")
+	static class Message {
+		@Id @GeneratedValue
+		Long id;
+		@Basic(optional = false)
+		@Collate("en_US")
+		@Column(length = 200)
+		String text;
 
-        public Message(String text) {
-            this.text = text;
-        }
-    }
+		public Message(String text) {
+			this.text = text;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java
index cc652ad1caeb..58536fd2f11d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -106,7 +102,7 @@ public void setPreferredNames(Set preferredNames) {
 		this.preferredNames = preferredNames;
 	}
 
-	@ElementCollection	
+	@ElementCollection
 	@MapKeyColumn(nullable=false)
 	public Map getScorePerPreferredName() {
 		return scorePerPreferredName;
@@ -154,7 +150,7 @@ public void setFavoriteToys(Set favoriteToys) {
 
 	@ElementCollection
 	@Enumerated(EnumType.STRING)
-    @Column(name = "`characters`")
+	@Column(name = "`characters`")
 	public Set getCharacters() {
 		return characters;
 	}
@@ -184,4 +180,3 @@ public void setCountryAttitudes(Set countryAttitudes) {
 		this.countryAttitudes = countryAttitudes;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java
index d984de25a9e0..be8b9e6278e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java
index d30a2afa99cb..464b29c15d1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java
index 15b19965473d..db1c6b786942 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CharacterTrait.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CharacterTrait.java
index 17aa9dc96216..d3b1bd683a97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CharacterTrait.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CharacterTrait.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java
index 5c1e1212c15f..061dfe879925 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java
index 7564204ba766..4e2a2b046331 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java
index 5a3b971a2952..fcab6e294ab0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
index fc84adcc8488..534b04cb648f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.sql.PreparedStatement;
@@ -232,4 +236,4 @@ public OauthConnectionId(UUID primarySID, String connection) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java
index 22c69e6d9753..b1241f610754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionReferencingIdColumnsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionReferencingIdColumnsTest.java
index 08c818f653d6..4f25ba12f455 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionReferencingIdColumnsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionReferencingIdColumnsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java
index cf1c137b86bb..d4b0baaa7a77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java
index 45510d8f8652..85173ea9aa69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
@@ -18,9 +16,6 @@
 import jakarta.persistence.ManyToOne;
 
 import org.hibernate.Hibernate;
-import org.hibernate.query.criteria.HibernateCriteriaBuilder;
-import org.hibernate.query.criteria.JpaCriteriaQuery;
-import org.hibernate.query.criteria.JpaRoot;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -140,8 +135,8 @@ public void testAccessIdOfManyToOneInEmbeddable(SessionFactoryScope scope) {
 				session ->
 						assertFalse( session.createQuery(
 								"from Parent p join p.containedChildren c where c.child.id is not null", Parent.class )
-											 .getResultList()
-											 .isEmpty() )
+											.getResultList()
+											.isEmpty() )
 
 		);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java
index dccf077c1438..bccdcd9e32d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java
index 3e9165a9de49..9132dd4d6104 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/FavoriteFood.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/FavoriteFood.java
index eba8b5bedcd6..e892524d651d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/FavoriteFood.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/FavoriteFood.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java
index 0ddfe1048d49..8bbf76615ca1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java
index 4deea4e0e47b..8e0f46900671 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java
index 2bb4b8668d12..31c1bd0c6ec9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/MyImprovedNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/MyImprovedNamingStrategy.java
index 7f7869616969..f12c71b0765a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/MyImprovedNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/MyImprovedNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OnDeleteCascadeToElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OnDeleteCascadeToElementCollectionTest.java
index 897aaa098e88..1d14d28d38c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OnDeleteCascadeToElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OnDeleteCascadeToElementCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.time.LocalDate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java
index 0c8081c3a31f..5ea888db4f7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByTest.java
index 220db37dc24d..0bf1b454ba53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java
index 7d4382aec287..2a2e2c9e5db4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java
index 651aae0aaecb..bae3d612027a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java
index c145eb15c8c4..8794951fed8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
@@ -12,7 +10,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java
index 4ba5feb82045..c4bbe3ff9a9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java
index 781cd322448e..da8e21cd383f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java
index 88737b508db4..9c74c4c44180 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 import java.util.Set;
@@ -17,7 +15,7 @@ public class Products {
 	@Id
 	@GeneratedValue
 	private Integer id;
-	
+
 	@ElementCollection
 	@OrderBy("name ASC")
 	private Set widgets;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java
index f6d540dd6d1a..f807b1770739 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java
index 046325e6a9a4..b247fa7733f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java
index bf24653c0b55..fe1da8d27898 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.collectionelement;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java
index 4e81f626741e..a74ea1c4410c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement;
 import jakarta.persistence.Column;
@@ -30,7 +28,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@Id
 	@GeneratedValue
 	public int getId() {
@@ -51,4 +49,3 @@ public static class Widget2 extends Widgets{
 		private String name2;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java
index 63833bd72db6..b8db410d624e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements;
 import java.util.List;
 import jakarta.persistence.ElementCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java
index 0120b6f13e2d..e5c981235413 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements;
 import java.util.List;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java
index 90c1800351f3..e1357de503ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
index a46f5369b01b..66547a170e9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java
index 9877db610e37..7ea2e7af4480 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcustomenumdef;
 
@@ -54,17 +52,17 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@Override
 	public boolean equals(Object obj) {
 		if (! obj.getClass().equals( Location.class )) {
 			return false;
 		}
-		
+
 		Location loc = (Location) obj;
 		if (name != null ? !name.equals(loc.name) : loc.name != null) return false;
 		if (type != null ? !type.equals(loc.type) : loc.type != null) return false;
-		
+
 		return true;
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java
index 9efd054cb0d9..fc7504276dcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcustomenumdef;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java
index b378e22b44cd..5ff2aec216e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcustomenumdef;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java
index baf001858a55..1d5a9241dd8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement.indexedCollection;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
index 63d5d5787f18..116661f62c28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.indexedCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java
index 527c4bc8acae..485a8e840d13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.collectionelement.indexedCollection;
 
 import java.sql.Types;
@@ -32,10 +28,10 @@
 public class Sale {
 	@Id @GeneratedValue private Integer id;
 	@ElementCollection
-    @JoinTable(
-        name = "contact",
-        joinColumns = @JoinColumn(name = "n_key_person"))
-    @CollectionId( column = @Column(name = "n_key_contact"), generator = "increment" )
+	@JoinTable(
+		name = "contact",
+		joinColumns = @JoinColumn(name = "n_key_person"))
+	@CollectionId( column = @Column(name = "n_key_contact"), generator = "increment" )
 	@CollectionIdJdbcTypeCode( Types.BIGINT )
 	private List contacts = new ArrayList();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java
index 88d1ec75605c..447eebfadd1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java
index 001eafffccba..2f4f18a0d8c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java
index be92ec4f1b12..b3ebc7535a84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
index 8ddb8f721524..f11db4ec61c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
index 7ecbd98b5edd..9186472a0ef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java
index 8b1acd11dfc7..6df5abc72544 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java
index e5b9fc18c384..7fcf98f458cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java
index dbe404b494c5..04114100f5be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java
index 4856fc659ebb..a48db50ee127 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java
index 7ec8b091b8ae..60677ae8b6cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.comment;
 
@@ -21,7 +19,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java
index a6cb04c43d8b..685ad25eef6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.comment;
 
@@ -19,7 +17,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java
index 3580404d1546..010b6266519c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.configuration;
 
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
@@ -19,7 +15,7 @@
  * @author Emmanuel Bernard
  */
 public class ConfigurationTest  {
-    @Test
+	@Test
 	public void testMixPackageAndResourceOrdering() throws Exception {
 		try (BootstrapServiceRegistry serviceRegistry = new BootstrapServiceRegistryBuilder().build()) {
 			Configuration config = new Configuration( serviceRegistry );
@@ -27,7 +23,7 @@ public void testMixPackageAndResourceOrdering() throws Exception {
 			config.addPackage( "org.hibernate.orm/test.annotations.configuration" );
 		}
 		catch( Exception e ) {
-            Assert.fail( "Processing package first when ORM.xml is used should not fail" );
+			Assert.fail( "Processing package first when ORM.xml is used should not fail" );
 		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java
index 24294a9ea460..934afae8baf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java
@@ -7,4 +7,3 @@
 @GenericGenerator(name = "myGenerator", strategy = "sequence")
 package org.hibernate.orm.test.annotations.configuration;
 import org.hibernate.annotations.GenericGenerator;
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
index 05e5ef6c8031..05f1b8730769 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.dataTypes;
 
@@ -16,7 +14,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.dialect.SybaseASEDialect;
@@ -24,11 +21,9 @@
 import org.hibernate.jdbc.Work;
 import org.hibernate.type.descriptor.JdbcTypeNameMapper;
 
-import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
-import org.hibernate.testing.orm.junit.RequiresDialectFeatureGroup;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -131,10 +126,10 @@ private void validateColumn(Connection connection, String columnName, int expect
 			String columnNamePattern = generateFinalNamePattern( meta, columnName );
 
 			ResultSet columnInfo = meta.getColumns( null, null, tableNamePattern, columnNamePattern );
-            s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( columnInfo, columnInfo.getStatement() );
+			s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( columnInfo, columnInfo.getStatement() );
 			assertTrue( columnInfo.next() );
 			int dataType = columnInfo.getInt( "DATA_TYPE" );
-            s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( columnInfo, columnInfo.getStatement() );
+			s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( columnInfo, columnInfo.getStatement() );
 			assertEquals(
 					JdbcTypeNameMapper.getTypeName( expectedJdbcTypeCode ),
 					JdbcTypeNameMapper.getTypeName( dataType ),
@@ -178,4 +173,3 @@ public void execute(Connection connection) throws SQLException {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/Grade.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/Grade.java
index 48d118f3ea2f..ecfb0a08bd56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/Grade.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/Grade.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.dataTypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeEntity.java
index d19e56b9446c..da55b14c5dd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.dataTypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeOtherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeOtherEntity.java
index 92863f9235ae..58c666a60816 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeOtherEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/SomeOtherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.dataTypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Dependent.java
index 35dbc2709d44..f89c78e37824 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Dependent.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
@@ -44,5 +39,3 @@ public DependentId getId() {
 		return id;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/DependentId.java
index 47bcd72902f1..a11bbc23c132 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/DependentId.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
@@ -32,5 +27,3 @@ public String getName() {
 		return name;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employee.java
index 3fe9298569c4..af8f341ca136 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
 package org.hibernate.orm.test.annotations.derivedidentities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -41,5 +37,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employer.java
index 356ca6c0ae99..290c0bc0a61c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Employer.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/EmployerId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/EmployerId.java
index bd6e6dac3514..dbdc24878f2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/EmployerId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/EmployerId.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/MedicalHistory.java
index 44dc6dbd3bdd..933621bc5b67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/MedicalHistory.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
@@ -43,5 +38,3 @@ public void setXrayData(byte[] xrayData) {
 		this.xrayData = xrayData;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Person.java
index 6131bfa295e7..b746e74718ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/Person.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.annotations.derivedidentities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -30,5 +25,3 @@ public String getSsn() {
 		return ssn;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Bar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Bar.java
index f1625c1d57a8..6ff17390b9d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Bar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Bar.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java
index d2b5a0dff369..a2b8a38e9216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java
index 20299b9cb043..5ad21dcf6c3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
@@ -74,7 +72,7 @@ public void testMergeTransientIdManyToOne(SessionFactoryScope scope) {
 
 		// assertion for HHH-11274 - checking for exception
 		final Object identifier = new PersistenceUnitUtilImpl( scope.getSessionFactory() ).getIdentifier( transientCart.getLineItems()
-																												  .get( 0 ) );
+																												.get( 0 ) );
 
 		// merge ID with transient many-to-one
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Dependent.java
index 6ef2e31e6e55..b091f5cd0ea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java
index 21136b123010..f5aa17bd533f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
@@ -13,5 +11,3 @@
 public class DependentId {
 	long emp; // matches name of @Id attribute and type of Employee PK
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java
index c32ab4b921a3..b2bb521ba25a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
@@ -57,6 +55,6 @@ public void testBidirectionalAssociation(SessionFactoryScope scope) {
 
 	private  T getDerivedClassById(Employee e, Session s, Class clazz) {
 		return clazz.cast( s.createQuery( "from " + clazz.getName() + " d where d.emp.empId = :empId" )
-								   .setParameter( "empId", e.empId ).uniqueResult() );
+								.setParameter( "empId", e.empId ).uniqueResult() );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Employee.java
index 0ee85949371d..f7b581d7537e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Foo.java
index b865ff23285e..c548af551abe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Foo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java
index e71245c0be63..72a91a673a58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
index 9d1e8c0f0045..317933dc1edd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
index 7e5e22d4834d..120efc3ca995 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java
index 2f615ef7b81a..8e84661d3c79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Order.java
index a5e15aca9ddc..cc624bb9e5ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
@@ -24,7 +22,7 @@ public class Order implements Serializable
 	@Id
 	@GeneratedValue
 	private Long id;
-	
+
 	@Column(name = "name", length = 20)
 	private String name;
 
@@ -35,7 +33,7 @@ public Long getId()
 	{
 		return id;
 	}
-	
+
 	public void setId(Long id)
 	{
 		this.id = id;
@@ -61,7 +59,7 @@ public void setLineItems(Set lineItems)
 		this.lineItems = lineItems;
 	}
 
-	public void addLineItem(Product product, Integer amount) 
+	public void addLineItem(Product product, Integer amount)
 	{
 		OrderLine part = new OrderLine(this, product, amount);
 		lineItems.add(part);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLine.java
index 33b96b660926..2eed3be99ce6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
@@ -29,7 +27,7 @@ public class OrderLine implements Serializable
 	private Product product;
 	@Column(name = "amount")
 	private Integer amount;
-	
+
 	public OrderLine()
 	{
 		super();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java
index 0a1073a144e5..19399a49ef13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Person.java
index 54453d09d65c..07e0db9f787b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/PersonInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/PersonInfo.java
index 0a3bec43b6a1..fb3c315cb3cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/PersonInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/PersonInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Product.java
index 36bc2057f81d..dce2a99c93bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 import java.io.Serializable;
@@ -20,7 +18,7 @@ public class Product implements Serializable
 	@Id
 	@GeneratedValue
 	private Long id;
-	
+
 	@Column(name = "name", length = 20)
 	private String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Dependent.java
index ad340778d87a..2e709b9b8161 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.a;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DependentId.java
index 766e6579dca8..e1b15665e074 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
index 46b9fa35cc04..a2b6776e4727 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Employee.java
index 6c343a5fff31..de4c3fc97502 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.a;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java
index c96007e63a30..41659fe8bc89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java
index 81ebee0f6189..743c3d3d988a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
index 48a392062dbb..183de997105f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java
index 71e9976dfbea..3766d0e5033b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
index 01da2b70a76c..2362037f1af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java
index 9bc70db07c77..1345d92905bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
@@ -182,7 +180,7 @@ public List getInventories() {
 	}
 
 	public CustomerInventory addInventory(Item item, int quantity,
-										  BigDecimal totalValue) {
+										BigDecimal totalValue) {
 
 		CustomerInventory inventory = new CustomerInventory(
 				this, item,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java
index b09390dbdadb..93edcd3d0031 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java
index a91076b6c691..932e442e10d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java
index f2319b0df872..99cfea897910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 
@@ -70,7 +68,7 @@ public void testComplexIdClass() {
 		c1.addInventory( house, 100, new BigDecimal( 50000 ) );
 		s.merge( c1 );
 		tx.commit();
-		
+
 
 		tx = s.beginTransaction();
 		Customer c12 = ( Customer ) s.createQuery( "select c from Customer c" ).uniqueResult();
@@ -103,20 +101,20 @@ public void testComplexIdClass() {
 				.uniqueResult();
 		assertEquals( 3, c13.getInventories().size() );
 
-		
-		
+
+
 		Customer customer2 = new Customer(
-                "foo2", "bar2", "contact12", "1002", new BigDecimal( 10002 ), new BigDecimal( 10002 ), new BigDecimal( 1000 ));
+				"foo2", "bar2", "contact12", "1002", new BigDecimal( 10002 ), new BigDecimal( 10002 ), new BigDecimal( 1000 ));
 		customer2.setId(2);
 		s.persist(customer2);
-		
+
 		customer2.addInventory(boat, 10, new BigDecimal(400));
 		customer2.addInventory(house2, 3, new BigDecimal(4000));
 		s.merge(customer2);
-		
+
 		Customer c23 = ( Customer ) s.createQuery( "select c from Customer c where c.id = 2" ).uniqueResult();
 		assertEquals( 2, c23.getInventories().size() );
-	
+
 		tx.rollback();
 		s.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java
index 48c6fd9e09b2..a7240b6e2c75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
index 37d5b6f89161..670254d98dd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.math.BigDecimal;
@@ -20,91 +17,91 @@
 
 public class CompositeKeyDeleteTest extends BaseCoreFunctionalTestCase {
 
-   @Override
-   protected String getBaseForMappings() {
-      return "";
-   }
-
-   @Override
-   public String[] getMappings() {
-      return new String[] { "org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml" };
-   }
-
-   public CompositeKeyDeleteTest() {
-      System.setProperty( "hibernate.enable_specj_proprietary_syntax", "true" );
-   }
-   /**
-    * This test checks to make sure the non null column is not updated with a
-    * null value when a CustomerInventory is removed.
-    */
-   @Test
-   public void testRemove() {
-      Session s = openSession();
-      Transaction tx = s.beginTransaction();
-
-      CustomerTwo c1 = new CustomerTwo(
-            "foo", "bar", "contact1", "100", new BigDecimal( 1000 ), new BigDecimal( 1000 ), new BigDecimal( 1000 )
-      );
-
-      s.persist( c1 );
-      s.flush();
-      s.clear();
-
-      Item boat = new Item();
-      boat.setId( "1" );
-      boat.setName( "cruiser" );
-      boat.setPrice( new BigDecimal( 500 ) );
-      boat.setDescription( "a boat" );
-      boat.setCategory( 42 );
-
-      s.persist( boat );
-
-
-      Item house = new Item();
-      house.setId( "2" );
-      house.setName( "blada" );
-      house.setPrice( new BigDecimal( 5000 ) );
-      house.setDescription( "a house" );
-      house.setCategory( 74 );
-
-      s.persist( house );
-      s.flush();
-      s.clear();
-
-      c1.addInventory( boat, 10, new BigDecimal( 5000 ) );
-
-      c1.addInventory( house, 100, new BigDecimal( 50000 ) );
-      s.merge( c1 );
-      Integer id = c1.getId();
-      tx.commit();
-      s.close();
-      
-      s = openSession();
-      tx = s.beginTransaction();
-
-      CustomerTwo c12 = ( CustomerTwo) s.createQuery( "select c from CustomerTwo c" ).uniqueResult();
-      Assert.assertNotNull(c12);
-      List list = c12.getInventories();
-      Assert.assertNotNull(list);
-      Assert.assertEquals(2, list.size());
-      CustomerInventoryTwo ci = list.get(1);
-      list.remove(ci);
-      s.remove(ci);
-      s.flush();
-      
-      tx.commit();//fail
-      s.close();
-
-   }
-
-   @Override
-   protected Class[] getAnnotatedClasses() {
-      return new Class[] {
-            CustomerTwo.class,
-            CustomerInventoryTwo.class,
-            CustomerInventoryTwoPK.class,
-            Item.class
-
-      };
-   }
+@Override
+protected String getBaseForMappings() {
+	return "";
+}
+
+@Override
+public String[] getMappings() {
+	return new String[] { "org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml" };
+}
+
+public CompositeKeyDeleteTest() {
+	System.setProperty( "hibernate.enable_specj_proprietary_syntax", "true" );
+}
+/**
+	* This test checks to make sure the non null column is not updated with a
+	* null value when a CustomerInventory is removed.
+	*/
+@Test
+public void testRemove() {
+	Session s = openSession();
+	Transaction tx = s.beginTransaction();
+
+	CustomerTwo c1 = new CustomerTwo(
+			"foo", "bar", "contact1", "100", new BigDecimal( 1000 ), new BigDecimal( 1000 ), new BigDecimal( 1000 )
+	);
+
+	s.persist( c1 );
+	s.flush();
+	s.clear();
+
+	Item boat = new Item();
+	boat.setId( "1" );
+	boat.setName( "cruiser" );
+	boat.setPrice( new BigDecimal( 500 ) );
+	boat.setDescription( "a boat" );
+	boat.setCategory( 42 );
+
+	s.persist( boat );
+
+
+	Item house = new Item();
+	house.setId( "2" );
+	house.setName( "blada" );
+	house.setPrice( new BigDecimal( 5000 ) );
+	house.setDescription( "a house" );
+	house.setCategory( 74 );
+
+	s.persist( house );
+	s.flush();
+	s.clear();
+
+	c1.addInventory( boat, 10, new BigDecimal( 5000 ) );
+
+	c1.addInventory( house, 100, new BigDecimal( 50000 ) );
+	s.merge( c1 );
+	Integer id = c1.getId();
+	tx.commit();
+	s.close();
+
+	s = openSession();
+	tx = s.beginTransaction();
+
+	CustomerTwo c12 = ( CustomerTwo) s.createQuery( "select c from CustomerTwo c" ).uniqueResult();
+	Assert.assertNotNull(c12);
+	List list = c12.getInventories();
+	Assert.assertNotNull(list);
+	Assert.assertEquals(2, list.size());
+	CustomerInventoryTwo ci = list.get(1);
+	list.remove(ci);
+	s.remove(ci);
+	s.flush();
+
+	tx.commit();//fail
+	s.close();
+
+}
+
+@Override
+protected Class[] getAnnotatedClasses() {
+	return new Class[] {
+			CustomerTwo.class,
+			CustomerInventoryTwo.class,
+			CustomerInventoryTwoPK.class,
+			Item.class
+
+	};
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
index 26a98137efc1..b55e15a5d9bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
@@ -33,98 +31,98 @@
 @Table(name = "O_CUSTINVENTORY")
 @IdClass(CustomerInventoryTwoPK.class)
 public class CustomerInventoryTwo implements Serializable,
-      Comparator {
-
-   @Id
-   @TableGenerator(name = "inventory", table = "U_SEQUENCES", pkColumnName = "S_ID", valueColumnName = "S_NEXTNUM", pkColumnValue = "inventory", allocationSize = 1000)
-   @GeneratedValue(strategy = GenerationType.TABLE, generator = "inventory")
-   @Column(name = "CI_ID")
-   private Integer id;
-
-   @Id
-   @Column(name = "CI_CUSTOMERID", insertable = false, updatable = false)
-   private int custId;
-
-   @ManyToOne(cascade = CascadeType.MERGE)
-   @JoinColumn(name = "CI_CUSTOMERID", nullable = false)
-   private CustomerTwo customer;
-
-   @ManyToOne(cascade = CascadeType.MERGE)
-   @JoinColumn(name = "CI_ITEMID")
-   private Item vehicle;
-
-   @Column(name = "CI_VALUE")
-   private BigDecimal totalCost;
-
-   @Column(name = "CI_QUANTITY")
-   private int quantity;
-
-   @Version
-   @Column(name = "CI_VERSION")
-   private int version;
-
-   protected CustomerInventoryTwo() {
-   }
-
-   CustomerInventoryTwo(CustomerTwo customer, Item vehicle, int quantity,
-         BigDecimal totalValue) {
-      this.customer = customer;
-      this.vehicle = vehicle;
-      this.quantity = quantity;
-      this.totalCost = totalValue;
-   }
-
-   public Item getVehicle() {
-      return vehicle;
-   }
-
-   public BigDecimal getTotalCost() {
-      return totalCost;
-   }
-
-   public int getQuantity() {
-      return quantity;
-   }
-
-   public Integer getId() {
-      return id;
-   }
-
-   public CustomerTwo getCustomer() {
-      return customer;
-   }
-
-   public int getCustId() {
-      return custId;
-   }
-
-   public int getVersion() {
-      return version;
-   }
-
-   public int compare(CustomerInventoryTwo cdb1, CustomerInventoryTwo cdb2) {
-      return cdb1.id.compareTo(cdb2.id);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj == this) {
-         return true;
-      }
-      if (obj == null || !(obj instanceof CustomerInventoryTwo)) {
-         return false;
-      }
-      if (this.id == ((CustomerInventoryTwo) obj).id) {
-         return true;
-      }
-      if (this.id != null && ((CustomerInventoryTwo) obj).id == null) {
-         return false;
-      }
-      if (this.id == null && ((CustomerInventoryTwo) obj).id != null) {
-         return false;
-      }
-
-      return this.id.equals(((CustomerInventoryTwo) obj).id);
-   }
+	Comparator {
+
+@Id
+@TableGenerator(name = "inventory", table = "U_SEQUENCES", pkColumnName = "S_ID", valueColumnName = "S_NEXTNUM", pkColumnValue = "inventory", allocationSize = 1000)
+@GeneratedValue(strategy = GenerationType.TABLE, generator = "inventory")
+@Column(name = "CI_ID")
+private Integer id;
+
+@Id
+@Column(name = "CI_CUSTOMERID", insertable = false, updatable = false)
+private int custId;
+
+@ManyToOne(cascade = CascadeType.MERGE)
+@JoinColumn(name = "CI_CUSTOMERID", nullable = false)
+private CustomerTwo customer;
+
+@ManyToOne(cascade = CascadeType.MERGE)
+@JoinColumn(name = "CI_ITEMID")
+private Item vehicle;
+
+@Column(name = "CI_VALUE")
+private BigDecimal totalCost;
+
+@Column(name = "CI_QUANTITY")
+private int quantity;
+
+@Version
+@Column(name = "CI_VERSION")
+private int version;
+
+protected CustomerInventoryTwo() {
+}
+
+CustomerInventoryTwo(CustomerTwo customer, Item vehicle, int quantity,
+		BigDecimal totalValue) {
+	this.customer = customer;
+	this.vehicle = vehicle;
+	this.quantity = quantity;
+	this.totalCost = totalValue;
+}
+
+public Item getVehicle() {
+	return vehicle;
+}
+
+public BigDecimal getTotalCost() {
+	return totalCost;
+}
+
+public int getQuantity() {
+	return quantity;
+}
+
+public Integer getId() {
+	return id;
+}
+
+public CustomerTwo getCustomer() {
+	return customer;
+}
+
+public int getCustId() {
+	return custId;
+}
+
+public int getVersion() {
+	return version;
+}
+
+public int compare(CustomerInventoryTwo cdb1, CustomerInventoryTwo cdb2) {
+	return cdb1.id.compareTo(cdb2.id);
+}
+
+@Override
+public boolean equals(Object obj) {
+	if (obj == this) {
+		return true;
+	}
+	if (obj == null || !(obj instanceof CustomerInventoryTwo)) {
+		return false;
+	}
+	if (this.id == ((CustomerInventoryTwo) obj).id) {
+		return true;
+	}
+	if (this.id != null && ((CustomerInventoryTwo) obj).id == null) {
+		return false;
+	}
+	if (this.id == null && ((CustomerInventoryTwo) obj).id != null) {
+		return false;
+	}
+
+	return this.id.equals(((CustomerInventoryTwo) obj).id);
+}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
index a461848cc8e6..3e80c7dbe252 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
@@ -1,50 +1,47 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.io.Serializable;
 
 public class CustomerInventoryTwoPK implements Serializable {
 
-   private Integer id;
-   private int custId;
-
-   public CustomerInventoryTwoPK() {
-   }
-
-   public CustomerInventoryTwoPK(Integer id, int custId) {
-      this.id = id;
-      this.custId = custId;
-   }
-
-   public boolean equals(Object other) {
-      if ( other == this ) {
-         return true;
-      }
-      if ( other == null || getClass() != other.getClass() ) {
-         return false;
-      }
-      CustomerInventoryTwoPK cip = ( CustomerInventoryTwoPK ) other;
-      return ( custId == cip.custId && ( id == cip.id ||
-            ( id != null && id.equals( cip.id ) ) ) );
-   }
-
-   public int hashCode() {
-      return ( id == null ? 0 : id.hashCode() ) ^ custId;
-   }
-
-   public Integer getId() {
-      return id;
-   }
-
-   public int getCustId() {
-      return custId;
-   }
+private Integer id;
+private int custId;
+
+public CustomerInventoryTwoPK() {
+}
+
+public CustomerInventoryTwoPK(Integer id, int custId) {
+	this.id = id;
+	this.custId = custId;
+}
+
+public boolean equals(Object other) {
+	if ( other == this ) {
+		return true;
+	}
+	if ( other == null || getClass() != other.getClass() ) {
+		return false;
+	}
+	CustomerInventoryTwoPK cip = ( CustomerInventoryTwoPK ) other;
+	return ( custId == cip.custId && ( id == cip.id ||
+			( id != null && id.equals( cip.id ) ) ) );
+}
+
+public int hashCode() {
+	return ( id == null ? 0 : id.hashCode() ) ^ custId;
+}
+
+public Integer getId() {
+	return id;
+}
+
+public int getCustId() {
+	return custId;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
index dece4044be22..55c1611d2aa7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.io.Serializable;
@@ -179,7 +176,7 @@ public void setYtdPayment(BigDecimal ytdPayment) {
 		this.ytdPayment = ytdPayment;
 	}
 
-	
+
 	public List getInventories() {
 		if ( this.customerInventories == null ) {
 			this.customerInventories = new ArrayList();
@@ -188,7 +185,7 @@ public List getInventories() {
 	}
 
 	public CustomerInventoryTwo addInventory(Item item, int quantity,
-										  BigDecimal totalValue) {
+										BigDecimal totalValue) {
 
 		CustomerInventoryTwo inventory = new CustomerInventoryTwo(
 				this, item,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Customer.java
index 3be78b835640..42db072ec997 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
index 8208bd9ee4fc..26006f8761b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
index 3720fa8a8c65..4dbadaa50814 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
index f2060df93b50..d10fb8611e5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Item.java
index fe46cd2bc815..441da72309b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b2/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.b2;
 import java.io.Serializable;
@@ -17,108 +15,108 @@
 
 
 
-   @NamedQueries( {
-      @NamedQuery(name = "Item.findByCategory", 
-          query = "SELECT i FROM Item i WHERE i.category=:category ORDER BY i.id")})
-  @SuppressWarnings("serial")
-  @Entity
-  @Table(name = "O_ITEM")
-  public class Item implements Serializable 
-  {
-
-    public static final String QUERY_BY_CATEGORY = "Item.findByCategory";
-
-    @Id
-    @Column(name = "I_ID")
-    private String id;
-
-    @Column(name = "I_NAME")
-    private String name;
-
-    @Column(name = "I_PRICE")
-    private BigDecimal price;
-
-    @Column(name = "I_DESC")
-    private String description;
-
-    @Column(name = "I_DISCOUNT")
-    private BigDecimal discount;
-
-    @Column(name = "I_CATEGORY")
-    private int category;
-
-    @Version
-    @Column(name = "I_VERSION")
-    int version;
-    
-    public String getId() {
-       return id;
-     }
-
-     public void setId(String i) {
-       id = i;
-     }
-    
-    public int getCategory() {
-       return category;
-     }
-
-     public void setCategory(int category) {
-       this.category = category;
-     }
-
-     public String getDescription() {
-       return description;
-     }
-
-     public void setDescription(String description) {
-       this.description = description;
-     }
-
-     public BigDecimal getDiscount() {
-       return discount;
-     }
-
-     public void setDiscount(BigDecimal discount) {
-       if (discount.doubleValue() < 0 || discount.doubleValue() > 100.0)
-         throw new IllegalArgumentException(this + " discount " + discount
-             + " is invalid. Must be between 0.0 and 100.0");
-       this.discount = discount;
-     }
-
-     public String getName() {
-       return name;
-     }
-
-     public void setName(String name) {
-       this.name = name;
-     }
-
-     public BigDecimal getPrice() {
-       return price;
-     }
-
-     public void setPrice(BigDecimal price) {
-       this.price = price;
-     }
-
-     public int getVersion() {
-       return version;
-     }
-     
-     @Override
-     public boolean equals(Object other) {
-       if (other == null || other.getClass() != this.getClass()) {
-         return false;
-       }
-       if (other == this) {
-         return true;
-       }
-       return id.equals(((Item) other).id);
-     }
-
-     @Override
-     public int hashCode() {
-       return id.hashCode();
-     }
+@NamedQueries( {
+	@NamedQuery(name = "Item.findByCategory",
+		query = "SELECT i FROM Item i WHERE i.category=:category ORDER BY i.id")})
+@SuppressWarnings("serial")
+@Entity
+@Table(name = "O_ITEM")
+public class Item implements Serializable
+{
+
+	public static final String QUERY_BY_CATEGORY = "Item.findByCategory";
+
+	@Id
+	@Column(name = "I_ID")
+	private String id;
+
+	@Column(name = "I_NAME")
+	private String name;
+
+	@Column(name = "I_PRICE")
+	private BigDecimal price;
+
+	@Column(name = "I_DESC")
+	private String description;
+
+	@Column(name = "I_DISCOUNT")
+	private BigDecimal discount;
+
+	@Column(name = "I_CATEGORY")
+	private int category;
+
+	@Version
+	@Column(name = "I_VERSION")
+	int version;
+
+	public String getId() {
+	return id;
+	}
+
+	public void setId(String i) {
+	id = i;
+	}
+
+	public int getCategory() {
+	return category;
+	}
+
+	public void setCategory(int category) {
+	this.category = category;
+	}
+
+	public String getDescription() {
+	return description;
+	}
+
+	public void setDescription(String description) {
+	this.description = description;
+	}
+
+	public BigDecimal getDiscount() {
+	return discount;
+	}
+
+	public void setDiscount(BigDecimal discount) {
+	if (discount.doubleValue() < 0 || discount.doubleValue() > 100.0)
+		throw new IllegalArgumentException(this + " discount " + discount
+			+ " is invalid. Must be between 0.0 and 100.0");
+	this.discount = discount;
+	}
+
+	public String getName() {
+	return name;
+	}
+
+	public void setName(String name) {
+	this.name = name;
+	}
+
+	public BigDecimal getPrice() {
+	return price;
+	}
+
+	public void setPrice(BigDecimal price) {
+	this.price = price;
+	}
+
+	public int getVersion() {
+	return version;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+	if (other == null || other.getClass() != this.getClass()) {
+		return false;
+	}
+	if (other == this) {
+		return true;
+	}
+	return id.equals(((Item) other).id);
+	}
+
+	@Override
+	public int hashCode() {
+	return id.hashCode();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java
index d2ede03522fa..7409d6fcfba0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
index 87bf5d58b933..09c977b19015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java
index cca6db990a24..99e7e0a824b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Dependent.java
index 8aaf88bf89c6..d31477c1ec46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.a;
 import jakarta.persistence.Entity;
@@ -21,7 +19,7 @@
 public class Dependent {
 	@Id
 	String name;
-	
+
 	@Id @ManyToOne
 	@JoinColumn(name="FK1", referencedColumnName="firstName")
 	@JoinColumn(name="FK2", referencedColumnName="lastName")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DependentId.java
index e42e4e13b8f6..05ea8c3bf53d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
index c0697e1d03c0..45010d0a9565 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Employee.java
index 96f270616ee2..ae8d4d6f5e59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.a;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/EmployeeId.java
index e4af968c28d3..1b7e88da472f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/EmployeeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Dependent.java
index ff13ab7467b8..dd385638396b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.b;
 import jakarta.persistence.EmbeddedId;
@@ -22,7 +20,7 @@ public class Dependent {
 
 	@MapsId("empPK")
 
-    @ManyToOne
-    @JoinColumns( { @JoinColumn(nullable = false), @JoinColumn(nullable = false) })
-    Employee emp;
+	@ManyToOne
+	@JoinColumns( { @JoinColumn(nullable = false), @JoinColumn(nullable = false) })
+	Employee emp;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DependentId.java
index 3fc484cc9529..d5eb1d5948a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
index c3ee02bb2023..a4f25235e972 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Employee.java
index 3cc826df2137..87435d1768d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.b;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/EmployeeId.java
index c05535087e7a..94bd67f01857 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/b/EmployeeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e2.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Dependent.java
index 1bcab5779bcf..fe160c3ded5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.a;
 import jakarta.persistence.Column;
@@ -23,7 +21,7 @@ public class Dependent {
 	@Id
 	@Column(name = "dep_name")
 	String name; // default column name is overridden
-	
+
 	@Id
 	@JoinColumn(name = "FK1", referencedColumnName = "firstName")
 	@JoinColumn(name = "FK2", referencedColumnName = "lastName")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DependentId.java
index 9217299d941f..1554db58c235 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
index 8aa77e83ca12..d842c85af4ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Employee.java
index a338cffb1f1e..c590021b15bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.a;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/EmployeeId.java
index 0cdc3ce5e9b0..1a7c70f39a87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/EmployeeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Dependent.java
index 5c95c1083c50..67ed9f5b29c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Dependent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b;
 import jakarta.persistence.AttributeOverride;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DependentId.java
index 30a05e4b7c71..9e5ba3a3dcd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DependentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
index ec768a0af9fa..f09247d1ec6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Employee.java
index d7574e91c63d..2f487ff40560 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/EmployeeId.java
index 6b1ecc3c1f85..cb86c705b430 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b/EmployeeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Dependent.java
index db41b9c7ae5e..b472ee991546 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Dependent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DependentId.java
index 43ec6023893b..5d9813c2d61f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DependentId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java
index 1a4786fa9803..5a3387b0d817 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Employee.java
index 49152717c111..6b820bf121bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Employee.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/EmployeeId.java
index b2101e565fe2..6f500323d47b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/EmployeeId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Policy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Policy.java
index 58b18d9668c4..786751e2b8a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Policy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/Policy.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/PolicyId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/PolicyId.java
index 906dd11cae36..2cbe0142a437 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/PolicyId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b2/PolicyId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b2;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Dependent.java
index 72bff2f2dc97..f0a10624cab5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Dependent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Dependent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.*;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DependentId.java
index 1d928feb9857..6b2a1510cf1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DependentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DependentId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java
index ad2fe5b8bc1f..e6d439e912fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Employee.java
index 7ef2f88bc898..7283356537e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Employee.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/EmployeeId.java
index 8408625e17e1..28ed56f2b466 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/EmployeeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/EmployeeId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Policy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Policy.java
index aa819feb9b7e..a4b5899eb4e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Policy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/Policy.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.*;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/PolicyId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/PolicyId.java
index fcda3781dc5f..3d0f71ee50ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/PolicyId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/b3/PolicyId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.derivedidentities.e3.b3;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
index a40e477df746..b459295a5c6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/FinancialHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/FinancialHistory.java
index 45363d5c1a0d..04a1b16eab91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/FinancialHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/FinancialHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/MedicalHistory.java
index 9484134719d5..d91c0b476de7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Person.java
index 9c8ac0511ce2..3e0572054f85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.a;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Simple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Simple.java
index 66f39e215b3b..b43446214347 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Simple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/Simple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
index 89c3833d02f9..93d2adb988d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java
index 5e5a38d4c4a1..1950dc99b81a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java
index 91f689abaec0..c5c11061a993 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import java.util.Date;
@@ -25,7 +23,7 @@ public class MedicalHistory {
 
 	@MapsId
 	@JoinColumn(name = "FK")
-    @OneToOne(cascade= CascadeType.PERSIST)
+	@OneToOne(cascade= CascadeType.PERSIST)
 	Person patient;
 
 	@Temporal(TemporalType.DATE)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java
index ce2de614097f..7b2ceeea35c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java
index b8218b954db7..fc7e02809314 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e4.c;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
index 15349259ad76..19727ab060d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/MedicalHistory.java
index 5c8ce6d4a555..420c6a786047 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/Person.java
index 07dfa1ae6939..754372982910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.a;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/PersonId.java
index a55747b8d7bf..6c616b5e85b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
index d284b39223ea..e7ee0f673fb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/MedicalHistory.java
index 394a7eb6bb1d..28e127f244bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.b;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/Person.java
index 2e96acdf2239..d5cf2fbd172f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.b;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/PersonId.java
index 028456d542bc..a04f0e250b6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
index 2d6386bfd4dd..78b68fc6fc1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java
index e5d08ffd15ba..4b554c6fc9af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java
index cd5e2b66216d..e67713d26e04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
index ab60c6298a07..eb65dcab1330 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.a;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/MedicalHistory.java
index e58f4fe9d372..fc4158d5d8be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/Person.java
index ab7cdf0be9e0..8569d184ff08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.a;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/PersonId.java
index 817fd524ca95..67ee643e7df5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.a;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
index 462456b8bb23..aa155bd920bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.b;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/MedicalHistory.java
index 7cb44aa9393e..e49b2255a59f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/MedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/MedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.b;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/Person.java
index 41d55958e88b..2615d8e09eee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.b;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/PersonId.java
index ef65fb1113a6..f4810841cb60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/b/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.e6.b;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
index 2d5882dcb7ff..f014f1c59d45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
index fdee2425f065..8af9c670a05f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.derivedidentities.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java
index c1f43e04cf50..31a0d3bec9a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.duplicatedgenerator;
 
 import org.hibernate.DuplicateMappingException;
@@ -23,7 +19,7 @@
  * @author Emmanuel Bernard
  */
 public class DuplicateTest  {
-    @Test
+	@Test
 	public void testDuplicateEntityName() {
 		Configuration cfg = new Configuration();
 		cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
@@ -37,7 +33,7 @@ public void testDuplicateEntityName() {
 			cfg.addResource( "org/hibernate/orm/test/annotations/duplicatedgenerator/orm.xml" );
 			serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() );
 			sf = cfg.buildSessionFactory( serviceRegistry );
-            Assert.fail( "Should not be able to map the same entity name twice" );
+			Assert.fail( "Should not be able to map the same entity name twice" );
 		}
 		catch (DuplicateMappingException ae) {
 			//success
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java
index 7bff83ea1b45..dbdca6ad2ad9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.duplicatedgenerator;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValue.java
index 129d7126d258..fc6a5a6700e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
@@ -19,11 +17,11 @@ public class DollarValue implements Serializable {
 	private BigDecimal amount;
 
 	public DollarValue() {};
-	
+
 	public DollarValue(BigDecimal amount) {
 		this.amount = amount;
 	}
-	
+
 	public BigDecimal getAmount() {
 		return amount;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValueUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValueUserType.java
index 0da69c96eabb..02c6a232f0f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValueUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/DollarValueUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java
index 39d6e4e30ac5..394a1432f331 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java
index 90b3bb21706e..73538759bc03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java
index 7f388a6fe281..2ffa662cb698 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.embeddables;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java
index b04415e7cd47..03b4ac3465cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investment.java
index 13e33150645d..c66d7e184ad1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
@@ -14,10 +12,10 @@
  */
 @Embeddable
 public class Investment {
-	
+
 	private DollarValue amount;
 	private String description;
-    @Column(name = "`date`")
+	@Column(name = "`date`")
 	private MyDate date;
 
 	public DollarValue getAmount() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investor.java
index 1f14b2bc78e7..770609b2051b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/Investor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
@@ -19,9 +17,9 @@
  */
 @Entity
 public class Investor {
-	
+
 	private Long id;
-	
+
 	private List investments = new ArrayList();
 
 	@Id
@@ -32,7 +30,7 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@ElementCollection(fetch = FetchType.EAGER)
 	public List getInvestments() {
 		return investments;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/InvestorTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/InvestorTypeContributor.java
index accafe895fde..9e940ab5f646 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/InvestorTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/InvestorTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MappedSuperclassGenericEmbeddableQueryParamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MappedSuperclassGenericEmbeddableQueryParamTest.java
index 00d8fe4deea8..8acae270974c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MappedSuperclassGenericEmbeddableQueryParamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MappedSuperclassGenericEmbeddableQueryParamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDate.java
index 99d650a907ee..c8c59cfcab91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
@@ -20,11 +18,11 @@ public class MyDate implements Serializable {
 
 	public MyDate() {
 	}
-	
+
 	public MyDate(Date date) {
 		this.date = date;
 	}
-	
+
 	public Date getDate() {
 		return date;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDateUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDateUserType.java
index fb16aa3002fe..beabc3673cec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDateUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/MyDateUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java
index e26f1c0345a8..37e4794e4428 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.embeddables.collection;
 
 import org.hibernate.AnnotationException;
@@ -19,7 +23,7 @@ public abstract class AbstractEmbeddableWithManyToManyTest {
 	@Test
 	public void test() {
 		try (BootstrapServiceRegistry bsr = new BootstrapServiceRegistryBuilder().build();
-			 StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder( bsr ).build()) {
+			StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder( bsr ).build()) {
 			MetadataSources metadataSources = new MetadataSources( ssr );
 			addResources( metadataSources );
 			addAnnotatedClasses(metadataSources);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java
index d414d4f4cef8..116fa73ebb54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java
index 55d7051de511..8017bc5b91d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java
index 89e86701fa46..14aa76dfbb75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java
index 67561b9ea270..3d74c660b553 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactInformation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactInformation.java
index a41757a0b1f5..5c2b1ad1b047 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactInformation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactInformation.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.embeddables.collection.xml;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactType.java
index dd3291a82790..5e32ac0369a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/ContactType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.embeddables.collection.xml;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java
index 4cf70fb2d51a..c536619d71ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.collection.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/Person.java
index a52ad8413b12..113c67789803 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/Person.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.embeddables.collection.xml;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/CompositeUserTypeInGenericSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/CompositeUserTypeInGenericSuperclassTest.java
index b31f1b2cc92f..77c35997a313 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/CompositeUserTypeInGenericSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/CompositeUserTypeInGenericSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierMappedSuperclassTest.java
index 5d6f15faa017..b98971553958 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierTest.java
index 359e323b9090..de388efecbd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyMappedSuperclassTest.java
index 770eb9620ac6..ed991b10bcd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyTest.java
index 5c9fc2c2a296..35d7d12942d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/generics/GenericEmbeddedPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java
index 7272f211330c..217ac730e765 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java
index ce5fe22931ed..6020dd586212 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java
index 2c28ce46f4ed..741bc205d1fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
index ac4afe63970e..75e8da1d12c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java
index 4757539c7e71..f09922dbfedf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/FieldAccessedNestedEmbeddableMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/FieldAccessedNestedEmbeddableMetadataTest.java
index 5a150118a97b..8d728632da2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/FieldAccessedNestedEmbeddableMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/FieldAccessedNestedEmbeddableMetadataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java
index 33b7675d5998..d820b172350d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java
index d2333dd30672..8a6eeedc29a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java
index ebcf91812a21..ff672167c5dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java
index 4260f2c7d9a6..8e6301244f67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneSelfReferenceTest.java
index e56c66f701e0..9fc83432361d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java
index 956c3b79043d..912c555ca7d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java
index 7c77178af162..08b2095a950e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.many2one;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java
index 5d98cf8d7680..b5d1e50797b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.many2one;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
index 3487e53c2993..32d876864b57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.many2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java
index 83c974c667d6..79224be4e82e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.many2one;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java
index 393537d53aed..4e1f05eed4b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.one2many;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
index 4fae3e8e02c7..658a3b0d52de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.one2many;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java
index 4258857a6876..23ea51aa32b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.one2many;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java
index a5aa07379b5d..148b18a958b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.one2many;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java
index 32375a9eac01..253de133ef21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.embedded.one2many;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java
index afeb550c1dce..52a21a3af926 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.engine.collection;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java
index 5e277240bce1..8e7ca9dfab55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.engine.collection;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java
index cc9885f3583e..62ea0b45a821 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.engine.collection;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java
index 45e0a4efb257..3f5d7331f77a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.engine.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java
index a82ac19c0757..236f33f2db93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
index f2c6198c0b51..f189d369382c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -132,7 +130,7 @@ public void testVersioning() throws Exception {
 		tx.commit();
 		s.close();
 	}
-	
+
 	@Test
 	@RequiresDialectFeature(DialectChecks.SupportsExpectedLobUsagePattern.class)
 	public void testWhereClause() throws Exception {
@@ -276,19 +274,19 @@ public void testCache() throws Exception {
 
 	@Test
 	public void testFilterOnCollection() {
-		
+
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
-		
+
 		Topic topic = new Topic();
 		Narrative n1 = new Narrative();
 		n1.setState("published");
 		topic.addNarrative(n1);
-		
+
 		Narrative n2 = new Narrative();
 		n2.setState("draft");
 		topic.addNarrative(n2);
-		
+
 		s.persist(topic);
 		tx.commit();
 		s.close();
@@ -296,21 +294,21 @@ public void testFilterOnCollection() {
 		s = openSession();
 		tx = s.beginTransaction();
 		topic = (Topic) s.getReference( Topic.class, topic.getId() );
-		
+
 		s.enableFilter("byState").setParameter("state", "published");
 		topic = (Topic) s.getReference( Topic.class, topic.getId() );
-		assertNotNull(topic); 
-		assertTrue(topic.getNarratives().size() == 1); 
+		assertNotNull(topic);
+		assertTrue(topic.getNarratives().size() == 1);
 		assertEquals("published", topic.getNarratives().iterator().next().getState());
 		tx.commit();
 		s.close();
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
 		s.createQuery( "delete from " + Narrative.class.getSimpleName() ).executeUpdate();
 		tx.commit();
 		s.close();
-	} 
+	}
 
 	@Test
 	public void testCascadedDeleteOfChildEntitiesBug2() {
@@ -367,7 +365,7 @@ public void testCascadedDeleteOfChildOneToOne() {
 		// create two single player teams (for one versus one match of soccer)
 		// and associate teams with players via the special OneVOne methods.
 		// Clear the Team reference to players, which should orphan the teams.
-		// Orphaning the team should delete the team. 
+		// Orphaning the team should delete the team.
 
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
@@ -443,7 +441,7 @@ public void testFilter() throws Exception {
 		tx.rollback();
 		s.close();
 	}
-	  
+
 	/**
 	 * Tests the functionality of inheriting @Filter and @FilterDef annotations
 	 * defined on a parent MappedSuperclass(s)
@@ -471,8 +469,8 @@ public void testInheritFiltersFromMappedSuperclass() throws Exception {
 		s.close();
 		s = openSession();
 		tx = s.beginTransaction();
-		 
-		//We test every filter with 2 queries, the first on the base class of the 
+
+		//We test every filter with 2 queries, the first on the base class of the
 		//inheritance hierarchy (Drill), and the second on a subclass (PowerDrill)
 		s.enableFilter( "byName" ).setParameter( "name", "HomeDrill1");
 		long count = ( (Long) s.createQuery( "select count(*) from Drill" ).list().get( 0 ) ).intValue();
@@ -480,18 +478,18 @@ public void testInheritFiltersFromMappedSuperclass() throws Exception {
 		count = ( (Long) s.createQuery( "select count(*) from PowerDrill" ).list().get( 0 ) ).intValue();
 		assertEquals( 1, count );
 		s.disableFilter( "byName" );
-		
+
 		s.enableFilter( "byCategory" ).setParameter( "category", "Industrial" );
 		count = ( (Long) s.createQuery( "select count(*) from Drill" ).list().get( 0 ) ).longValue();
 		assertEquals( 1, count );
 		count = ( (Long) s.createQuery( "select count(*) from PowerDrill" ).list().get( 0 ) ).longValue();
 		assertEquals( 1, count );
 		s.disableFilter( "byCategory" );
-		
+
 		tx.rollback();
 		s.close();
 	}
-	
+
 	@Test
 	@RequiresDialectFeature( DialectChecks.SupportsExpectedLobUsagePattern.class )
 	public void testParameterizedType() {
@@ -623,23 +621,23 @@ public void testFormula() throws Exception {
 		tx.commit();
 		s.close();
 	}
-		
+
 	@Test
 	public void testTypeDefNameAndDefaultForTypeAttributes() {
 		ContactDetails contactDetails = new ContactDetails();
 		contactDetails.setLocalPhoneNumber(new PhoneNumber("999999"));
 		contactDetails.setOverseasPhoneNumber(
 				new OverseasPhoneNumber("041", "111111"));
-		
+
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		s.persist(contactDetails);
 		tx.commit();
 		s.close();
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
-		contactDetails = 
+		contactDetails =
 			s.get( ContactDetails.class, contactDetails.getId() );
 		assertNotNull( contactDetails );
 		assertEquals( "999999", contactDetails.getLocalPhoneNumber().getNumber() );
@@ -647,7 +645,7 @@ public void testTypeDefNameAndDefaultForTypeAttributes() {
 		s.remove(contactDetails);
 		tx.commit();
 		s.close();
-	
+
 	}
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java
index 0f5753aef7b0..2fc3ef0778ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java
index df668564e731..ac2d4066442d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java
index 77b2c064f272..4334babaf05f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -17,11 +15,11 @@ public class ContactDetails {
 	@Id
 	@GeneratedValue
 	private int id;
-		
+
 	private PhoneNumber localPhoneNumber;
 	@Convert( converter = PhoneNumberConverter.class )
 	private OverseasPhoneNumber overseasPhoneNumber;
-	
+
 	public int getId() {
 		return id;
 	}
@@ -40,5 +38,5 @@ public OverseasPhoneNumber getOverseasPhoneNumber() {
 	public void setOverseasPhoneNumber(OverseasPhoneNumber overseasPhoneNumber) {
 		this.overseasPhoneNumber = overseasPhoneNumber;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java
index ac4a47669818..0e9385920547 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java
index 3fa36481d793..45d650dd6bf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java
@@ -1,22 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.SQLRestriction;
 
 /**
- * 
+ *
  * @author Vlad Smith
  *
  */
@@ -61,7 +55,7 @@ public Integer getYearsExperience() {
 	public void setYearsExperience(Integer yearsExperience) {
 		this.yearsExperience = yearsExperience;
 	}
-	
-		
+
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java
index 05c7f5964c8f..d7e92c7b65a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorType;
@@ -24,7 +21,7 @@
 	discriminatorType = DiscriminatorType.STRING
 )
 public abstract class Drill extends Tool {
-	
+
 	@Id @GeneratedValue
 	private int id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java
index ef4c10bfba89..c3a777e348be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -23,6 +21,6 @@ public String getFirstName() {
 	public void setFirstName(String lowerCaseName) {
 		this.firstName = lowerCaseName;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java
index 09c501e4e45a..7b31afd57df9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java
index d3f390365d65..6edbcf0c94f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 
 import java.sql.Types;
@@ -55,7 +51,7 @@ public class Forest {
 	private String bigText;
 	private Country country;
 	private Set near;
-	
+
 	@OptimisticLock(excluded=true)
 	@JdbcTypeCode( Types.LONGVARCHAR )
 	public String getLongDescription() {
@@ -128,5 +124,5 @@ public Set getNear() {
 	public void setNear(Setnear) {
 		this.near = near;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java
index b9dc7e6e3804..755b7f61f955 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -51,5 +46,5 @@ public String getDesignation() {
 	public void setDesignation(String designation) {
 		this.designation = designation;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java
index c746ceab6c72..837b2a3a06a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -22,7 +20,7 @@
  * @author Guenther Demetz
  */
 public class HibernateAnnotationMappingTest extends BaseUnitTestCase {
-	
+
 	@Test
 	@JiraKey( value = "HHH-7446" )
 	public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception {
@@ -36,7 +34,7 @@ public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception {
 			sf.close();
 		}
 		catch (ConcurrentModificationException e) {
-			fail(e.toString()); 
+			fail(e.toString());
 		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java
index 3f341aec284e..ca262296fcd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -71,7 +69,7 @@ public void testEnums() throws Exception {
 		assertEquals( Starred.OK, bid.getNote() );
 		assertEquals( Starred.GOOD, bid.getEditorsNote() );
 		bid = (Bid)s.createQuery( "select b from Bid b where b.note = :note" +
-				 " and b.editorsNote = :editorNote " +
+				" and b.editorsNote = :editorNote " +
 				" and b.id = :id")
 				.setParameter( "id", bid.getId() )
 				.setParameter( "note", Starred.OK )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java
index b7549a94f050..da78dfd9a0c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -21,6 +19,6 @@ public String getName() {
 	public void setName(String lowerCaseName) {
 		this.lastName = lowerCaseName;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java
index 6647eaf843bd..f44aedc016d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java
index 2ba492603351..447ea80a2324 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -22,11 +20,11 @@ public class LocalContactDetails {
 	@Id
 	@GeneratedValue
 	private int id;
-		
+
 	private PhoneNumber localPhoneNumber;
 	@Convert( converter = PhoneNumberConverter.class )
 	private OverseasPhoneNumber overseasPhoneNumber;
-	
+
 	public int getId() {
 		return id;
 	}
@@ -45,5 +43,5 @@ public OverseasPhoneNumber getOverseasPhoneNumber() {
 	public void setOverseasPhoneNumber(OverseasPhoneNumber overseasPhoneNumber) {
 		this.overseasPhoneNumber = overseasPhoneNumber;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java
index 9ed9e6d40190..f5ec3b6d7922 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java
@@ -1,13 +1,8 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Currency;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmountInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmountInstantiator.java
index 4ebad346da5a..867bc97656b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmountInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmountInstantiator.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
 import java.math.BigDecimal;
 import java.util.Currency;
-import java.util.function.Supplier;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java
index 0e32987dad54..7417fc611860 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -18,14 +15,14 @@
  * @author Guenther Demetz
  */
 @Entity
-@Table(uniqueConstraints = {@UniqueConstraint(columnNames={"year", "month"})}) 
+@Table(uniqueConstraints = {@UniqueConstraint(columnNames={"year", "month"})})
 // Remark: Without line above, hibernate creates the combined unique index as follows: unique (month, year)
 // It seems that hibernate orders the attributes in alphabetic order
-// We indeed want to have the inverted sequence: year, month 
-// In this way queries with only year in the where-clause can take advantage of this index  
+// We indeed want to have the inverted sequence: year, month
+// In this way queries with only year in the where-clause can take advantage of this index
 // N.B.: Usually a user defines a combined index beginning with the most discriminating property
 public class Month  {
-	
+
 	@Id @GeneratedValue
 	private int id;
 
@@ -36,10 +33,10 @@ public int getId() {
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	@NaturalId
 	private int year;
-	
+
 	@NaturalId
 	private int month;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java
index 81bfa4ad03ee..a2ad96c4274a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Embedded;
@@ -19,7 +17,7 @@ public class Name extends FirstName {
 
 	@Embedded
 	private LastName lastName;
-	
+
 	public Integer getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java
index b74ecc6703f7..06e6e1fb933f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -17,11 +14,11 @@
  */
 @Entity
 public class Narrative {
-	
+
 	private int id;
 	private String state;
 	private Topic topic;
-	
+
 	@Id @GeneratedValue
 	public int getId() {
 		return id;
@@ -29,7 +26,7 @@ public int getId() {
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	@Column(name="state")
 	public String getState() {
 		return state;
@@ -37,7 +34,7 @@ public String getState() {
 	public void setState(String state) {
 		this.state = state;
 	}
-	
+
 	@ManyToOne
 	public Topic getTopic() {
 		return topic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java
index 60304820c5c0..48d6ea25a124 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
@@ -15,7 +13,7 @@ public class OverseasPhoneNumber extends PhoneNumber {
 	public OverseasPhoneNumber(String areaCode, String val) {
 		super(areaCode + val);
 	}
-	
+
 	public OverseasPhoneNumber(String val) {
 		super(val);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java
index 6b2b8bf9ddd0..8cb17610d6df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java
@@ -1,21 +1,19 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
 import java.io.Serializable;
 
 public class PhoneNumber implements Serializable {
-	
+
 	private String number;
-	
+
 	public PhoneNumber(String val) {
 		number = val;
 	}
-		
+
 	public String getNumber() {
 		return number;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java
index e5ef95edcee2..1ce6dbff2dea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java
index 9d0b903a40f7..d4103d1964a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java
index dd0919f421df..3f0eacb725ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -15,5 +12,5 @@
 @Entity
 @DiscriminatorValue("Power")
 public class PowerDrill extends Drill {
-		
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java
index 7aa8b4d2082d..fc46102be0c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java
index 9bb68434d3aa..8f8dbeef0783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java
index b67be47fdb56..9dbc0bbaf814 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java
index dc0af199a251..dbdf9224e468 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -26,7 +23,7 @@ public class SoccerTeam {
 	private int id;
 
 	String name;
-	
+
 	@OneToMany
 	@SQLRestriction("activeLicense = true")
 	private List physiologists = new ArrayList();
@@ -81,7 +78,7 @@ public List getPhysiologists() {
 	public void setPhysiologists(List physiologists) {
 		this.physiologists = physiologists;
 	}
-	
-	
-	
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java
index ec7554f40a5d..46e755a51e34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToLowerConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToLowerConverter.java
index 2cecedeff8f5..2097f3bee3d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToLowerConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToLowerConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToUpperConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToUpperConverter.java
index 0f3873713e1e..c13787eddb59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToUpperConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ToUpperConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java
index f2943943a096..c48b1abf4439 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 
 import jakarta.persistence.Column;
@@ -32,6 +29,6 @@ public String getCategory() {
 	public void setCategory(String category) {
 		this.category = category;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java
index a80ed510a898..81131ada5f15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 
 import java.util.HashSet;
@@ -34,8 +31,8 @@ public class Topic {
 	@OneToMany(mappedBy="topic", cascade=CascadeType.ALL)
 	@Filter(name="byState", condition=":state = state")
 	private Set narratives = new HashSet();
-	
-	
+
+
 	public int getId() {
 		return id;
 	}
@@ -51,6 +48,6 @@ public Set getNarratives() {
 	public void addNarrative(Narrative val) {
 		narratives.add(val);
 		val.setTopic(this);
-	} 
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java
index e86fd551c2b4..f9c60b07e28c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java
index 9c3b9fdfed96..2d52bd02e151 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java
index 2e9aa7f9f473..98c679515083 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.MappedSuperclass;
 
@@ -19,7 +16,7 @@
 @Filter(name = "byName", condition = ":name = name")
 @MappedSuperclass
 public class Widget {
-	
+
 	private String name;
 
 	public String getName() {
@@ -29,5 +26,5 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java
index 42103db8b988..fca8a16011c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java
index 338ef51ff524..860092f80b92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java
@@ -20,4 +20,3 @@
 
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.ParamDef;
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java
index 62842a00ee5f..40314aaecd0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java
index 33ad7714e5ed..b86bb2983822 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java
index ded4f9d97729..09c9eace9697 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.entitynonentity;
 
@@ -52,7 +50,7 @@ public void testMix() {
 	@JiraKey( value = "HHH-9856" )
 	public void testGetAndFindNonEntityThrowsIllegalArgumentException() {
 		try {
-            sessionFactory().getMetamodel().locateEntityPersister(Cellular.class);
+			sessionFactory().getMetamodel().locateEntityPersister(Cellular.class);
 			sessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( Cellular.class );
 
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java
index 2c1f3c3db47e..0e06444d5ab9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java
index efb2c144ae84..2524d0c55776 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java
index 220db0c02591..bc57085869e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 import jakarta.persistence.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java
index 0570c5b8757e..7e56b3efd89a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.entitynonentity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
index bf8793ad0f91..e2f531ddd111 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.enumerated;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
index ae99eb75e688..fc64503075f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.enumerated;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
index dabde08a62bf..6784a7b54ea6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.enumerated;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java
index 89ab385e44bd..c9a6d7158db7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterConverter.java
index 68994ecab2ed..fdc532e47db8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.custom_types;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterType.java
index 01a8387bfc58..b9ea91d1e5bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.custom_types;
 
@@ -11,7 +9,6 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.orm.test.annotations.enumerated.enums.FirstLetter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastLetterConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastLetterConverter.java
index 460f63c7a333..aa137b5d2e1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastLetterConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastLetterConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.custom_types;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastNumberType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastNumberType.java
index 0c3c41c0da6c..eb9ed0bed5d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastNumberType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastNumberType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.custom_types;
 
@@ -11,7 +9,6 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.orm.test.annotations.enumerated.enums.LastNumber;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Common.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Common.java
index eed3ae746405..f835472c4c93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Common.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Common.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/FirstLetter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/FirstLetter.java
index 0949b8310748..b4590d376abb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/FirstLetter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/FirstLetter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/LastNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/LastNumber.java
index 50ee7be4b5f2..fece5bc4f063 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/LastNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/LastNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Trimmed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Trimmed.java
index de90e7bf4bc6..9599059065b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Trimmed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/enums/Trimmed.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java
index 24a664129fb0..2cc4fb081e36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.mapkey;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java
index 8ba604aaab2a..b47f1da0e18a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.mapkey;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java
index a91644abd868..89876be955db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.mapkey;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java
index 45e2f99ce3a9..47cd412aed89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.mapkey;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java
index 61f7d980ad76..529c69a2a848 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.mappedSuperclass;
 
@@ -38,7 +36,6 @@
 import static jakarta.persistence.EnumType.STRING;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isOneOf;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Originally developed to verify/diagnose HHH-10128
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java
index a2ee883917cd..f6277b05f2e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.ormXml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java
index c22e523c1dbc..1a1171487a04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.ormXml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java
index 9f5590e14c5c..8cbd909db8c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.enumerated.ormXml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java
index ba850be37b5a..c5a597963247 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.fetch;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java
index bad46ea6c9ba..7b715848c958 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java
index a617bbaec9e4..3f9fb45d583d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.fetch;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java
index dc2ac851d386..cfa23fb1cc39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.fetch;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java
index 7cec79e94eb4..f1bbf06c651c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.fetch;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java
index 151ba31972ba..d257b89436c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.fetchprofile;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java
index 49c75427390a..95d631eaec11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 
 import java.util.HashSet;
@@ -18,7 +13,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 
 /**
@@ -100,5 +94,3 @@ public void setOrders(Set orders) {
 		this.orders = orders;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java
index b806a761ea99..0cd93809da3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import java.util.Set;
 import jakarta.persistence.Entity;
@@ -14,7 +9,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java
index 370ee3f2566e..da7be8a6acb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import java.util.Set;
 import jakarta.persistence.Entity;
@@ -14,7 +9,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java
index e46d05366836..c8f5f5f298ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java
index 921a2d52cead..e73f67e5816a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import java.util.Set;
 import jakarta.persistence.Entity;
@@ -14,7 +9,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java
index 432adc506549..604ecc19542a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java
@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java
index 98ed738f83c0..c0b354969a43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
@@ -40,13 +38,13 @@ public class FetchProfileTest extends BaseUnitTestCase {
 	private ServiceRegistry serviceRegistry;
 
 	@Before
-    public void setUp() {
+	public void setUp() {
 		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
 	}
 
 	@After
-    public void tearDown() {
-        if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry);
+	public void tearDown() {
+		if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry);
 	}
 
 	@Test
@@ -83,7 +81,7 @@ public void testWrongAssociationName() {
 			fail();
 		}
 		catch ( MappingException e ) {
-            log.trace("success");
+			log.trace("success");
 		}
 		finally {
 			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
@@ -105,7 +103,7 @@ public void testWrongClass() {
 			fail();
 		}
 		catch ( MappingException e ) {
-            log.trace("success");
+			log.trace("success");
 		}
 		finally {
 			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java
index a3bba11a2520..150e79f728be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java
index 71589d328591..8e476fca3a7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
 import org.hibernate.cfg.Configuration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java
index bb63cfb8986c..c8c085709c95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewFetchTest.java
index 2ed0288937de..c6091597e14c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewGraphTest.java
index 9e36076a7a04..5d79d651a649 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/NewGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile;
 
 import jakarta.persistence.*;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java
index 987f57e7f0bc..d1e99d042940 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import java.util.Date;
 import jakarta.persistence.Entity;
@@ -65,5 +60,3 @@ public void setOrderNumber(long orderNumber) {
 		this.orderNumber = orderNumber;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java
index 326f2fda196d..7cffccf3f128 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.fetchprofile;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -49,5 +44,3 @@ public void setResolution(String resolution) {
 		this.resolution = resolution;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java
index 61ac34435b4c..7760a2df08a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.fetchprofile.mappedby;
 
 import org.hibernate.annotations.FetchMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java
index 7f23e2b3ca31..87fe17a001b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java
@@ -15,8 +15,4 @@
 })
 package org.hibernate.orm.test.annotations.fetchprofile;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java
index 876a81fd2542..01f3049485ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java
index bae09afbadab..e4b7e973d3a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import java.io.Serializable;
 import jakarta.persistence.ManyToOne;
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java
index a8a192f34afa..a4da7aeef2ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -14,7 +10,7 @@
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java
index 376e13be74ce..b3f5b3351e81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Entity;
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java
index 7eb051d9c268..c3a637853f56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -16,9 +12,9 @@
 
 /**
  * Test entities ANN-730.
- * 
+ *
  * @author Hardy Ferentschik
- * 
+ *
  */
 @Entity
 @Table(name = "class_a")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java
index 60fc758537b1..bfb0949cbc01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.PrimaryKeyJoinColumn;
@@ -13,9 +9,9 @@
 
 /**
  * Test entities ANN-730.
- * 
+ *
  * @author Hardy Ferentschik
- * 
+ *
  */
 @Entity
 @Table(name = "class_b")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java
index 9ef96ddf7ae5..35e59ffbf940 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.PrimaryKeyJoinColumn;
@@ -13,9 +9,9 @@
 
 /**
  * Test entities ANN-730.
- * 
+ *
  * @author Hardy Ferentschik
- * 
+ *
  */
 @Entity
 @Table(name = "class_c")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java
index ef90a23253f0..a41e5e39a640 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.PrimaryKeyJoinColumn;
@@ -13,7 +9,7 @@
 
 /**
  * Test entities ANN-730.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java
index 1de0471164d7..bc54c6490417 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java
index a3b9e7bc7218..4852af10c62c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java
@@ -1,25 +1,21 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 import java.io.Serializable;
 import jakarta.persistence.ManyToOne;
 
 /**
  * Test entities ANN-722.
- * 
+ *
  * @author Hardy Ferentschik
  *
  */
 @SuppressWarnings("serial")
 public class D_PK implements Serializable{
 	private C c;
-	
+
 	@ManyToOne
 	public C getC() {
 		return c;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/FkCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/FkCircularityTest.java
index eee84aada00a..b54f438cffdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/FkCircularityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/FkCircularityTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.fkcircularity;
 
 import org.hibernate.boot.MetadataSources;
@@ -23,7 +19,7 @@
  */
 public class FkCircularityTest {
 
-    @Test
+	@Test
 	public void testJoinedSublcassesInPK() {
 		MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
 			.addAnnotatedClass(A.class)
@@ -41,7 +37,7 @@ public void testJoinedSublcassesInPK() {
 		}
 	}
 
-    @Test
+	@Test
 	public void testDeepJoinedSuclassesHierachy() {
 		MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
 				.addAnnotatedClass(ClassA.class)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
index 508021df6305..cbbf44a80755 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.formula;
 
@@ -18,8 +16,6 @@
 import org.hibernate.annotations.JoinFormula;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.BootstrapServiceRegistry;
-import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java
index 454e859fdfb4..49b6a34bc421 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java
index 98276241ac51..acfeb065466a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java
index 79a1f4d559e2..258683e900c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java
index 9a2d35030d9d..e57bf68dfed2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java
index 322bbb69ee06..93f0feb02857 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 import java.util.HashSet;
@@ -25,26 +23,26 @@ public class Classes {
 	public static class Edition {
 		T name;
 	}
-	
-	
+
+
 	@Entity(name = "Book")
 	@Table(name="Book")
 	public static class Book {
 		@Id
 		@GeneratedValue(strategy=GenerationType.AUTO)
 		Long id;
-		
+
 		@Embedded
 		Edition edition;
 	}
-	
+
 	@Entity(name = "PopularBook")
 	@Table(name="PopularBook")
 	public static class PopularBook {
 		@Id
 		@GeneratedValue(strategy=GenerationType.AUTO)
 		Long id;
-		
+
 		@ElementCollection
 		@JoinTable(name="PopularBook_Editions",joinColumns={@JoinColumn(name="PopularBook_id")})
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java
index 84157ba08139..b950c726e2e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java
index 65972818ff6a..a192ae09efc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -41,4 +37,4 @@ public void setDummyField(K dummyField) {
 		this.dummyField = dummyField;
 	}
 
-} 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java
index 73a73edd5c27..f418838227ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java
index 77d29ac01919..c6c9cb42a2ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
@@ -279,4 +277,3 @@ public void setName(String name) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java
index 8b1fe1e8e982..6746c7d96015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAssociationOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAssociationOrderColumnTest.java
index 1234aa4e2ac2..8ff179ac883f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAssociationOrderColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAssociationOrderColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java
index e7e8a5ed9320..774ec79ff254 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java
index efb8e3aea666..626e24f87033 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java
index 082ee7c9ecbb..627af93fe607 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassNestedJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassNestedJoinTest.java
index 63a0437bd5ff..ffd3dff3285a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassNestedJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassNestedJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
@@ -172,4 +170,4 @@ public abstract static class AbsProductRuleProductLink {
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericOneToManyTreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericOneToManyTreatTest.java
index 727f8db95465..093555dfd72c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericOneToManyTreatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericOneToManyTreatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericPathComparisonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericPathComparisonTest.java
index d2441d418223..521b004621cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericPathComparisonTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericPathComparisonTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java
index 23296f92bd67..a176268501ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java
index 5fd25682f1a8..3a191eb09900 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java
index 5a16f392d2ce..bef36a3fbb0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java
index 483426dc0263..771c980e6901 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java
index 7f93306ed62e..6b89a04fec79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.generics;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java
index dd3704909b94..735d619f7d88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java
index fdcbab1bfa9f..2409025f783c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.generics;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java
index 6c0c958a2f51..7fbc18969008 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java
index e7dd5b987a2b..3d75624ab629 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java
index f36e5ccfcbd9..efeba6415c5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java
index 7256cba1a6eb..4f49a5879d3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java
index a94a9db0c516..709d6794db0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java
index 7005cac6a875..949f7c4325ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/State.java
index aef3c565d6a1..f66c1586dbdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/State.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/StateType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/StateType.java
index 7d0033a62e98..7ee83bcca3cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/StateType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/StateType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java
index ae68e21fb414..81124d859349 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java
index 519cf44d5dac..a2ebdf15c49e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.generics;
 
 import org.hibernate.query.Query;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/UnresolvedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/UnresolvedTypeTest.java
index c3f602592333..74aa9b897076 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/UnresolvedTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/UnresolvedTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.generics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java
index 2814875c5f9b..19f5814f66e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.generics;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java
index a83e01005569..de3f40f032bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.generics;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java
index 1a5315e5e23f..9734c617d6a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.Id;
@@ -14,7 +12,7 @@ public abstract class Child
     {
 
 	@Id Long id;
 	@ManyToOne P parent;
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -27,6 +25,6 @@ public P getParent() {
 	public void setParent(P parent) {
 		this.parent = parent;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java
index fef273e2ca20..bc81a757c7e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java
index 1e2645f28314..923296738c5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java
index 7b83aca01084..eac922871006 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/GenericsInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/GenericsInheritanceTest.java
index 3ca50a192256..82d62123ad98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/GenericsInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/GenericsInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java
index 2ca151877fdc..4c459677905b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import java.util.HashMap;
@@ -19,21 +17,21 @@ public abstract class Parent {
 	@Id @GeneratedValue Long id;
 	@MapKey @OneToMany(mappedBy="parent") Map children = new HashMap();
 
-	
+
 	public Long getId() {
 		return id;
 	}
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	
+
+
 	public Map getChildren() {
 		return children;
 	}
 	public void setChildren(Map children) {
 		this.children = children;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java
index c50a6499f704..0171254b1386 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java
index aceb840d4aec..48282a6b77da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java
index e0f8bd5cee79..db128e81fb03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.genericsinheritance;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java
index be6792e3a0e7..1ce7bf5d7faa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java
index 75c91cba5e0a..20cc5278d360 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
index 6dc3e28f81d2..6a62a4db6050 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.id;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassTest.java
index 78c12706d10b..1ac1126ee7c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java
index 46a33cbde2c8..64465f601132 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java
index 217f63a552a9..84e0b585e657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/UUIDGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/UUIDGenerator.java
index 9940e50e2961..d86cba273ead 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/UUIDGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/UUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id;
 
@@ -15,7 +13,7 @@
 import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
 
 /**
- * Unlike Hibernate's UUID generator.  This avoids 
+ * Unlike Hibernate's UUID generator.  This avoids
  * meaningless synchronization and has less
  * than a chance of an asteroid hitting you on the head
  * even after trillions of rows are inserted.  I know
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java
index fb61980147d6..9098fd607b01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java
index 991762b5b491..90e447051bc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java
index c6c1ecebee64..97a9f3d3fd0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -21,7 +17,7 @@
 
 /**
  * Blown precision on related entity when @JoinColumn is used.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
@@ -35,7 +31,7 @@ public class Bunny implements Serializable {
 
 	@OneToMany(mappedBy = "bunny", cascade = { CascadeType.PERSIST })
 	Set teeth;
-	
+
 	@OneToMany(mappedBy = "bunny", cascade = { CascadeType.PERSIST })
 	Set toes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java
index 658f5280eca4..d77777768a3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java
index 10a85f1740f4..4681707b9424 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java
index 71921e8541e0..99f6d0d59353 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java
index d30479b52c75..9d2275eb60d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java
index 33f2683f5dcc..91d8161c1de0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java
index af2f5e3b5cae..30818aa4796a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java
index 59e7e85bf219..ee154132584a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java
@@ -1,18 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
 
 /**
  * @author Emmanuel Bernard
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java
index 884ae12fce9a..c1d7af290f65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java
index 167989020733..82a8d2b3734f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java
index e77d583ded93..410929e90ccd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.entities;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Location.java
index 868349cbfdc2..46490d0a2600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Location.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java
index 5f22d8e0027c..b127b083d910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java
index 0363e08f43a2..7f4ce873137b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java
index 06aa313c7a30..5469bbd3cd31 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Planet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Planet.java
index ce50b869475e..e5deae167a85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Planet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Planet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.id.entities;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java
index cbb9ff8e4730..d5666fedd9c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Column;
@@ -14,7 +12,7 @@
 
 /**
  * Test entity for enum type as id.
- * 
+ *
  * @author Hardy Ferentschik
  * @see ANN-744
  */
@@ -68,23 +66,23 @@ public void setNumberOfInhabitants(long numberOfInhabitants) {
 	 * Constructs a String with all attributes
 	 * in name = value format.
 	 *
-	 * @return a String representation 
+	 * @return a String representation
 	 * of this object.
 	 */
 	public String toString()
 	{
-	    final String TAB = "    ";
-	    
-	    String retValue = "";
-	    
-	    retValue = "PlanetCheatSheet ( "
-	        + super.toString() + TAB
-	        + "planet = " + this.planet + TAB
-	        + "mass = " + this.mass + TAB
-	        + "radius = " + this.radius + TAB
-	        + "numberOfInhabitants = " + this.numberOfInhabitants + TAB
-	        + " )";
-	
-	    return retValue;
-	}	
+		final String TAB = "    ";
+
+		String retValue = "";
+
+		retValue = "PlanetCheatSheet ( "
+			+ super.toString() + TAB
+			+ "planet = " + this.planet + TAB
+			+ "mass = " + this.mass + TAB
+			+ "radius = " + this.radius + TAB
+			+ "numberOfInhabitants = " + this.numberOfInhabitants + TAB
+			+ " )";
+
+		return retValue;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java
index e90aad2b3cc9..31e118292aa3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,9 +15,9 @@
 import org.hibernate.annotations.GenericGenerator;
 
 /**
- * Blown precision on related entity when @JoinColumn is used. 
+ * Blown precision on related entity when @JoinColumn is used.
  * Does not cause an issue on HyperSonic, but replicates nicely on PGSQL.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
@@ -34,7 +30,7 @@ public class PointyTooth implements Serializable {
 	private BigDecimal id;
 
 	@ManyToOne
-    @JoinColumn(name = "bunny_id")
+	@JoinColumn(name = "bunny_id")
 	Bunny bunny;
 
 	public void setBunny(Bunny bunny) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java
index 185cd681d977..9318684d7edd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java
index f57484cfa7cf..4a7b13341fdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java
index 2c7269be1fc4..ac00777f9645 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java
index 900241372918..b5f5be3afec7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java
index 3e720e4c4982..9d90a88d4007 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java
index 94eb8533ddca..055a146f762a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.entities;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,9 +15,9 @@
 import org.hibernate.annotations.GenericGenerator;
 
 /**
- * Blown precision on related entity when @JoinColumn is used. 
+ * Blown precision on related entity when @JoinColumn is used.
  * Does not cause an issue on HyperSonic, but replicates nicely on PGSQL.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java
index 294480a61746..31851605c502 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java
index 7ebfc00aa06c..acc0a46a04bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java
index ef595415f022..39c6a1bc1c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java
index b34bf3c775be..2954f78a69fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java
index 3fb454210249..13d9fc554523 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
index b4bd300bf20b..4ce153b75351 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 
@@ -58,7 +56,7 @@ public class NewGeneratorMappingsTest  {
 
 	@Test
 	public void testMinimalSequenceEntity(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getEntityDescriptor(MinimalSequenceEntity.class.getName());
@@ -76,7 +74,7 @@ public void testMinimalSequenceEntity(SessionFactoryScope scope) {
 
 	@Test
 	public void testCompleteSequenceEntity(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getEntityDescriptor(CompleteSequenceEntity.class.getName());
@@ -90,7 +88,7 @@ public void testCompleteSequenceEntity(SessionFactoryScope scope) {
 
 	@Test
 	public void testAutoEntity(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(AutoEntity.class.getName());
+		final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(AutoEntity.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		assertTrue( SequenceStyleGenerator.class.isInstance( generator ) );
 		SequenceStyleGenerator seqGenerator = (SequenceStyleGenerator) generator;
@@ -101,7 +99,7 @@ public void testAutoEntity(SessionFactoryScope scope) {
 
 	@Test
 	public void testTablePerClassAutoEntity(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(AbstractTPCAutoEntity.class.getName());
+		final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(AbstractTPCAutoEntity.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		assertTrue( SequenceStyleGenerator.class.isInstance( generator ) );
 		SequenceStyleGenerator seqGenerator = (SequenceStyleGenerator) generator;
@@ -113,7 +111,7 @@ public void testTablePerClassAutoEntity(SessionFactoryScope scope) {
 
 	@Test
 	public void testMinimalTableEntity(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(MinimalTableEntity.class.getName());
+		final EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(MinimalTableEntity.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		assertTrue( TableGenerator.class.isInstance( generator ) );
 		TableGenerator tabGenerator = (TableGenerator) generator;
@@ -132,7 +130,7 @@ public void testMinimalTableEntity(SessionFactoryScope scope) {
 	@JiraKey(value = "HHH-6790")
 	public void testSequencePerEntity(SessionFactoryScope scope) {
 		// Checking first entity.
-        EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(
+		EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(
 				DedicatedSequenceEntity1.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		assertTrue( SequenceStyleGenerator.class.isInstance( generator ) );
@@ -143,7 +141,7 @@ public void testSequencePerEntity(SessionFactoryScope scope) {
 		);
 
 		// Checking second entity.
-        persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(DedicatedSequenceEntity2.class.getName());
+		persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(DedicatedSequenceEntity2.class.getName());
 		generator = persister.getIdentifierGenerator();
 		assertTrue( SequenceStyleGenerator.class.isInstance( generator ) );
 		seqGenerator = (SequenceStyleGenerator) generator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java
index ba07bf000edd..cfeb070da710 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity1.java
index a2096e28f2ab..a756aeeed78c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings.sub;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity2.java
index 0f8e1da73239..d7ad37b4db86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/sub/DedicatedSequenceEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generationmappings.sub;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/SimpleIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/SimpleIdTests.java
index a2249087da22..48fd43036165 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/SimpleIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/SimpleIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generators;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/UnnamedGeneratorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/UnnamedGeneratorTests.java
index bf322db74a18..6e2335d1e097 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/UnnamedGeneratorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/UnnamedGeneratorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generators;
 
@@ -170,7 +168,7 @@ public static class Entity8 {
 		private Integer id;
 		private String name;
 	}
-	
+
 	private static final Function SEQUENCE_NAME_EXTRACTOR = (generator) -> {
 		return ( (org.hibernate.id.enhanced.SequenceStyleGenerator) generator ).getDatabaseStructure().getPhysicalName().getObjectName().getText();
 	};
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/ClassLevelGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/ClassLevelGeneratorTest.java
index 221822a56c4a..7a881329bb28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/ClassLevelGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/ClassLevelGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.id.generators.entity;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/DefaultedGeneratorWithGlobalScopeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/DefaultedGeneratorWithGlobalScopeTest.java
index bd15f4cc66f6..45774e97659b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/DefaultedGeneratorWithGlobalScopeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/DefaultedGeneratorWithGlobalScopeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.generators.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/FieldLevelGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/FieldLevelGeneratorTest.java
index becbc5bc6249..da034e227f1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/FieldLevelGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/entity/FieldLevelGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.id.generators.entity;
 
 import jakarta.persistence.Entity;
@@ -6,8 +10,6 @@
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.TableGenerator;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/PackageLevelGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/PackageLevelGeneratorTest.java
index 42601d21e031..fc540cbd385e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/PackageLevelGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/PackageLevelGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.id.generators.pkg;
 
 import jakarta.persistence.Entity;
@@ -5,8 +9,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/package-info.java
index 0094e96be717..ffb9b76171b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generators/pkg/package-info.java
@@ -3,4 +3,4 @@
 package org.hibernate.orm.test.annotations.id.generators.pkg;
 
 import jakarta.persistence.SequenceGenerator;
-import jakarta.persistence.TableGenerator;
\ No newline at end of file
+import jakarta.persistence.TableGenerator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/package-info.java
index 0f13f46c72bd..e54a6f935cf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/package-info.java
@@ -15,5 +15,3 @@
 		@org.hibernate.annotations.GenericGenerator(name = "system-uuid-2", strategy = "uuid")
 )
 package org.hibernate.orm.test.annotations.id;
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java
index f9cd0ea59424..9051b4db61d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java
index 98c0ec727028..866912f81dbd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
@@ -41,7 +39,7 @@ public class HibernateSequenceTest {
 
 	@Test
 	public void testHibernateSequenceSchema(SessionFactoryScope scope) {
-        EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(HibernateSequenceEntity.class.getName());
+		EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(HibernateSequenceEntity.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		assertTrue( SequenceStyleGenerator.class.isInstance( generator ) );
 		SequenceStyleGenerator seqGenerator = (SequenceStyleGenerator) generator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdClassTest.java
index aeb4b9a95de4..dacabda8c833 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java
index ddca47d191f5..38d525872e4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java
index b27ca82c5aa7..f07eaa1c6d6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.id.sequences;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/UUIDGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/UUIDGenerator.java
index 1f508303a366..305cda766f79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/UUIDGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/UUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
@@ -15,7 +13,7 @@
 import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
 
 /**
- * Unlike Hibernate's UUID generator.  This avoids 
+ * Unlike Hibernate's UUID generator.  This avoids
  * meaningless synchronization and has less
  * than a chance of an asteroid hitting you on the head
  * even after trillions of rows are inserted.  I know
@@ -29,7 +27,7 @@ public Object generate(SharedSessionContractImplementor session, Object entity)
 		String sud = uuid.toString();
 		System.out.println("uuid="+uuid);
 		sud = sud.replaceAll("-", "");
-		
+
 		BigInteger integer = new BigInteger(sud,16);
 
 		System.out.println("bi ="+integer);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java
index 825ac7ed4f77..bec2d15c6fe9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Ball.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java
index 2688c57ebb08..8de4e0837170 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BreakDance.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java
index bd8fbbd89ab6..6d20bc2fdd7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bunny.java 14761 2008-06-11 13:51:06Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -21,7 +17,7 @@
 
 /**
  * Blown precision on related entity when @JoinColumn is used.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
@@ -35,7 +31,7 @@ public class Bunny implements Serializable {
 
 	@OneToMany(mappedBy = "bunny", cascade = CascadeType.PERSIST)
 	Set teeth;
-	
+
 	@OneToMany(mappedBy = "bunny", cascade = CascadeType.PERSIST)
 	Set toes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java
index 766f6304537b..4a2c2b84f4c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Computer.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java
index ca95b0fd33f1..84ad9045515e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Department.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java
index 8e0ac0ec64bf..aadacc58d7f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Dog.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java
index dd0a74212524..4aee2f8d0847 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: FirTree.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java
index 3c4cb7bf3b76..ca335c793bd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Footballer.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java
index 4d901923d008..34174e774a46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: FootballerPk.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java
index 97ef65b78cec..7ad952bc0ea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java
@@ -1,18 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Furniture.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
 
 /**
  * @author Emmanuel Bernard
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java
index 416065c3c0c4..65412739d8e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: GoalKeeper.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java
index 8566a58c0a86..7d949a1b0c37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java
index e19f43733e09..5d2e7bfd1831 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Home.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Location.java
index fe195fb0dba6..b1e387186534 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Location.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Location.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java
index 5e51400c7a6d..951ad1e89fe7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: MilitaryBuilding.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java
index e26c575f64c9..2f91f86a9d25 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java
index dbd4ce7b0d0d..8bba73811a25 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Phone.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Planet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Planet.java
index fd027a75eb4f..150a2f18722f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Planet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Planet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Planet.java 14785 2008-06-19 10:44:33Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java
index 3c80a1e163b8..2877504d845e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Column;
@@ -14,7 +12,7 @@
 
 /**
  * Test entity for enum type as id.
- * 
+ *
  * @author Hardy Ferentschik
  * @see ANN-744
  */
@@ -68,23 +66,23 @@ public void setNumberOfInhabitants(long numberOfInhabitants) {
 	 * Constructs a String with all attributes
 	 * in name = value format.
 	 *
-	 * @return a String representation 
+	 * @return a String representation
 	 * of this object.
 	 */
 	public String toString()
 	{
-	    final String TAB = "    ";
-	    
-	    String retValue = "";
-	    
-	    retValue = "PlanetCheatSheet ( "
-	        + super.toString() + TAB
-	        + "planet = " + this.planet + TAB
-	        + "mass = " + this.mass + TAB
-	        + "radius = " + this.radius + TAB
-	        + "numberOfInhabitants = " + this.numberOfInhabitants + TAB
-	        + " )";
-	
-	    return retValue;
-	}	
+		final String TAB = "    ";
+
+		String retValue = "";
+
+		retValue = "PlanetCheatSheet ( "
+			+ super.toString() + TAB
+			+ "planet = " + this.planet + TAB
+			+ "mass = " + this.mass + TAB
+			+ "radius = " + this.radius + TAB
+			+ "numberOfInhabitants = " + this.numberOfInhabitants + TAB
+			+ " )";
+
+		return retValue;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java
index 675f440a7b14..dee9d981f946 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: PointyTooth.java 14761 2008-06-11 13:51:06Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,9 +15,9 @@
 import org.hibernate.annotations.GenericGenerator;
 
 /**
- * Blown precision on related entity when @JoinColumn is used. 
+ * Blown precision on related entity when @JoinColumn is used.
  * Does not cause an issue on HyperSonic, but replicates nicely on PGSQL.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
@@ -34,7 +30,7 @@ public class PointyTooth implements Serializable {
 	private BigDecimal id;
 
 	@ManyToOne
-    @JoinColumn(name = "bunny_id")
+	@JoinColumn(name = "bunny_id")
 	Bunny bunny;
 
 	public void setBunny(Bunny bunny) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java
index ccc0df7b937b..e7cea27232c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Shoe.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java
index 84e942ba32fd..690683423402 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SoundSystem.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java
index 74baf6d8385c..1dae3c78c030 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Store.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java
index ac52596aa5c7..3404a101ae0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Tower.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java
index 4d483cb57c3a..da084adc16ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Tree.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java
index 52dc67190520..88f24930ebf4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: TwinkleToes.java 14761 2008-06-11 13:51:06Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.id.sequences.entities;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,9 +15,9 @@
 import org.hibernate.annotations.GenericGenerator;
 
 /**
- * Blown precision on related entity when @JoinColumn is used. 
+ * Blown precision on related entity when @JoinColumn is used.
  * Does not cause an issue on HyperSonic, but replicates nicely on PGSQL.
- * 
+ *
  * @see ANN-748
  * @author Andrew C. Oliver andyspam@osintegrators.com
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/package-info.java
index 12ef39dcb2e9..73d2eb01c034 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/package-info.java
@@ -15,5 +15,3 @@
 		@org.hibernate.annotations.GenericGenerator(name = "system-uuid-2", strategy = "uuid")
 )
 package org.hibernate.orm.test.annotations.id.sequences;
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java
index 73b43797d284..801358164e56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.idclass;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdminId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdminId.java
index cb4322d793d1..5b813d9a41ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdminId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdminId.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.idclass;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassBackrefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassBackrefTest.java
index bf7b0d779a6d..a8b5bc45dd80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassBackrefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassBackrefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java
index dab0acb1e980..0274e69a90bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassCompositePKTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.idclass;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java
index 087062208d21..26bb53d0f2c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassOneToOneTest.java
index 2042f0c209d0..4d85bdf33132 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassWithSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassWithSuperclassTest.java
index 7d1708585294..039c6524fd40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassWithSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassWithSuperclassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.idclass;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/HabitatSpeciesLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/HabitatSpeciesLink.java
index 15cd7d308254..242943d16b09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/HabitatSpeciesLink.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/HabitatSpeciesLink.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: $
-
 package org.hibernate.orm.test.annotations.idclass.xml;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java
index 4840fb7345c2..da20f91bf42f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclass.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
index 53859c077e1e..40a64486be84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java
index 22c8b8e91840..a22eb1b07abc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 import java.io.Serializable;
@@ -25,55 +23,55 @@
 @SuppressWarnings("serial")
 public class Multiple implements Serializable
 {
-   @Id
-   @GenericGenerator(name = "increment", strategy = "increment")
-   @GeneratedValue(generator = "increment")
-   private Long id1;
-   
-   @Id
-   @GeneratedValue(generator = "MULTIPLE_SEQ", strategy = GenerationType.SEQUENCE)
-   @SequenceGenerator( name = "MULTIPLE_SEQ", sequenceName = "MULTIPLE_SEQ")
-   private Long id2;
-   
-   @Id
-   private Long id3;
-   private int quantity;
-   
-   public Multiple()
-   {
-      
-   }
-   
-   public Multiple(Long id3, int quantity)
-   {
-      this.id3 = id3;
-      this.quantity = quantity;
-   }
+@Id
+@GenericGenerator(name = "increment", strategy = "increment")
+@GeneratedValue(generator = "increment")
+private Long id1;
+
+@Id
+@GeneratedValue(generator = "MULTIPLE_SEQ", strategy = GenerationType.SEQUENCE)
+@SequenceGenerator( name = "MULTIPLE_SEQ", sequenceName = "MULTIPLE_SEQ")
+private Long id2;
+
+@Id
+private Long id3;
+private int quantity;
+
+public Multiple()
+{
+
+}
+
+public Multiple(Long id3, int quantity)
+{
+	this.id3 = id3;
+	this.quantity = quantity;
+}
+
+public Long getId1()
+{
+	return id1;
+}
 
-   public Long getId1()
-   {
-      return id1;
-   }
+public Long getId2()
+{
+	return id2;
+}
 
-   public Long getId2()
-   {
-      return id2;
-   }
+public Long getId3()
+{
+	return id3;
+}
 
-   public Long getId3()
-   {
-      return id3;
-   }
+public int getQuantity()
+{
+	return quantity;
+}
+
+public void setQuantity(int quantity)
+{
+	this.quantity = quantity;
+}
 
-   public int getQuantity()
-   {
-      return quantity;
-   }
 
-   public void setQuantity(int quantity)
-   {
-      this.quantity = quantity;
-   }
-   
-   
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/MultiplePK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/MultiplePK.java
index 8e18225d56c0..834de2ffd830 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/MultiplePK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/MultiplePK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 import java.io.Serializable;
@@ -14,67 +12,67 @@
  */
 public class MultiplePK implements Serializable
 {
-   private final Long id1;
-   private final Long id2;
-   private final Long id3;
+private final Long id1;
+private final Long id2;
+private final Long id3;
 // AnnotationSourceProcessor (incorrectly) requires this to be transient; see HHH-4819 and HHH-4820
-   private final transient int cachedHashCode;
+private final transient int cachedHashCode;
 
-   private MultiplePK()
-   {
-      id1 = null;
-      id2 = null;
-      id3 = null;
-      cachedHashCode = super.hashCode();
-   }
-   
-   public MultiplePK(Long id1, Long id2, Long id3)
-   {
-      this.id1 = id1;
-      this.id2 = id2;
-      this.id3 = id3;
-      this.cachedHashCode = calculateHashCode();
-   }
-   
+private MultiplePK()
+{
+	id1 = null;
+	id2 = null;
+	id3 = null;
+	cachedHashCode = super.hashCode();
+}
 
-   private int calculateHashCode() {
-       int result = id1.hashCode();
-       result = 31 * result + id2.hashCode();
-       return result;
-   }
+public MultiplePK(Long id1, Long id2, Long id3)
+{
+	this.id1 = id1;
+	this.id2 = id2;
+	this.id3 = id3;
+	this.cachedHashCode = calculateHashCode();
+}
 
-   public Long getId1() {
-       return id1;
-   }
 
-   public Long getId2() {
-       return id2;
-   }
-   
-   public Long getId3() {
-      return id3;
-  }
+private int calculateHashCode() {
+	int result = id1.hashCode();
+	result = 31 * result + id2.hashCode();
+	return result;
+}
 
-   @Override
-   public boolean equals(Object o) 
-   {
-       if ( this == o ) {
-           return true;
-       }
-       if ( o == null || getClass() != o.getClass() ) 
-       {
-           return false;
-       }
+public Long getId1() {
+	return id1;
+}
 
-       MultiplePK multiplePK = (MultiplePK) o;
+public Long getId2() {
+	return id2;
+}
 
-       return id1.equals( multiplePK.id1 )
-               && id2.equals( multiplePK.id2 )
-               && id3.equals( multiplePK.id3);
-   }
+public Long getId3() {
+	return id3;
+}
+
+@Override
+public boolean equals(Object o)
+{
+	if ( this == o ) {
+		return true;
+	}
+	if ( o == null || getClass() != o.getClass() )
+	{
+		return false;
+	}
+
+	MultiplePK multiplePK = (MultiplePK) o;
 
-   @Override
-   public int hashCode() {
-       return cachedHashCode;
-   }
+	return id1.equals( multiplePK.id1 )
+			&& id2.equals( multiplePK.id2 )
+			&& id3.equals( multiplePK.id3);
+}
+
+@Override
+public int hashCode() {
+	return cachedHashCode;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java
index 3d9913f411f6..135efaeb06b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java
index b1b4a77ce929..3ab340ec3aca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/SimplePK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/SimplePK.java
index f74d41e9f095..d82a65ce4cee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/SimplePK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/SimplePK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idclassgeneratedvalue;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
index 6c2b549b9b76..8e8f049cc930 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.identifiercollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java
index 23e34129eb6c..efba6eb334bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.identifiercollection;
 
 import java.sql.Types;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java
index 001f15958dbd..752c8d70cff4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.identifiercollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java
index 14da0e6ef231..7dd82064b9d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone;
 
 import java.io.Serializable;
@@ -57,4 +53,3 @@ public ShoppingBaskets getShoppingBaskets() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java
index f294c20aa3ba..91011fcff25f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import jakarta.persistence.Basic;
@@ -75,4 +71,3 @@ public Double getCost()  {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java
index 2af1e5662f26..26dde34eabfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java
index 329b74aaae7c..dd3c525d22d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
@@ -67,4 +63,3 @@ public void setPrimaryKey(PrimaryKey primaryKey) {
 		this.primaryKey = primaryKey;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java
index 040d16bb7122..6756ba7c2ee7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java
index f8e96b968847..fc5e879ae500 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone;
 
@@ -21,39 +19,39 @@
 @Table(name = "idmanytoone_course")
 public class Course implements Serializable {
 
-    @Id
-    @GeneratedValue
-    private int id;
+	@Id
+	@GeneratedValue
+	private int id;
 
-    private String name;
+	private String name;
 
-    @OneToMany(mappedBy = "course")
-    private Set students;
+	@OneToMany(mappedBy = "course")
+	private Set students;
 
-    public Course() {
-    }
+	public Course() {
+	}
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Set getStudents() {
-        return students;
-    }
+	public Set getStudents() {
+		return students;
+	}
 
-    public void setStudents(Set students) {
-        this.students = students;
-    }
+	public void setStudents(Set students) {
+		this.students = students;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java
index 3bcf58588039..a21f7787a141 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone;
 
@@ -22,43 +20,43 @@
 @Table(name = "idmanytoone_course_student")
 public class CourseStudent implements Serializable {
 
-    @Id
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "course_id")
-    private Course course;
+	@Id
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "course_id")
+	private Course course;
 
-    @Id
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "student_id")
-    private Student student;
+	@Id
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "student_id")
+	private Student student;
 
 	@Column(name = "`value`")
-    private String value;
+	private String value;
 
-    public CourseStudent() {
-    }
+	public CourseStudent() {
+	}
 
-    public Course getCourse() {
-        return course;
-    }
+	public Course getCourse() {
+		return course;
+	}
 
-    public void setCourse(Course course) {
-        this.course = course;
-    }
+	public void setCourse(Course course) {
+		this.course = course;
+	}
 
-    public Student getStudent() {
-        return student;
-    }
+	public Student getStudent() {
+		return student;
+	}
 
-    public void setStudent(Student student) {
-        this.student = student;
-    }
+	public void setStudent(Student student) {
+		this.student = student;
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    public void setValue(String value) {
-        this.value = value;
-    }
+	public void setValue(String value) {
+		this.value = value;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java
index aad29a99dd1b..dc3dd188ad80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import java.util.Set;
@@ -24,11 +20,11 @@
 @Entity
 @Table(name = "Bs")
 public class Customer implements Serializable {
-    @Id @GeneratedValue
+	@Id @GeneratedValue
 	public Integer id;
 
-    @OneToMany(mappedBy = "customer")
-    public Set stores;
+	@OneToMany(mappedBy = "customer")
+	public Set stores;
 
-    private static final long serialVersionUID = 3818501706063039923L;
+	private static final long serialVersionUID = 3818501706063039923L;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java
index 55e8ad47dfaa..8e17d1477882 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone;
 
 import java.io.Serializable;
@@ -51,4 +47,3 @@ public java.util.Set getShoppingBasketses() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java
index 78feb5b1390c..df26e20bd261 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone;
 
@@ -52,9 +50,9 @@ public void testIdClassManyToOne() {
 		//TODO test Customers / ShoppingBaskets / BasketItems testIdClassManyToOneWithReferenceColumn
 	}
 
-    @Test
+	@Test
 	@JiraKey( value = "HHH-7767" )
-    public void testCriteriaRestrictionOnIdManyToOne() {
+	public void testCriteriaRestrictionOnIdManyToOne() {
 		inTransaction( s -> {
 			s.createQuery( "from Course c join c.students cs join cs.student s where s.name = 'Foo'", Object[].class ).list();
 
@@ -78,7 +76,7 @@ public void testCriteriaRestrictionOnIdManyToOne() {
 //        criteria2.add( Restrictions.eq( "s.name", "Foo" ) );
 //        criteria2.list();
 		} );
-    }
+	}
 
 	@Override
 	protected Class[] getAnnotatedClasses() {
@@ -90,12 +88,12 @@ protected Class[] getAnnotatedClasses() {
 				CardField.class,
 				Card.class,
 				Project.class,
-                Course.class,
-                Student.class,
-                CourseStudent.class,
+				Course.class,
+				Student.class,
+				CourseStudent.class,
 
 				//tested only through deployment
-				//ANN-590 testIdClassManyToOneWithReferenceColumn 
+				//ANN-590 testIdClassManyToOneWithReferenceColumn
 				Customers.class,
 				ShoppingBaskets.class,
 				ShoppingBasketsPK.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java
index c1b9ec4c0093..dd7c0e77e88c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java
index fac82532b3da..a2e68786da6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone;
 
 import java.io.Serializable;
@@ -38,7 +34,7 @@ public class ShoppingBaskets implements Serializable {
 
 	@OneToMany(mappedBy="shoppingBaskets", cascade=CascadeType.ALL, targetEntity=BasketItems.class)
 	private java.util.Set items = new java.util.HashSet();
-	
+
 	public void setBasketDatetime(java.util.Date value) {
 		this.basketDatetime = value;
 	}
@@ -64,4 +60,3 @@ public java.util.Set getItems() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java
index 6f642278a700..e8ed1fabd92c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import jakarta.persistence.Basic;
@@ -72,4 +68,3 @@ public java.util.Date getBasketDatetime()  {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java
index 3852f72b3f08..f448d15f4bfe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import java.util.Set;
@@ -21,13 +17,12 @@
 @Entity
 @Table(name = "`As`")
 public class Store implements Serializable {
-    @Id @GeneratedValue
+	@Id @GeneratedValue
 	public Integer id;
 
-    @OneToMany(mappedBy = "store")
-    public Set customers;
+	@OneToMany(mappedBy = "store")
+	public Set customers;
 
 
-    private static final long serialVersionUID = 1748046699322502790L;
+	private static final long serialVersionUID = 1748046699322502790L;
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java
index 3f198e006e47..c1bda8414434 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
@@ -24,21 +20,21 @@
 public class StoreCustomer implements Serializable {
 	StoreCustomer() {}
 	@Id
-    @ManyToOne(optional = false)
-    @JoinColumn(name = "idA")
-    public Store store;
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "idA")
+	public Store store;
 
-    @Id
+	@Id
 	@ManyToOne(optional = false)
-    @JoinColumn(name = "idB")
-    public Customer customer;
+	@JoinColumn(name = "idB")
+	public Customer customer;
 
 
-    public StoreCustomer(Store store, Customer customer) {
+	public StoreCustomer(Store store, Customer customer) {
 	this.store = store;
 	this.customer = customer;
-    }
+	}
 
 
-    private static final long serialVersionUID = -8295955012787627232L;
+	private static final long serialVersionUID = -8295955012787627232L;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java
index 9f68ad5283d8..242a0d9f1d5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.idmanytoone;
 import java.io.Serializable;
 import jakarta.persistence.Id;
@@ -18,21 +14,21 @@
 public class StoreCustomerPK implements Serializable {
 	StoreCustomerPK() {}
 	@Id
-    @ManyToOne(optional = false)
-    @JoinColumn(name = "idA")
-    public Store store;
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "idA")
+	public Store store;
 
-    @Id
+	@Id
 	@ManyToOne(optional = false)
-    @JoinColumn(name = "idB")
-    public Customer customer;
+	@JoinColumn(name = "idB")
+	public Customer customer;
 
 
-    public StoreCustomerPK(Store store, Customer customer) {
+	public StoreCustomerPK(Store store, Customer customer) {
 	this.store = store;
 	this.customer = customer;
-    }
+	}
 
 
-    private static final long serialVersionUID = -1102111921432271459L;
+	private static final long serialVersionUID = -1102111921432271459L;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java
index d42a5af4e3f8..7fdb90d27946 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone;
 
@@ -21,39 +19,39 @@
 @Table(name = "idmanytoone_student")
 public class Student implements Serializable {
 
-    @Id
-    @GeneratedValue
-    private int id;
+	@Id
+	@GeneratedValue
+	private int id;
 
-    private String name;
+	private String name;
 
-    @OneToMany(mappedBy = "student")
-    private Set courses;
+	@OneToMany(mappedBy = "student")
+	private Set courses;
 
-    public Student() {
-    }
+	public Student() {
+	}
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Set getCourses() {
-        return courses;
-    }
+	public Set getCourses() {
+		return courses;
+	}
 
-    public void setCourses(Set courses) {
-        this.courses = courses;
-    }
+	public void setCourses(Set courses) {
+		this.courses = courses;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java
index 265ed69c10ca..7359d3121e19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.util.List;
 import jakarta.persistence.Entity;
@@ -42,4 +38,3 @@ public void setChildren(List children) {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java
index babac731adc4..0b8cb2c88515 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.io.Serializable;
 import java.math.BigInteger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
index c7c8e1f37791..26fbb6756f9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
index b9eb7a19222d..f35ab73eb961 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java
index b489c458b725..94272a029d37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -42,4 +38,3 @@ public void setSequenceNumber(int sequenceNumber) {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java
index b5fb94022e9d..4de6153ad4f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java
index 205e23960f07..ab487d113269 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.math.BigInteger;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java
index a11a14945b4d..ec36e8e5cdaa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.util.List;
 import jakarta.persistence.Entity;
@@ -55,4 +51,3 @@ public void setChildren(List children) {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java
index 398dee7eb2c4..8f5eee54a965 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java
index a088491ea711..47d42bc628ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.math.BigInteger;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java
index 5b635f315535..d0344b3f0d72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 import java.math.BigInteger;
 import jakarta.persistence.Entity;
@@ -14,6 +10,6 @@
 
 @Entity
 public class Service {
-    @Id
-    private BigInteger idpk;
+	@Id
+	private BigInteger idpk;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Caption.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Caption.java
index 0440b72efa63..780cd1029951 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Caption.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Caption.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java
index d6e5f8e131e7..fd2e3431d507 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java
index fa5c37bd26be..2f81995ae1be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.immutable;
 import java.io.Serializable;
 import java.util.List;
@@ -23,9 +19,9 @@
 @SuppressWarnings("serial")
 public class Country implements Serializable {
 	private Integer id;
-	
+
 	private String name;
-	
+
 	private List states;
 
 	@Id
@@ -52,7 +48,7 @@ public void setName(String string) {
 	public List getStates() {
 		return states;
 	}
-	
+
 	public void setStates(List states) {
 		this.states = states;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Exif.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Exif.java
index 44d26011f630..20400e0b9a0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Exif.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Exif.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java
index 0032b255b9d0..af500c0f0df7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java
index 5b8f3f566c9d..29a86415363a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.immutable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -21,7 +17,7 @@ public class Foobar {
 	@Id
 	@GeneratedValue
 	private Integer id;
-	
+
 	@Immutable
 	private String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java
index 4d5ee39e7001..60e3c6681667 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java
index 830370776bab..b8502e8ae95c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java
index f8aba7da2212..631e49814e3b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
@@ -123,7 +121,7 @@ public void testImmutableCollection() {
 			fail();
 		} catch (PersistenceException e) {
 			assertTrue(e.getMessage().contains("changed an immutable collection instance"));
-            log.debug("success");
+			log.debug("success");
 		}
 		s.close();
 
@@ -135,7 +133,7 @@ public void testImmutableCollection() {
 		tx.commit();
 		s.close();
 	}
-	
+
 	@Test
 	public void testImmutableAttribute(){
 		configuration().addAttributeConverter( ExifConverter.class);
@@ -218,7 +216,7 @@ public void testChangeImmutableAttribute(){
 		tx.commit();
 		s.close();
 	}
-	
+
 	@Test
 	public void testMisplacedImmutableAnnotation() {
 		MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
@@ -239,7 +237,7 @@ public void testMisplacedImmutableAnnotation() {
 	}
 
 	@Override
-    protected Class[] getAnnotatedClasses() {
+	protected Class[] getAnnotatedClasses() {
 		return new Class[] { Country.class, State.class, Photo.class };
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java
index 631e5ac8c877..be8f08d3fd6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java
index 94ca40acedb9..2be7c7358db6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.immutable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -19,7 +15,7 @@ public class State {
 	@Id
 	@GeneratedValue
 	private Integer id;
-	
+
 	private String name;
 
 	public Integer getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
index 214ce40dc22a..0ab866a73dee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
@@ -51,7 +49,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Test
 	public void testTableIndex() {
 		PersistentClass entity = metadata().getEntityBinding( Car.class.getName() );
-        Iterator itr = entity.getTable().getUniqueKeys().values().iterator();
+		Iterator itr = entity.getTable().getUniqueKeys().values().iterator();
 		assertTrue( itr.hasNext() );
 		UniqueKey uk = (UniqueKey) itr.next();
 		assertFalse( itr.hasNext() );
@@ -70,7 +68,7 @@ public void testTableIndex() {
 		assertFalse( itr.hasNext() );
 		assertEquals( "Car_idx", index.getName() );
 		assertEquals( 1, index.getColumnSpan() );
-        column = index.getColumns().iterator().next();
+		column = index.getColumns().iterator().next();
 		assertEquals( "since", column.getName() );
 		assertSame( entity.getTable(), index.getTable() );
 	}
@@ -86,7 +84,7 @@ public void testSecondaryTableIndex(){
 		assertFalse( itr.hasNext() );
 		assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
 		assertEquals( 2, index.getColumnSpan() );
-        Iterator columnIterator = index.getColumns().iterator();
+		Iterator columnIterator = index.getColumns().iterator();
 		Column column = columnIterator.next();
 		assertEquals( "dealer_name", column.getName() );
 		column = columnIterator.next();
@@ -108,7 +106,7 @@ public void testCollectionTableIndex(){
 		assertFalse( itr.hasNext() );
 		assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
 		assertEquals( 1, index.getColumnSpan() );
-        Iterator columnIterator = index.getColumns().iterator();
+		Iterator columnIterator = index.getColumns().iterator();
 		Column column = columnIterator.next();
 		assertEquals( "name", column.getName() );
 		assertSame( collectionTable, index.getTable() );
@@ -128,7 +126,7 @@ public void testJoinTableIndex(){
 		assertFalse( itr.hasNext() );
 		assertTrue( "index name is not generated", StringHelper.isNotEmpty( index.getName() ) );
 		assertEquals( 1, index.getColumnSpan() );
-        Iterator columnIterator = index.getColumns().iterator();
+		Iterator columnIterator = index.getColumns().iterator();
 		Column column = columnIterator.next();
 		assertEquals( "importers_id", column.getName() );
 		assertSame( collectionTable, index.getTable() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java
index e33fa273ee48..c81c85ab353d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java
index 4a0f1a9aaf26..6d873b4a30a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java
index 5e8e7c581a59..772e60234349 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java
index 64d920c3b8e7..186cf02e4f1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java
index 5e4bc7531a73..9ae1c9945f72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.index.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java
index 29057297450a..f3f1b1584d17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java
index 24d70241a57b..aa57967b2589 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java
index 3b0badf6a12c..ac30cd8b02c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java
index f5221bec6f46..4da9dd268c2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java
index 0d73e022ed97..58107908e2db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
index 138a527e8eaa..1ba473f8b9a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -40,5 +36,5 @@ public String getCurrency() {
 	public void setCurrency(String currency) {
 		this.currency = currency;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java
index 209c94b646e0..891930571a02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.List;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java
index 4ddd4fc220f2..a0443f887589 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java
index 5e382d59af4b..54e80a232f2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.math.BigDecimal;
 import java.util.Map;
@@ -25,21 +21,21 @@ public ExchangeOffice() {
 
 	@Id @GeneratedValue
 	private Integer id;
-	
+
 
 	public void setId(Integer id) {
 		this.id = id;
 	}
 
-	
+
 	public Integer getId() {
 		return id;
 	}
 
 	@jakarta.persistence.OneToMany(mappedBy = "parent")
-    @jakarta.persistence.MapKey(name="key")
-    private Map exchangeRates = new java.util.HashMap();
-	
+	@jakarta.persistence.MapKey(name="key")
+	private Map exchangeRates = new java.util.HashMap();
+
 	public Map getExchangeRates() {
 		return exchangeRates;
 	}
@@ -51,5 +47,5 @@ public Map getExchangeRates() {
 	public Map getExchangeRateFees() {
 		return exchangeRateFees;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java
index 04335db4eaf8..860a19f492bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
@@ -23,12 +19,12 @@ public ExchangeRate() {
 
 	@Id @GeneratedValue
 	private Integer id;
-	
+
 	@Column
 	private double rate;
-	
 
-	
+
+
 	public double getRate() {
 		return rate;
 	}
@@ -46,7 +42,7 @@ public void setId(Integer id) {
 	}
 
 	@Embedded
-    private ExchangeRateKey key = new ExchangeRateKey();
+	private ExchangeRateKey key = new ExchangeRateKey();
 
 	public ExchangeRateKey getKey() {
 		return key;
@@ -57,7 +53,7 @@ public void setKey(ExchangeRateKey key) {
 	}
 
 	@jakarta.persistence.ManyToOne(fetch = FetchType.LAZY )
-    private ExchangeOffice parent = null;
+	private ExchangeOffice parent = null;
 
 
 	public ExchangeOffice getParent() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java
index 7b546ce4c834..aeead21670c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -16,48 +12,48 @@
 public class ExchangeRateKey
 {
 
-    public ExchangeRateKey() {
-        super();
-    }
-
-  
-    public ExchangeRateKey( long date, Currency currency1, Currency currency2) {
-        super();
-        this.date = date;
-        this.currency1 = currency1;
-        this.currency2 = currency2;
-    }
-
-    @Column(name="`date`", nullable = false)
-    protected long date;
-    
-    @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
-    protected Currency currency1;
-    
-    @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
-    protected Currency currency2;
-    
-
-    @Override
-    public boolean equals (Object obj) {
-        if (this == obj)  return true;
-
-        if (!(obj instanceof ExchangeRateKey)) return false;
-
-        ExchangeRateKey q = (ExchangeRateKey) obj;
-        return q.date == date && q.currency1 == this.currency1 && q.currency2 == this.currency2;
-
-    }
-
-
-
-    @Override
-    public int hashCode() {
-        int hashcode = 0;
-        hashcode += date;
-        hashcode += (currency1 != null ? currency1.hashCode() : 0);
-        hashcode += (currency2 != null ? currency2.hashCode() : 0);
-        return hashcode;
-    }
+	public ExchangeRateKey() {
+		super();
+	}
+
+
+	public ExchangeRateKey( long date, Currency currency1, Currency currency2) {
+		super();
+		this.date = date;
+		this.currency1 = currency1;
+		this.currency2 = currency2;
+	}
+
+	@Column(name="`date`", nullable = false)
+	protected long date;
+
+	@jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
+	protected Currency currency1;
+
+	@jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false)
+	protected Currency currency2;
+
+
+	@Override
+	public boolean equals (Object obj) {
+		if (this == obj)  return true;
+
+		if (!(obj instanceof ExchangeRateKey)) return false;
+
+		ExchangeRateKey q = (ExchangeRateKey) obj;
+		return q.date == date && q.currency1 == this.currency1 && q.currency2 == this.currency2;
+
+	}
+
+
+
+	@Override
+	public int hashCode() {
+		int hashcode = 0;
+		hashcode += date;
+		hashcode += (currency1 != null ? currency1.hashCode() : 0);
+		hashcode += (currency2 != null ? currency2.hashCode() : 0);
+		return hashcode;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java
index 4ab6501ab458..5a9ded120161 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java
index 461ca4ca7958..0168d78aa5ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java
index 8c5a8df5be8e..095537a43603 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java
index 321632362b28..bc60e051815a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java
index 8ca3c0fee160..eb0c2a62225e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java
index c01a7516fe0c..fca3c209e118 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
 
@@ -88,7 +86,7 @@ private void isDefaultKeyColumnPresent(SessionFactoryScope scope, String collect
 
 	private boolean isDefaultColumnPresent(SessionFactoryScope scope, String collectionOwner, String propertyName, String suffix) {
 		final Collection collection = scope.getMetadataImplementor().getCollectionBinding( collectionOwner + "." + propertyName );
-        final Iterator columnIterator = collection.getCollectionTable().getColumns().iterator();
+		final Iterator columnIterator = collection.getCollectionTable().getColumns().iterator();
 		boolean hasDefault = false;
 		while ( columnIterator.hasNext() ) {
 			Column column = columnIterator.next();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java
index 4bdee89b7536..e08dc49a1d62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java
index 1d090a53268a..7b3c017f2da9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java
index e97be38ebf3b..5e069b54bd3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java
index 30f1e5e14d02..cf50bd7291a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java
index c3f525a6022d..86b7822c4ca9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java
index 384c9484384a..d89f3eddc65c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java
index 824e3156e206..a8e772343bcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java
index 05fb3b9066e9..1ba3918ac763 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java
index 1734a9e335d7..0a0d122776ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java
index 504bc667dc15..7fb42c695aac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import java.util.SortedMap;
 import java.util.TreeMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java
index 798eb7224fe3..d1e9ebcbfd08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java
index d5398ad06789..63faa26e3c66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java
index 88a2e0a775b0..534eb593370b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.indexcoll.eager;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java
index 8b1a6efe3456..9776c90d7d1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll.eager;
 
@@ -43,7 +41,7 @@ private void isDefaultKeyColumnPresent(String collectionOwner, String propertyNa
 
 	private boolean isDefaultColumnPresent(String collectionOwner, String propertyName, String suffix) {
 		final Collection collection = metadata().getCollectionBinding( collectionOwner + "." + propertyName );
-        final Iterator columnIterator = collection.getCollectionTable().getColumns().iterator();
+		final Iterator columnIterator = collection.getCollectionTable().getColumns().iterator();
 		boolean hasDefault = false;
 		while ( columnIterator.hasNext() ) {
 			Column column = columnIterator.next();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java
index 0845eeb8d14b..247442a7be53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java
index 259ed83685f3..968cb9aa7870 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java
index c798efdf65f6..ee0ccfc0dbc8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java
index a75653fa48dc..130c79dbf484 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.inheritance;
 
 import java.util.List;
@@ -13,7 +17,6 @@
 import jakarta.persistence.DiscriminatorType;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java
index 80cd00754c22..9d23e4468d14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.inheritance;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java
index b061561f4436..7e1c473b1cae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java
index f73ae1869731..24042906d770 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java
index 812a691e4973..3491b717a600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java
index b74668bf713f..0eca3ed6492d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java
index df9da864b8ec..195aa9207681 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -25,5 +21,3 @@ public class BaseClass {
 	@GeneratedValue
 	private long id;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java
index b4506225c71b..b5270ec734a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions;
 
@@ -21,5 +19,3 @@ public class BaseClass2 {
 	@GeneratedValue
 	private long id;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java
index df7ea5ef4cb4..edc2a8d306fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java
index 4d7071106f8a..9d21755ca34d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -18,5 +14,3 @@
 public class SubClass extends BaseClass {
 
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java
index dd230c19aef3..1979fa27cac6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions;
 
@@ -16,5 +14,3 @@
 @DiscriminatorValue("B")
 public class SubClass2 extends BaseClass2 {
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java
index f7d36310b1fa..9bea401f6ab1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -27,12 +25,12 @@ public class Account implements Serializable {
 
 	@Column(name="fld_number")
 	private String number;
-	
+
 	@OneToMany(mappedBy="account")
 	private Set clients;
-	
+
 	private double balance;
-	
+
 	public Account() {
 	}
 
@@ -68,8 +66,8 @@ public void addClient(Client c) {
 		clients.add(c);
 		c.setAccount(this);
 	}
-	
-	
+
+
 	public Set getClients() {
 		return clients;
 	}
@@ -78,8 +76,8 @@ public void setClients(Set clients) {
 		this.clients = clients;
 	}
 
-	
-	
-	
+
+
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java
index 7726de96e3f0..fe1a4eb28a4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java
index 12da4e84deb7..8497e3932c38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java
index ceef41488187..eb0bc40c2906 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -18,15 +16,15 @@
 @Table(name = "CLIENT")
 public class Client extends Person implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
 	private String street;
-	
+
 	private String code;
-	
+
 	private String city;
-	
+
 	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinTable(name = "CLIENT_ACCOUNT", 
+	@JoinTable(name = "CLIENT_ACCOUNT",
 			joinColumns = {@JoinColumn(name = "FK_CLIENT", referencedColumnName = "ID")},
 			inverseJoinColumns = {@JoinColumn(name = "FK_ACCOUNT", referencedColumnName = "ID")})
 	private Account account;
@@ -66,5 +64,5 @@ public String getCity() {
 	public void setCity(String city) {
 		this.city = city;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java
index fe396a364e99..aff56315a756 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java
index aab780ebcfa3..d34680f89ec4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -20,7 +18,7 @@
 @SecondaryTable(name = "CompanyAddress")
 public class Company extends Customer {
 
-	private String companyName;	
+	private String companyName;
 	private String companyAddress;
 
 	@Column
@@ -41,10 +39,10 @@ public void setCompanyAddress(String companyAddress) {
 		this.companyAddress = companyAddress;
 	}
 
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java
index dac2c1cbca4f..5949cc9a291a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java
index c55d5c87818d..d87e4390eec1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java
index 762beeb82c39..5e242c5efdc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.DiscriminatorColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java
index b5e68a976a5f..316c1fd6fd32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java
index 91a76c779b8b..aaccab71244b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java
index 24754aca7500..50179d4ac0fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
index da43ae35d0fd..c082b74e7b98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -14,9 +12,6 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.orm.test.annotations.inheritance.joined.Pool;
-import org.hibernate.orm.test.annotations.inheritance.joined.PoolAddress;
-import org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java
index 5e37ff2d298f..22d80f35f95e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java
index 45b178d77adc..171b11e29569 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -17,19 +15,19 @@
  */
 @MappedSuperclass
 public class LegalEntity {
-	
+
 	private Long id;
-	
+
 	@Id
 	@GeneratedValue(strategy=GenerationType.AUTO)
 	public Long getId() {
 		return this.id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	
-	
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java
index 2a2ec24fdfcf..19a3e7278ffe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java
index 9ba05ca35fbf..a8c2130e1105 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -55,4 +53,3 @@ public void setId(int id) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java
index b7aab0dd9600..a6b1c3dd7115 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.AttributeOverride;
@@ -33,9 +29,9 @@
 @SecondaryRow(table ="POOL_ADDRESS", optional=true)
 @SecondaryRow(table ="POOL_ADDRESS_2", optional=true, owned = false)
 public class Pool {
-	@Id @GeneratedValue 
+	@Id @GeneratedValue
 	private Integer id;
-	
+
 	@Embedded
 	private PoolAddress address;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java
index d579597263c6..538bab9ce9b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
@@ -11,14 +9,14 @@
 
 @Embeddable
 public class PoolAddress {
-    @Column(table = "POOL_ADDRESS")
-    private String address;
-    
-    public String getAddress() {
-        return address;
-    }
+	@Column(table = "POOL_ADDRESS")
+	private String address;
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java
index 3a451368694e..a58655e276a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java
index fd06ee94918e..11e8626b9d5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java
index 02f9896b6ff7..2f5f40595967 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java
index 510559c9f849..2dd79b8f89bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java
index d0747853fd1e..cfc23ca3ba14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.joined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java
index 7f9ece368892..0d77fc9b8177 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.mixed;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java
index a24876a46e73..aa1e9bb91b0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.mixed;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java
index addf23d64d8f..453d97c95b8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.mixed;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java
index 7db5baf3b4a5..302bc911e398 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java
index 9fe4213138af..4e6224e7762d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.mixed;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java
index 8839e5d0c144..714e97117f29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java
index 33a78162869b..a0c0d1e09df1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java
index 178177fdeae8..e9a1b4b125af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java
index c6dcabdff074..d5aba855a098 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java
index 4c24c5239477..b4f5b55b692f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java
index 79016f52bfe8..12eaf996e84b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java
index 6f5e6601fed9..86aa6bf53777 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java
index 7b97aba8db79..9ea95a1547ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java
index 497528acf882..c146170cdd1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.singletable;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java
index b9c9d0807757..c2dee8a86b9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.union;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java
index 3d8646691943..af961faa092b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.union;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java
index ae472a5a8ed9..8e843545d0c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.union;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java
index 2ff968ea76ab..9011c8a7543c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.inheritance.union;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java
index 38d5984ced42..605b44f2d053 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.inheritance.union;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/Contact.java
index c5346b233f28..e9f460c19b4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/Contact.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.interfaces;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java
index 3acaf7d55597..d978be60d9fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.interfaces;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/InterfacesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/InterfacesTest.java
index 8b3f1f344b70..3dc388a53fea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/InterfacesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/InterfacesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.interfaces;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/User.java
index 81607057ed3a..12e18d04c55c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.interfaces;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java
index 4514f4443967..64e53d7358a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.interfaces;
 import java.util.Collection;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java
index ed8236754419..9df20465b5b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java
index aca816a20b8e..093c2b1449ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java
index 0f2b21b9ceb8..b7c096012549 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
index 4a9fce1eeea8..6eea50c13a5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java
index c008e2c30ccc..b38083ef61c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import java.io.Serializable;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java
index 419e63055b01..f804b321ab01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java
index 6d18f9a7ee70..104da51e54c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java
index 188cd0739f2c..5bdac9e36b97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join;
 
@@ -145,7 +143,7 @@ public void testManyToOne() throws Exception {
 		tx.commit();
 		s.close();
 	}
-	
+
 	@Test
 	public void testReferenceColumnWithBacktics() {
 		Session s=openSession();
@@ -159,7 +157,7 @@ public void testReferenceColumnWithBacktics() {
 		s.getTransaction().commit();
 		s.close();
 	}
-	
+
 	@Test
 	public void testUniqueConstaintOnSecondaryTable() {
 		Cat cat = new Cat();
@@ -198,7 +196,7 @@ public void testFetchModeOnSecondaryTable() {
 		s.persist( cat );
 		s.flush();
 		s.clear();
-		
+
 		s.get( Cat.class, cat.getId() );
 		//Find a way to test it, I need to define the secondary table on a subclass
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java
index a635c263fcff..15ecd39c5fed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.join;
 import java.io.Serializable;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java
index 5a7653b60618..da421dfab133 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java
index 34bfc6751df3..d6d9c3e1d37b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join;
 import java.util.Collection;
@@ -36,8 +34,8 @@ public void setUserid( long userid ) {
 	}
 
 	@ManyToMany( fetch = FetchType.LAZY )
-	@JoinTable( name = "SYS_GROUPS_USERS", 
-			joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ), 
+	@JoinTable( name = "SYS_GROUPS_USERS",
+			joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ),
 			inverseJoinColumns = @JoinColumn( name = "GROUPID", referencedColumnName = "GROUPID" ) )
 	public Collection getGroups() {
 		return groups;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java
index 8a59fd922af0..18185d901284 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java
index fa68af6e6bdf..4f34d4c34895 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java
index b84ece403d9d..d45d64721f8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java
index 491797845486..b039eae1281c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.join.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java
index b72f100d0e09..eb4ad6706d1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.joincolumn;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java
index 85dce32d3e87..2abd38c7fbc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.list;
 
@@ -27,7 +25,6 @@
 import org.hibernate.tool.schema.internal.exec.GenerationTargetToStdout;
 
 
-import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 
 import org.junit.jupiter.api.AfterEach;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java
index 5f96c68b054e..75eb7c18916f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.loader;
 
@@ -90,4 +88,3 @@ public void testGetNotExisting() {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java
index a436721db4e0..b99ff9ef94bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.loader;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java
index 91acc34dd2fe..d18823a17ccb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.loader;
 import jakarta.persistence.Entity;
@@ -16,13 +14,13 @@
 
 @Entity
 public class Player {
-	
+
 	private Long id;
 	private Team team;
 	private String name;
-	
-    @Id
-    @GeneratedValue
+
+	@Id
+	@GeneratedValue
 	public Long getId() {
 		return id;
 	}
@@ -49,5 +47,5 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java
index eaa7e7cc01d4..a9ec9d50cd14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.loader;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java
index 3b81a1a012e7..74a822ae5552 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import org.hibernate.annotations.JavaType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java
index 4d721bba7bb3..75a5584fb1bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import org.hibernate.annotations.JavaType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractLobTest.java
index f7bc16ee6204..8c5db0ca4b8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractLobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java
index 37845653a75a..c61947627381 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.lob;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java
index 9f27f739fa2c..987368412f23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.annotations.lob;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.descriptor.java.CharacterArrayJavaType;
@@ -14,7 +9,7 @@
 
 /**
  * A type that maps JDBC {@link java.sql.Types#LONGVARCHAR LONGVARCHAR} and {@code Character[]}.
- * 
+ *
  * @author Strong Liu
  */
 public class CharacterArrayTextType extends AbstractSingleColumnStandardBasicType {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java
index ea16a546f25e..67853e053ac3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.lob;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java
index 2cb0e410ea75..71e721792c72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Dog.java
index facd6345c242..dea122fd7a17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Dog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Editor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Editor.java
index 9fc251288438..8a6653ec2768 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Editor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Editor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.lob;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ExplicitSerializableType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ExplicitSerializableType.java
index a51f7ab3cb14..5b186100bdb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ExplicitSerializableType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ExplicitSerializableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
@@ -14,11 +12,11 @@
  * @author Janario Oliveira
  */
 public class ExplicitSerializableType extends SerializableToBlobType {
-	
+
 	// TODO: Find another way to test that this type is being used by
 	// SerializableToBlobTypeTest#testPersist.  Most AbstractStandardBasicType
 	// methods are final.
-	
+
 //	@Override
 //	public Object get(ResultSet rs, String name) throws SQLException {
 //		CommonSerializable deserialize = (CommonSerializable) super.get( rs, name );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java
index 16b3f360273b..37cefa3f19ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.annotations.lob;
 import java.sql.Types;
 
@@ -20,7 +15,7 @@
  * An entity containing data that is materialized into a byte array immediately.
  * The hibernate type mapped for {@link #longByteArray} determines the SQL type
  * asctually used.
- * 
+ *
  * @author Gail Badner
  */
 @Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java
index 8d9de213efc5..9b11b0c49257 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
@@ -150,7 +148,7 @@ protected String[] getAnnotatedPackages() {
 	}
 
 	@Override
-    public Class[] getAnnotatedClasses() {
+	public Class[] getAnnotatedClasses() {
 		return new Class[] { ImageHolder.class };
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImplicitSerializableType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImplicitSerializableType.java
index fff73ea80b7e..c1b5cb85a2f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImplicitSerializableType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImplicitSerializableType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
@@ -18,7 +16,7 @@ public class ImplicitSerializableType extends Serializab
 	// TODO: Find another way to test that this type is being used by
 	// SerializableToBlobTypeTest#testPersist.  Most AbstractStandardBasicType
 	// methods are final.
-	
+
 //	@Override
 //	public Object get(ResultSet rs, String name) throws SQLException {
 //		CommonSerializable deserialize = (CommonSerializable) super.get( rs, name );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LobTest.java
index 809b111181f9..616e2ab6cbb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LobTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.annotations.lob;
 
 import org.hibernate.testing.DialectChecks;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java
index 365700b29a92..70981c6b1215 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.annotations.lob;
 
 import java.sql.Types;
@@ -23,7 +18,7 @@
  * An entity containing data that is materialized into a String immediately.
  * The hibernate type mapped for {@link #LONGVARCHAR} determines the SQL type
  * actually used.
- * 
+ *
  * @author Gail Badner
  */
 @Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java
index c6340de4a131..6f8cdb8b1452 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java
index e3f2e67ccc38..7d535c6bcc59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java
index 2e2654141b79..f73d4aa6cbcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.annotations.lob;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.descriptor.java.PrimitiveCharacterArrayJavaType;
@@ -14,7 +9,7 @@
 
 /**
  * A type that maps JDBC {@link java.sql.Types#LONGVARCHAR LONGVARCHAR} and {@code char[]}.
- * 
+ *
  * @author Strong Liu
  */
 public class PrimitiveCharacterArrayTextType extends AbstractSingleColumnStandardBasicType {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java
index a37244a32586..5b78c2871c9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import java.io.Serializable;
@@ -15,7 +13,7 @@
  * A type that maps JDBC {@link java.sql.Types#LONGVARBINARY LONGVARBINARY} and {@link Serializable}.
  * 
    
  * TODO : this should really have access to the actual Serializable class so we have access to the proper classloader
- * 
+ *
  * @author Strong Liu
  */
 public class SerializableToImageType extends AbstractSingleColumnStandardBasicType {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java
index 262d27be91e0..bf24c42bf1e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java
index 2c1efce9312a..fd8eb640a491 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import jakarta.persistence.Column;
@@ -20,7 +18,7 @@
 public class VersionedBook extends AbstractBook{
 	private Integer id;
 	private Integer version;
-	
+
 	@Id
 	@GeneratedValue
 	public Integer getId() {
@@ -39,5 +37,5 @@ public Integer getVersion() {
 
 	public void setVersion(Integer i) {
 		version = i;
-	}	
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java
index ef40a1a9ebe4..722c96478570 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java
index c536eaedd00c..2362cbb50643 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java
index d80b471d0077..9d76d4b76673 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
@@ -11,7 +9,7 @@
 
 /**
  * A type that maps JDBC {@link java.sql.Types#LONGVARBINARY LONGVARBINARY} and {@code Byte[]}
- * 
+ *
  * @author Strong Liu
  */
 public class WrappedImageType extends AbstractSingleColumnStandardBasicType {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java
index 633d15f692b8..0525607a4d3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob.hhh4635;
 
@@ -16,7 +14,7 @@
 
 /**
  * To reproduce this issue, Oracle MUST use a multi-byte character set (UTF-8)!
- * 
+ *
  * @author Brett Meyer
  */
 @RequiresDialect( OracleDialect.class )
@@ -26,7 +24,7 @@ public class LobTest extends BaseCoreFunctionalTestCase {
 	@Test
 	public void hibernateTest() {
 		printConfig();
-		
+
 		Session session = openSession();
 		session.beginTransaction();
 		LobTestEntity entity = new LobTestEntity();
@@ -42,7 +40,7 @@ public void hibernateTest() {
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] { LobTestEntity.class };
 	}
-	
+
 	private String randomString( int count ) {
 		StringBuilder buffer = new StringBuilder(count);
 		for( int i = 0; i < count; i++ ) {
@@ -53,11 +51,11 @@ private String randomString( int count ) {
 
 	private void printConfig() {
 		String sql = "select value from V$NLS_PARAMETERS where parameter = 'NLS_CHARACTERSET'";
-		
+
 		Session session = openSession();
 		session.beginTransaction();
 		Query query = session.createNativeQuery( sql );
-		
+
 		String s = (String) query.uniqueResult();
 		log.debug( "Using Oracle charset " + s );
 		session.getTransaction().commit();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java
index ea7f235ba685..37bcf803ba06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob.hhh4635;
 
@@ -20,10 +18,10 @@ public class LobTestEntity {
 
 	@Id
 	private Long id;
-	
+
 	@Lob
 	private Blob lobValue;
-	
+
 	@Column( name = "qwerty", length = 4000 )
 	private String qwerty;
 
@@ -50,5 +48,5 @@ public void setQwerty(String qwerty) {
 	public String getQwerty() {
 		return qwerty;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java
index 9ea58c9e6d6a..82f3bfbc7cc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob.locator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java
index 4eaee3c76b8a..b2574f5fa17b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.lob.locator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java
index bc0c632cae7e..bb1152a329a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java
index 0fc80018a8c5..bf24c9e3fa51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Date;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java
index f725bd4bb8e3..6b51dffb03d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Set;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java
index 68a799641fb3..7b1d6c5daf25 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java
index 0215e4a4dad8..3ae6cb9f6c09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java
index 6ab8d4f60b4b..92e033f2be3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java
index c191c7544fcf..c1cca247bd1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.List;
@@ -25,5 +23,5 @@ public List getPhoneNumbers() {
 	public void setPhoneNumbers(List phoneNumbers) {
 		this.phoneNumbers = phoneNumbers;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java
index 9dcbcab34d88..1af7c5061c47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java
index 971304758d28..ad9b3484d50b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java
index badc5d9d1afb..3f86f1703de9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import java.util.Collection;
@@ -45,7 +41,7 @@ public class Employer implements Serializable {
 			inverseJoinColumns = {@JoinColumn(name = "CONTRACTOR_ID")}
 	)
 	@Cascade({org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.MERGE})
-	@OrderBy("name desc")	
+	@OrderBy("name desc")
 	public List getContractors() {
 		return contractors;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java
index 14aa0f6d4449..e4fece03d1e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java
index 9ea45fb36d1e..4d2acfe71f12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Collection;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java
index c74dfb25b434..20a89df7d995 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java
index 9f3f99e1c221..84b442feb21b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -40,4 +36,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java
index 52c2c1890498..f9a3e71f9519 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java
index 14bc57741b6d..ba11e4a6eda7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 import jakarta.persistence.CascadeType;
@@ -11,7 +9,7 @@
 
 @Embeddable
 public class JobInfo {
-   String jobDescription;
+String jobDescription;
 	ProgramManager pm; // Bidirectional
 
 	public String getJobDescription() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java
index 2969aa8d381f..9be2682c90b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java
index dabe55fa1c16..da2e2c691157 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java
index 607b8357676a..fa65d7147e02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyInverseJoinColumnSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyInverseJoinColumnSortedSetTest.java
index da8b51acb6ae..3877d36dea79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyInverseJoinColumnSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyInverseJoinColumnSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 
@@ -76,7 +74,7 @@ public void testDefault() {
 	}
 
 	@Override
-    protected Class[] getAnnotatedClasses() {
+	protected Class[] getAnnotatedClasses() {
 		return new Class[]{
 				ContainingEntity.class,
 				ContainedEntity.class
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
index 94b49a4d3213..4974a0ac6977 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyOrderByTest.java
index 2153bec4c5be..a19e9add1c96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyOrderByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.manytomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java
index 0e2243c4b674..f8ac6caac3de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 
@@ -311,7 +309,7 @@ public void testOrderByEmployee() {
 		tx.rollback();
 		s.close();
 	}
-	
+
 	// HHH-4394
 	@Test
 	public void testOrderByContractor() {
@@ -359,7 +357,7 @@ public void testOrderByContractor() {
 		tx.rollback();
 		s.close();
 	}
-	
+
 	@Test
 	public void testRemoveInBetween() {
 		Session s;
@@ -582,15 +580,15 @@ public void testAssociationTableAndOrderByWithSet() {
 		Permission readAccess = new Permission();
 		readAccess.setPermission( "read" );
 		readAccess.setExpirationDate( new Date() );
-		
+
 		Permission writeAccess = new Permission();
 		writeAccess.setPermission( "write" );
 		writeAccess.setExpirationDate( new Date( new Date().getTime() - 10*60*1000 ) );
-		
+
 		Permission executeAccess = new Permission();
 		executeAccess.setPermission( "execute" );
 		executeAccess.setExpirationDate( new Date( new Date().getTime() - 5*60*1000 ) );
-		
+
 		Set coll = new HashSet<>( 3 );
 		coll.add( readAccess );
 		coll.add( writeAccess );
@@ -613,7 +611,7 @@ public void testAssociationTableAndOrderByWithSet() {
 		s.getTransaction().rollback();
 		s.close();
 	}
-	
+
 	@Test
 	public void testJoinedSubclassManyToMany() {
 		Session s = openSession();
@@ -712,7 +710,7 @@ public void testManyToManyEmbeddableBiDirectionalDotNotationInMappedBy() {
 		s = openSession();
 		s.getTransaction().begin();
 		e = s.get( e.getClass(),e.getId() );
-		// follow both directions of many to many association 
+		// follow both directions of many to many association
 		assertEquals("same employee", e.getName(), e.getContactInfo().getPhoneNumbers().get(0).getEmployees().iterator().next().getName());
 		s.getTransaction().commit();
 
@@ -748,7 +746,7 @@ public void testOneToManyEmbeddableBiDirectionalDotNotationInMappedBy() {
 		s = openSession();
 		s.getTransaction().begin();
 		e = s.get( e.getClass(), e.getId() );
-		assertEquals( "same job in both directions", 
+		assertEquals( "same job in both directions",
 			e.getJobInfo().getJobDescription(),
 			e.getJobInfo().getPm().getManages().iterator().next().getJobInfo().getJobDescription()  );
 		s.getTransaction().commit();
@@ -756,7 +754,7 @@ public void testOneToManyEmbeddableBiDirectionalDotNotationInMappedBy() {
 	}
 
 	@Override
-    protected Class[] getAnnotatedClasses() {
+	protected Class[] getAnnotatedClasses() {
 		return new Class[]{
 				Friend.class,
 				Employer.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java
index c910eb01d7d6..11ad0c25a53d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Date;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java
index f995b0dc6852..69f53fcb2a71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java
index 42daff1aca04..173e75c6df4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java
index a1932089995d..f36ba0c00c46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Set;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java
index e7a777c0b41f..f82de641c51d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java
index cb3643d6a1d3..4d266d09b382 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java
index 28e0fab3d23a..4d86363d9b30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java
index 3b675acfbdc1..77d3df4b7317 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java
index d656f6bca772..b76785623a94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java
index 0276239b589b..36544fa6c283 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java
index faf14afc9222..06ff85179033 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 import java.util.List;
@@ -25,5 +23,5 @@ public List getPhoneNumbers() {
 	public void setPhoneNumbers(List phoneNumbers) {
 		this.phoneNumbers = phoneNumbers;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java
index b4e643124f22..0ecc7c53cab6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java
index 051b1612d257..8f6a85c4c107 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java
index 3de2e417c465..fd73af23e4a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java
index f6e9a1c02a6a..fe5fde5438f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java
index 4edb70b92851..e409d76053e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 
@@ -202,7 +200,7 @@ protected void checkDefaultJoinTablAndJoinColumnNames(
 		}
 		boolean hasOwnerFK = false;
 		boolean hasInverseFK = false;
-        for (Iterator it = ownerCollection.getCollectionTable().getForeignKeys().values().iterator(); it.hasNext(); ) {
+		for (Iterator it = ownerCollection.getCollectionTable().getForeignKeys().values().iterator(); it.hasNext(); ) {
 			final ForeignKey fk = (ForeignKey) it.next();
 			assertSame( ownerCollection.getCollectionTable(), fk.getTable() );
 			if ( fk.getColumnSpan() > 1 ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java
index 9641e828868f..432ff48dd64b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java
index b457a05cb4f2..6cee1583a25d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytomany.defaults;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java
index 2eee2a19adaa..8f52ca27d902 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java
index 76058130c41c..5ce56659f255 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java
index 17dd6c15ea2f..ebfd30a00ab4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java
index e192852671a7..ed7a125f0ed0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java
index 2cfbe3386c94..e7ca4c227946 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java
index f12517bf19b5..346fc2a18a89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java
index d2738a1b654a..fd88fb7d288c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java
index 45b1ab5fbb70..d4bc101278d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java
index 2d80d58698d2..a4555fcf787b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java
index b2ad327566dd..7f6392b16002 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java
index 7664bd2a8e75..762e824f1c35 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java
index fd4d51c2091c..f924b9a3e923 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java
index fa908e04299f..e84e1bd79e58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTest.java
index f5cfdd21d634..688693233286 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 
 
-import java.util.List;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -18,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Emmanuel Bernard
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java
index e25cc27b613c..dcacf594de09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java
index 4898ba2d0e8e..c97e49b0b8b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java
index 314291cbf75e..b81278b1aa61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java
index c61ee34a3f60..c02425241e53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java
index 308c3ffb8504..81d3f4c426e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.manytoone;
 
 import org.hibernate.boot.beanvalidation.ValidationMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java
index ad8737072d5c..3c549bf19711 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java
index 85efdc9e10a5..edd9edc9614f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java
index 01b7f291d7c1..ec978ebcb4bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java
index 7fe78e847ca1..814d454db75c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java
index 2700574353f9..5d0b0d1164eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java
index c2d6afc73e84..98c3916635b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.manytoone;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java
index 7d2dedf65af0..cc7caf1ed2db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java
index e7bd4f78198d..06cfda16babd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java
index 903e7188ee6b..a26e07e7fb95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 import java.io.Serializable;
 import java.rmi.server.UID;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java
index 1f20c533e449..181f387672a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
index 5cde90c5494f..f7f96d34732c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java
index 62b818f27224..4142c0c7b589 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
index 4daab5147156..8b42861b0253 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
index a0f592fd703c..0897280d0289 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname;
 import java.math.BigDecimal;
 
@@ -49,4 +45,3 @@ public void setCost(BigDecimal cost) {
 		this.cost = cost;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Company.java
index e2469fbedde0..6e80c0404482 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Company.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 
 import java.io.Serializable;
@@ -22,11 +19,11 @@
  */
 @Entity
 public class Company implements Serializable {
-	
+
 	private static final long serialVersionUID = 1L;
 	private int id;
 	private Person person;
-	
+
 	@Id @GeneratedValue
 	public int getId() {
 		return id;
@@ -34,7 +31,7 @@ public int getId() {
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	@ManyToOne
 	@JoinColumnOrFormula(column=@JoinColumn(name="id", referencedColumnName="company_id", updatable=false, insertable=false))
 	@JoinColumnOrFormula(formula=@JoinFormula(value="'T'", referencedColumnName="is_default"))
@@ -44,5 +41,5 @@ public Person getDefaultContactPerson() {
 	public void setDefaultContactPerson(Person person) {
 		this.person = person;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Contract.java
index c834110e5ea1..02fa5115a2d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Contract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Contract.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 
 import jakarta.persistence.Column;
@@ -41,7 +38,7 @@ public ContractId getId() {
 	public void setId(ContractId id) {
 		this.id = id;
 	}
- 
+
 	@ManyToOne
 	@JoinColumnOrFormula(column = @JoinColumn(name = "CDT_MDL_CODE", referencedColumnName = "MDL_CODE"))
 	@JoinColumnOrFormula(formula = @JoinFormula(value = "CDT_MFG_CODE", referencedColumnName = "MDL_MFG_CODE"))
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ContractId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ContractId.java
index 6a0ce892e09e..16aae8a258cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ContractId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ContractId.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/FoodItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/FoodItem.java
index b9bdb26b88d0..f2e39f279d32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/FoodItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/FoodItem.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 
 import jakarta.persistence.Entity;
@@ -24,7 +21,7 @@ public class FoodItem {
 	private Integer id;
 	private String item;
 	private Menu order;
-	
+
 	@Id @GeneratedValue
 	public Integer getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Language.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Language.java
index 27a5eb2f0ac8..7871599f6bd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Language.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Language.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -20,7 +17,7 @@
 public class Language implements Serializable {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	private String name;
 	private String code;
 
@@ -32,7 +29,7 @@ public String getCode() {
 	public void setCode(String code) {
 		this.code = code;
 	}
-	
+
 	@Column(name="name")
 	public String getName() {
 		return name;
@@ -40,5 +37,5 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Manufacturer.java
index 647ccc3b8c26..3c0ed1ffe734 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Manufacturer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Manufacturer.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -50,4 +47,3 @@ public String toString() {
 		return name;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManufacturerId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManufacturerId.java
index 2b6220b118a2..5f9b0ea96901 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManufacturerId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManufacturerId.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -12,7 +9,7 @@
 
 @Embeddable
 public class ManufacturerId implements Serializable {
-	
+
 	private static final long serialVersionUID = 1L;
 
 	private Integer companyCode;
@@ -44,6 +41,5 @@ public Integer getManufacturerCode() {
 	public void setManufacturerCode(Integer manufacturerCode) {
 		this.manufacturerCode = manufacturerCode;
 	}
-	
-}
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
index 2870f9cae530..4b06c7024c1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 
@@ -184,14 +182,14 @@ public void testManyToOneFromNonPkToNonPk(SessionFactoryScope scope) {
 
 			session.getTransaction().markRollbackOnly();
 		} );
-    }
+	}
 
-    @Test
+	@Test
 	@DomainModel( annotatedClasses = ProductSqlServer.class )
 	@SessionFactory
 	@RequiresDialect( SQLServerDialect.class )
-    public void testManyToOneFromNonPkToNonPkSqlServer(SessionFactoryScope scope) {
-        // also tests usage of the stand-alone @JoinFormula annotation
+	public void testManyToOneFromNonPkToNonPkSqlServer(SessionFactoryScope scope) {
+		// also tests usage of the stand-alone @JoinFormula annotation
 		// (i.e. not wrapped within @JoinColumnsOrFormulas)
 
 		scope.inTransaction( (session) -> {
@@ -221,6 +219,6 @@ public void testManyToOneFromNonPkToNonPkSqlServer(SessionFactoryScope scope) {
 
 			session.getTransaction().markRollbackOnly();
 		} );
-    }
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Menu.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Menu.java
index 04b3219a8eca..04b1eddb525e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Menu.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Menu.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -17,12 +14,12 @@
  */
 @Entity
 public class Menu implements Serializable {
-	
+
 	private static final long serialVersionUID = 1L;
 	private Integer id;
 	private String orderNbr;
 	private String isDefault;
-	
+
 	@Id
 	@GeneratedValue
 	public Integer getId() {
@@ -51,5 +48,5 @@ public void setOrderNbr(String orderNbr) {
 		this.orderNbr = orderNbr;
 	}
 
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Message.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Message.java
index 27450959ad0f..752914c432e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Message.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Message.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 
 import java.io.Serializable;
@@ -23,22 +19,22 @@
  */
 @Entity
 public class Message implements Serializable {
-	
+
 	private static final long serialVersionUID = 1L;
 	private int id;
 	private String languageCode;
 	private String languageName;
 	private Language language;
-	
+
 	@Id @GeneratedValue
 	public int getId() {
 		return id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	@Column(name="lang_code")
 	public String getLanguageCode() {
 		return languageCode;
@@ -56,7 +52,7 @@ public String getLanguageName() {
 	public void setLanguageName(String val) {
 		this.languageName = val;
 	}
-		
+
 	@ManyToOne
 	@JoinColumnOrFormula(formula=@JoinFormula(value="UPPER(lang_code)"))
 	//@JoinColumnOrFormula(formula=@JoinFormula(value="(select l.code from Language l where l.name = lang_name)"))
@@ -66,5 +62,5 @@ public Language getLanguage() {
 	public void setLanguage(Language language) {
 		this.language = language;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Model.java
index ff42b7bb2bf7..bf4779dff1f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Model.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Model.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -13,16 +10,16 @@
 @Entity
 @Table(name="MODEL")
 public class Model {
-	
+
 	private ModelId id;
-	
+
 	private String name;
-	
+
 	public Model(ModelId id, String name) {
 		this.id = id;
 		this.name = name;
 	}
-		
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
@@ -50,27 +47,26 @@ public boolean equals(Object obj) {
 
 	public Model() {
 	}
-	
+
 	@Id
 	public ModelId getId() {
 		return id;
 	}
-	
+
 	public void setId(ModelId id) {
 		this.id = id;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@Override
 	public String toString() {
 		return name;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ModelId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ModelId.java
index 3cc8925b7bc8..efee8e5e7e06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ModelId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ModelId.java
@@ -1,19 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
- 
+
 @Embeddable
 public class ModelId implements Serializable {
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 1L;
 
@@ -102,4 +99,3 @@ public boolean equals(Object obj) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Person.java
index 0e91255c28ee..80392e3b168f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Person.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -17,12 +14,12 @@
  */
 @Entity
 public class Person implements Serializable {
-	
+
 	private static final long serialVersionUID = 1L;
 	private int id;
 	private int companyId;
 	private String defaultFlag;
-	
+
 	@Id @GeneratedValue
 	public int getId() {
 		return id;
@@ -30,7 +27,7 @@ public int getId() {
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	@Column(name="company_id")
 	public int getCompanyId() {
 		return companyId;
@@ -47,4 +44,3 @@ public void setDefaultFlag(String defaultFlag) {
 		this.defaultFlag = defaultFlag;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
index 10f75fa61e52..46b7ca065b67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -25,28 +22,28 @@
 @Table(name="product")
 public class Product implements Serializable
 {
-	
+
 	private static final long serialVersionUID = 6956478993159505828L;
 
 	@Id
-    public Integer id;
-    
-    @Column(name="product_idnf", length=18, nullable=false, unique=true,
-        columnDefinition="char(18)")
-    public String productIdnf;
-    
-    @Column(name="description", nullable=false)
-    public String description;
-
-    @ManyToOne
+	public Integer id;
+
+	@Column(name="product_idnf", length=18, nullable=false, unique=true,
+		columnDefinition="char(18)")
+	public String productIdnf;
+
+	@Column(name="description", nullable=false)
+	public String description;
+
+	@ManyToOne
 	@JoinFormula(value="{fn substring(product_idnf, 1, 3)}",
-				 referencedColumnName="product_idnf")
+				referencedColumnName="product_idnf")
 	@Fetch(FetchMode.JOIN)
-    private Product productFamily;
-    
-    public Product getProductFamily()
-    {
-        return productFamily;
-    }
-   
+	private Product productFamily;
+
+	public Product getProductFamily()
+	{
+		return productFamily;
+	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ProductSqlServer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ProductSqlServer.java
index d0b360db0305..1084bc370761 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ProductSqlServer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ProductSqlServer.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.manytoonewithformula;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -29,24 +26,24 @@ public class ProductSqlServer implements Serializable
 	private static final long serialVersionUID = 6956478993159505828L;
 
 	@Id
-    public Integer id;
+	public Integer id;
 
-    @Column(name="product_idnf", length=18, nullable=false, unique=true,
-        columnDefinition="char(18)")
-    public String productIdnf;
+	@Column(name="product_idnf", length=18, nullable=false, unique=true,
+		columnDefinition="char(18)")
+	public String productIdnf;
 
-    @Column(name="description", nullable=false)
-    public String description;
+	@Column(name="description", nullable=false)
+	public String description;
 
-    @ManyToOne
+	@ManyToOne
 	@JoinFormula(value="{fn substring(product_idnf, 1, 3)}",
-				 referencedColumnName="product_idnf")
+				referencedColumnName="product_idnf")
 	@Fetch(FetchMode.JOIN)
-    private ProductSqlServer productFamily;
+	private ProductSqlServer productFamily;
 
-    public ProductSqlServer getProductFamily()
-    {
-        return productFamily;
-    }
+	public ProductSqlServer getProductFamily()
+	{
+		return productFamily;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java
index ea6b5ffe18a9..57bd352e58fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
index 7b8aa3096a53..c720ee91fb9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
index 447f90fe3998..9c782096a159 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
index adee0b321efc..25d40bd62374 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
index e24524efe32a..c07b5d979201 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/DefaultedMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/DefaultedMapsIdTest.java
index 38a5034b89ec..e750793dd3be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/DefaultedMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/DefaultedMapsIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.CascadeType;
@@ -26,99 +30,99 @@
 @DomainModel(annotatedClasses = {DefaultedMapsIdTest.Loan.class, DefaultedMapsIdTest.Extension.class})
 public class DefaultedMapsIdTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        ExtensionId eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            Extension extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 1;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 2;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return new ExtensionId(extension.exLoanId, extension.exNo );
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.exNo);
-            assertEquals(999L, extension.exLoanId);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.exLoanId);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.exLoanId);
-            assertEquals(loan, extension.loan);
-        });
-    }
-
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
-
-        private BigDecimal amount = BigDecimal.ZERO;
-
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
-
-    static class ExtensionId {
-        private Long exLoanId;
-        private int exNo;
-
-        public ExtensionId(Long exLoanId, int exNo) {
-            this.exLoanId = exLoanId;
-            this.exNo = exNo;
-        }
-
-        public ExtensionId() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof ExtensionId)) return false;
-            ExtensionId that = (ExtensionId) o;
-            return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(exLoanId, exNo);
-        }
-    }
-
-    @Entity(name = "Extension")
-    @IdClass(ExtensionId.class)
-    static class Extension {
-        @Id
-        private Long exLoanId;
-
-        @Id
-        @Column(name = "EX_NO")
-        private int exNo;
-
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
-
-        @ManyToOne
-        @MapsId("exLoanId")
-        private Loan loan;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		ExtensionId eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			Extension extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 1;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 2;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return new ExtensionId(extension.exLoanId, extension.exNo );
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.exNo);
+			assertEquals(999L, extension.exLoanId);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.exLoanId);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.exLoanId);
+			assertEquals(loan, extension.loan);
+		});
+	}
+
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
+
+		private BigDecimal amount = BigDecimal.ZERO;
+
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
+
+	static class ExtensionId {
+		private Long exLoanId;
+		private int exNo;
+
+		public ExtensionId(Long exLoanId, int exNo) {
+			this.exLoanId = exLoanId;
+			this.exNo = exNo;
+		}
+
+		public ExtensionId() {
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof ExtensionId)) return false;
+			ExtensionId that = (ExtensionId) o;
+			return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(exLoanId, exNo);
+		}
+	}
+
+	@Entity(name = "Extension")
+	@IdClass(ExtensionId.class)
+	static class Extension {
+		@Id
+		private Long exLoanId;
+
+		@Id
+		@Column(name = "EX_NO")
+		private int exNo;
+
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
+
+		@ManyToOne
+		@MapsId("exLoanId")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdTest.java
index 3533c96a3639..615744ff31e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdTest.java
@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
-import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -28,100 +31,100 @@
 @DomainModel(annotatedClasses = {MapsEmbeddedIdTest.Loan.class, MapsEmbeddedIdTest.ExtensionId.class, MapsEmbeddedIdTest.Extension.class})
 public class MapsEmbeddedIdTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        ExtensionId eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            ExtensionId exid = new ExtensionId(loan.id, 1);
-            Extension extension = new Extension();
-            extension.id = exid;
-            extension.loan = loan;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            exid = new ExtensionId(loan.id, 2);
-            extension = new Extension();
-            extension.id = exid;
-            extension.loan = loan;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return exid;
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.id.exNo);
-            assertEquals(999L, extension.id.exLoanId);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.exLoanId);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.id.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.id.exLoanId);
-            assertEquals(loan, extension.loan);
-        });
-    }
-
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
-
-        private BigDecimal amount = BigDecimal.ZERO;
-
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
-
-    @Embeddable
-    public static class ExtensionId {
-
-        private Long exLoanId;
-
-        @Column(name="EX_NO")
-        private int exNo;
-
-        public ExtensionId(Long exLoanId, int exNo) {
-            this.exLoanId = exLoanId;
-            this.exNo = exNo;
-        }
-
-        public ExtensionId() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof ExtensionId)) return false;
-            ExtensionId that = (ExtensionId) o;
-            return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(exLoanId, exNo);
-        }
-    }
-
-    @Entity(name = "Extension")
-    static class Extension {
-
-        @EmbeddedId
-        private ExtensionId id;
-
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
-
-        @ManyToOne
-        @MapsId("exLoanId")
-        @JoinColumn(name = "EX_LOAN_ID")
-        private Loan loan;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		ExtensionId eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			ExtensionId exid = new ExtensionId(loan.id, 1);
+			Extension extension = new Extension();
+			extension.id = exid;
+			extension.loan = loan;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			exid = new ExtensionId(loan.id, 2);
+			extension = new Extension();
+			extension.id = exid;
+			extension.loan = loan;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return exid;
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.id.exNo);
+			assertEquals(999L, extension.id.exLoanId);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.exLoanId);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.id.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.id.exLoanId);
+			assertEquals(loan, extension.loan);
+		});
+	}
+
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
+
+		private BigDecimal amount = BigDecimal.ZERO;
+
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
+
+	@Embeddable
+	public static class ExtensionId {
+
+		private Long exLoanId;
+
+		@Column(name="EX_NO")
+		private int exNo;
+
+		public ExtensionId(Long exLoanId, int exNo) {
+			this.exLoanId = exLoanId;
+			this.exNo = exNo;
+		}
+
+		public ExtensionId() {
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof ExtensionId)) return false;
+			ExtensionId that = (ExtensionId) o;
+			return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(exLoanId, exNo);
+		}
+	}
+
+	@Entity(name = "Extension")
+	static class Extension {
+
+		@EmbeddedId
+		private ExtensionId id;
+
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
+
+		@ManyToOne
+		@MapsId("exLoanId")
+		@JoinColumn(name = "EX_LOAN_ID")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdWithOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdWithOverrideTest.java
index 88355029195a..34ca40a2cf2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdWithOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdWithOverrideTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.AttributeOverride;
@@ -28,100 +32,100 @@
 @DomainModel(annotatedClasses = {MapsEmbeddedIdWithOverrideTest.Loan.class, MapsEmbeddedIdWithOverrideTest.ExtensionId.class, MapsEmbeddedIdWithOverrideTest.Extension.class})
 public class MapsEmbeddedIdWithOverrideTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        ExtensionId eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            ExtensionId exid = new ExtensionId(loan.id, 1);
-            Extension extension = new Extension();
-            extension.id = exid;
-            extension.loan = loan;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            exid = new ExtensionId(loan.id, 2);
-            extension = new Extension();
-            extension.id = exid;
-            extension.loan = loan;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return exid;
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.id.exNo);
-            assertEquals(999L, extension.id.exLoanId);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.exLoanId);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.id.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.id.exLoanId);
-            assertEquals(loan, extension.loan);
-        });
-    }
-
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
-
-        private BigDecimal amount = BigDecimal.ZERO;
-
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
-
-    @Embeddable
-    public static class ExtensionId {
-
-        private Long exLoanId;
-
-        private int exNo;
-
-        public ExtensionId(Long exLoanId, int exNo) {
-            this.exLoanId = exLoanId;
-            this.exNo = exNo;
-        }
-
-        public ExtensionId() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof ExtensionId)) return false;
-            ExtensionId that = (ExtensionId) o;
-            return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(exLoanId, exNo);
-        }
-    }
-
-    @Entity(name = "Extension")
-    static class Extension {
-
-        @EmbeddedId
-        @AttributeOverride(name = "exNo", column = @Column(name="EX_NO"))
-        private ExtensionId id;
-
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
-
-        @ManyToOne
-        @MapsId("exLoanId")
-        @JoinColumn(name = "EX_LOAN_ID")
-        private Loan loan;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		ExtensionId eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			ExtensionId exid = new ExtensionId(loan.id, 1);
+			Extension extension = new Extension();
+			extension.id = exid;
+			extension.loan = loan;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			exid = new ExtensionId(loan.id, 2);
+			extension = new Extension();
+			extension.id = exid;
+			extension.loan = loan;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return exid;
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.id.exNo);
+			assertEquals(999L, extension.id.exLoanId);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.exLoanId);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.id.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.id.exLoanId);
+			assertEquals(loan, extension.loan);
+		});
+	}
+
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
+
+		private BigDecimal amount = BigDecimal.ZERO;
+
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
+
+	@Embeddable
+	public static class ExtensionId {
+
+		private Long exLoanId;
+
+		private int exNo;
+
+		public ExtensionId(Long exLoanId, int exNo) {
+			this.exLoanId = exLoanId;
+			this.exNo = exNo;
+		}
+
+		public ExtensionId() {
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof ExtensionId)) return false;
+			ExtensionId that = (ExtensionId) o;
+			return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(exLoanId, exNo);
+		}
+	}
+
+	@Entity(name = "Extension")
+	static class Extension {
+
+		@EmbeddedId
+		@AttributeOverride(name = "exNo", column = @Column(name="EX_NO"))
+		private ExtensionId id;
+
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
+
+		@ManyToOne
+		@MapsId("exLoanId")
+		@JoinColumn(name = "EX_LOAN_ID")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdClassTest.java
index b143f456caca..d6d65ad10292 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdClassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdTest.java
index 9394baaaea34..d25138e41e54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.CascadeType;
@@ -26,100 +30,100 @@
 @DomainModel(annotatedClasses = {MapsIdTest.Loan.class, MapsIdTest.Extension.class})
 public class MapsIdTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        ExtensionId eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            Extension extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 1;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 2;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return new ExtensionId(extension.exLoanId, extension.exNo );
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.exNo);
-            assertEquals(999L, extension.exLoanId);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.exLoanId);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.exLoanId);
-            assertEquals(loan, extension.loan);
-        });
-    }
-
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
-
-        private BigDecimal amount = BigDecimal.ZERO;
-
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
-
-    static class ExtensionId {
-        private Long exLoanId;
-        private int exNo;
-
-        public ExtensionId(Long exLoanId, int exNo) {
-            this.exLoanId = exLoanId;
-            this.exNo = exNo;
-        }
-
-        public ExtensionId() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof ExtensionId)) return false;
-            ExtensionId that = (ExtensionId) o;
-            return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(exLoanId, exNo);
-        }
-    }
-
-    @Entity(name = "Extension")
-    @IdClass(ExtensionId.class)
-    static class Extension {
-        @Id
-        private Long exLoanId;
-
-        @Id
-        @Column(name = "EX_NO")
-        private int exNo;
-
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
-
-        @ManyToOne
-        @MapsId("exLoanId")
-        @JoinColumn(name = "EX_LOAN_ID")
-        private Loan loan;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		ExtensionId eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			Extension extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 1;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 2;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return new ExtensionId(extension.exLoanId, extension.exNo );
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.exNo);
+			assertEquals(999L, extension.exLoanId);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.exLoanId);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.exLoanId);
+			assertEquals(loan, extension.loan);
+		});
+	}
+
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
+
+		private BigDecimal amount = BigDecimal.ZERO;
+
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
+
+	static class ExtensionId {
+		private Long exLoanId;
+		private int exNo;
+
+		public ExtensionId(Long exLoanId, int exNo) {
+			this.exLoanId = exLoanId;
+			this.exNo = exNo;
+		}
+
+		public ExtensionId() {
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof ExtensionId)) return false;
+			ExtensionId that = (ExtensionId) o;
+			return exNo == that.exNo && Objects.equals(exLoanId, that.exLoanId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(exLoanId, exNo);
+		}
+	}
+
+	@Entity(name = "Extension")
+	@IdClass(ExtensionId.class)
+	static class Extension {
+		@Id
+		private Long exLoanId;
+
+		@Id
+		@Column(name = "EX_NO")
+		private int exNo;
+
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
+
+		@ManyToOne
+		@MapsId("exLoanId")
+		@JoinColumn(name = "EX_LOAN_ID")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoIdClassMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoIdClassMapsIdTest.java
index d23566d197fc..7f2616e78129 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoIdClassMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoIdClassMapsIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.CascadeType;
@@ -24,74 +28,74 @@
 @DomainModel(annotatedClasses = {NoIdClassMapsIdTest.Loan.class, NoIdClassMapsIdTest.Extension.class})
 public class NoIdClassMapsIdTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        Extension eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            Extension extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 1;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            extension = new Extension();
-            extension.exLoanId = loan.id;
-            extension.loan = loan;
-            extension.exNo = 2;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return extension;
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.exNo);
-            assertEquals(999L, extension.exLoanId);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.exLoanId);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.exLoanId);
-            assertEquals(loan, extension.loan);
-        });
-    }
+	@Test void test(SessionFactoryScope scope) {
+		Extension eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			Extension extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 1;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			extension = new Extension();
+			extension.exLoanId = loan.id;
+			extension.loan = loan;
+			extension.exNo = 2;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return extension;
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.exNo);
+			assertEquals(999L, extension.exLoanId);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.exLoanId);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.exLoanId);
+			assertEquals(loan, extension.loan);
+		});
+	}
 
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
 
-        private BigDecimal amount = BigDecimal.ZERO;
+		private BigDecimal amount = BigDecimal.ZERO;
 
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
 
 
-    @Entity(name = "Extension")
-    static class Extension {
-        @Id
-        private Long exLoanId;
+	@Entity(name = "Extension")
+	static class Extension {
+		@Id
+		private Long exLoanId;
 
-        @Id
-        @Column(name = "EX_NO")
-        private int exNo;
+		@Id
+		@Column(name = "EX_NO")
+		private int exNo;
 
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
 
-        @ManyToOne
-        @MapsId("exLoanId")
-        @JoinColumn(name = "EX_LOAN_ID")
-        private Loan loan;
-    }
+		@ManyToOne
+		@MapsId("exLoanId")
+		@JoinColumn(name = "EX_LOAN_ID")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoMapsIdTest.java
index d899ecc75a0e..8ac05c9b5354 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/NoMapsIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.mapsid;
 
 import jakarta.persistence.CascadeType;
@@ -25,96 +29,96 @@
 @DomainModel(annotatedClasses = {NoMapsIdTest.Loan.class, NoMapsIdTest.Extension.class})
 public class NoMapsIdTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        ExtensionId eid = scope.fromTransaction( s -> {
-            Loan loan = new Loan();
-            loan.id = 999L;
-            Extension extension = new Extension();
-            extension.loan = loan;
-            extension.exNo = 1;
-            extension.exExtensionDays = 30;
-            loan.extensions.add(extension);
-            extension = new Extension();
-            extension.loan = loan;
-            extension.exNo = 2;
-            extension.exExtensionDays = 14;
-            loan.extensions.add(extension);
-            s.persist(loan);
-            return new ExtensionId(extension.loan.id, extension.exNo );
-        });
-        scope.inSession( s -> {
-            List extensions = s.createQuery("from Extension", Extension.class).getResultList();
-            assertEquals(2, extensions.size());
-        } );
-        scope.inSession( s -> {
-            Extension extension = s.find(Extension.class, eid);
-            assertEquals(14, extension.exExtensionDays);
-            assertEquals(2, extension.exNo);
-            assertEquals(999L, extension.loan.id);
-            assertNotNull( extension.loan );
-        });
-        scope.inSession( s -> {
-            Loan loan = s.find(Loan.class, eid.loan);
-            Extension extension = loan.extensions.get(0);
-            assertEquals(1, extension.exNo);
-            assertEquals(30, extension.exExtensionDays);
-            assertEquals(999L, extension.loan.id);
-            assertEquals(loan, extension.loan);
-        });
-    }
-
-    @Entity(name = "Loan")
-    static class Loan {
-        @Id
-        @Column(name = "LOAN_ID")
-        private Long id;
-
-        private BigDecimal amount = BigDecimal.ZERO;
-
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
-        private List extensions = new ArrayList<>();
-    }
-
-    static class ExtensionId {
-        private Long loan;
-        private int exNo;
-
-        public ExtensionId(Long loan, int exNo) {
-            this.loan = loan;
-            this.exNo = exNo;
-        }
-
-        public ExtensionId() {
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof ExtensionId)) return false;
-            ExtensionId that = (ExtensionId) o;
-            return exNo == that.exNo && Objects.equals(loan, that.loan);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(loan, exNo);
-        }
-    }
-
-    @Entity(name = "Extension")
-    @IdClass(ExtensionId.class)
-    static class Extension {
-
-        @Id
-        @Column(name = "EX_NO")
-        private int exNo;
-
-        @Column(name = "EX_EXTENSION_DAYS")
-        private int exExtensionDays;
-
-        @ManyToOne
-        @Id
-        @JoinColumn(name = "EX_LOAN_ID")
-        private Loan loan;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		ExtensionId eid = scope.fromTransaction( s -> {
+			Loan loan = new Loan();
+			loan.id = 999L;
+			Extension extension = new Extension();
+			extension.loan = loan;
+			extension.exNo = 1;
+			extension.exExtensionDays = 30;
+			loan.extensions.add(extension);
+			extension = new Extension();
+			extension.loan = loan;
+			extension.exNo = 2;
+			extension.exExtensionDays = 14;
+			loan.extensions.add(extension);
+			s.persist(loan);
+			return new ExtensionId(extension.loan.id, extension.exNo );
+		});
+		scope.inSession( s -> {
+			List extensions = s.createQuery("from Extension", Extension.class).getResultList();
+			assertEquals(2, extensions.size());
+		} );
+		scope.inSession( s -> {
+			Extension extension = s.find(Extension.class, eid);
+			assertEquals(14, extension.exExtensionDays);
+			assertEquals(2, extension.exNo);
+			assertEquals(999L, extension.loan.id);
+			assertNotNull( extension.loan );
+		});
+		scope.inSession( s -> {
+			Loan loan = s.find(Loan.class, eid.loan);
+			Extension extension = loan.extensions.get(0);
+			assertEquals(1, extension.exNo);
+			assertEquals(30, extension.exExtensionDays);
+			assertEquals(999L, extension.loan.id);
+			assertEquals(loan, extension.loan);
+		});
+	}
+
+	@Entity(name = "Loan")
+	static class Loan {
+		@Id
+		@Column(name = "LOAN_ID")
+		private Long id;
+
+		private BigDecimal amount = BigDecimal.ZERO;
+
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "loan")
+		private List extensions = new ArrayList<>();
+	}
+
+	static class ExtensionId {
+		private Long loan;
+		private int exNo;
+
+		public ExtensionId(Long loan, int exNo) {
+			this.loan = loan;
+			this.exNo = exNo;
+		}
+
+		public ExtensionId() {
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof ExtensionId)) return false;
+			ExtensionId that = (ExtensionId) o;
+			return exNo == that.exNo && Objects.equals(loan, that.loan);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(loan, exNo);
+		}
+	}
+
+	@Entity(name = "Extension")
+	@IdClass(ExtensionId.class)
+	static class Extension {
+
+		@Id
+		@Column(name = "EX_NO")
+		private int exNo;
+
+		@Column(name = "EX_EXTENSION_DAYS")
+		private int exExtensionDays;
+
+		@ManyToOne
+		@Id
+		@JoinColumn(name = "EX_LOAN_ID")
+		private Loan loan;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java
index c0f8fa6fd54a..88102dae4b10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.namingstrategy;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java
index f7f68a2caa19..7ce676a1412e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java
index ccfebe9e222d..e5f91b3e67ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.namingstrategy;
 import jakarta.persistence.Embeddable;
@@ -17,7 +15,7 @@ public class AddressEntry implements java.io.Serializable {
 	public AddressEntry() {
 	}
 
- 	public AddressEntry( String street, String city, String state, String zip) {
+	public AddressEntry( String street, String city, String state, String zip) {
 		this.street = street;
 		this.city = city;
 		this.state = state;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java
index 3191e2b56e82..b5d87aae685e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.namingstrategy;
 
 import org.hibernate.boot.Metadata;
@@ -122,4 +126,4 @@ public void setHello3d4(String hello3d4) {
 			this.hello3d4 = hello3d4;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java
index 4aa588946ad3..7b654c270d76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java
index 2249225e6204..f5703d840863 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
index 95af9c410ebe..49a33bdcdcfe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy;
 
 import jakarta.persistence.Entity;
@@ -43,17 +39,17 @@ public class LongKeyNamingStrategyTest extends BaseUnitTestCase {
 	private ServiceRegistry serviceRegistry;
 
 	@Before
-    public void setUp() {
+	public void setUp() {
 		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
 	}
 
 	@After
-    public void tearDown() {
-        if ( serviceRegistry != null ) {
+	public void tearDown() {
+		if ( serviceRegistry != null ) {
 			ServiceRegistryBuilder.destroy( serviceRegistry );
 		}
 	}
-    @Test
+	@Test
 	public void testWithCustomNamingStrategy() throws Exception {
 		Metadata metadata = new MetadataSources( serviceRegistry )
 				.addAnnotatedClass(Address.class)
@@ -66,10 +62,10 @@ public void testWithCustomNamingStrategy() throws Exception {
 				(org.hibernate.mapping.ForeignKey) metadata.getEntityBinding(Address.class.getName()).getTable().getForeignKeys().values().iterator().next();
 		assertEquals( "FK_way_longer_than_the_30_char", foreignKey.getName() );
 
-        UniqueKey uniqueKey = metadata.getEntityBinding(Address.class.getName()).getTable().getUniqueKeys().values().iterator().next();
+		UniqueKey uniqueKey = metadata.getEntityBinding(Address.class.getName()).getTable().getUniqueKeys().values().iterator().next();
 		assertEquals( "UK_way_longer_than_the_30_char", uniqueKey.getName() );
 
-        org.hibernate.mapping.Index index = metadata.getEntityBinding(Address.class.getName()).getTable().getIndexes().values().iterator().next();
+		org.hibernate.mapping.Index index = metadata.getEntityBinding(Address.class.getName()).getTable().getIndexes().values().iterator().next();
 		assertEquals( "IDX_way_longer_than_the_30_cha", index.getName() );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java
index e3a973b84de2..ec88344994f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy;
 
 import java.util.Locale;
@@ -39,18 +35,18 @@ public class NamingStrategyTest extends BaseUnitTestCase {
 	private ServiceRegistry serviceRegistry;
 
 	@Before
-    public void setUp() {
+	public void setUp() {
 		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
 	}
 
 	@After
-    public void tearDown() {
-        if ( serviceRegistry != null ) {
+	public void tearDown() {
+		if ( serviceRegistry != null ) {
 			ServiceRegistryBuilder.destroy( serviceRegistry );
 		}
 	}
 
-    @Test
+	@Test
 	public void testWithCustomNamingStrategy() throws Exception {
 		new MetadataSources( serviceRegistry )
 				.addAnnotatedClass(Address.class)
@@ -76,12 +72,12 @@ public Identifier toPhysicalColumnName(
 
 		PersistentClass entityBinding = metadata.getEntityBinding( A.class.getName() );
 		assertEquals("NAME",
-					 ((Selectable) entityBinding.getProperty( "name" ).getSelectables().get( 0 ) ).getText());
+					((Selectable) entityBinding.getProperty( "name" ).getSelectables().get( 0 ) ).getText());
 		assertEquals("VALUE",
-					 ((Selectable) entityBinding.getProperty( "value" ).getSelectables().get( 0 ) ).getText());
+					((Selectable) entityBinding.getProperty( "value" ).getSelectables().get( 0 ) ).getText());
 	}
 
-    @Test
+	@Test
 	public void testWithJpaCompliantNamingStrategy() throws Exception {
 		Metadata metadata = new MetadataSources( serviceRegistry )
 				.addAnnotatedClass( A.class )
@@ -98,7 +94,7 @@ public void testWithJpaCompliantNamingStrategy() throws Exception {
 		);
 	}
 
-    @Test
+	@Test
 	public void testWithoutCustomNamingStrategy() throws Exception {
 		new MetadataSources( serviceRegistry )
 				.addAnnotatedClass( Address.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java
index 7467a1b29f7b..a604fe4a872b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
index e11f4b08b877..3a0b225afb35 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy.charset;
 
 import java.util.Map;
@@ -43,7 +39,7 @@ public abstract class AbstractCharsetNamingStrategyTest extends BaseUnitTestCase
 	protected ServiceRegistry serviceRegistry;
 
 	@Before
-    public void setUp() {
+	public void setUp() {
 		Map properties = PropertiesHelper.map( Environment.getProperties() );
 		properties.put( AvailableSettings.HBM2DDL_CHARSET_NAME, charsetName() );
 		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( properties );
@@ -52,12 +48,12 @@ public void setUp() {
 	protected abstract String charsetName();
 
 	@After
-    public void tearDown() {
-        if ( serviceRegistry != null ) {
+	public void tearDown() {
+		if ( serviceRegistry != null ) {
 			ServiceRegistryBuilder.destroy( serviceRegistry );
 		}
 	}
-    @Test
+	@Test
 	public void testWithCustomNamingStrategy() throws Exception {
 		Metadata metadata = new MetadataSources( serviceRegistry )
 				.addAnnotatedClass(Address.class)
@@ -66,14 +62,14 @@ public void testWithCustomNamingStrategy() throws Exception {
 				.applyImplicitNamingStrategy( new LongIdentifierNamingStrategy() )
 				.build();
 
-        UniqueKey uniqueKey = metadata.getEntityBinding(Address.class.getName()).getTable().getUniqueKeys().values().iterator().next();
+		UniqueKey uniqueKey = metadata.getEntityBinding(Address.class.getName()).getTable().getUniqueKeys().values().iterator().next();
 		assertEquals( expectedUniqueKeyName(), uniqueKey.getName() );
 
 		org.hibernate.mapping.ForeignKey foreignKey =
 				(org.hibernate.mapping.ForeignKey) metadata.getEntityBinding(Address.class.getName()).getTable().getForeignKeys().values().iterator().next();
 		assertEquals( expectedForeignKeyName(), foreignKey.getName() );
 
-        org.hibernate.mapping.Index index = metadata.getEntityBinding(Address.class.getName()).getTable().getIndexes().values().iterator().next();
+		org.hibernate.mapping.Index index = metadata.getEntityBinding(Address.class.getName()).getTable().getIndexes().values().iterator().next();
 		assertEquals( expectedIndexName(), index.getName() );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java
index 52ab0c9d35c7..e1300a3a3302 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy.charset;
 
 import org.hibernate.dialect.HANADialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java
index ad6768159e56..464c7cf21e5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.namingstrategy.charset;
 
 import org.hibernate.dialect.HANADialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java
index ee14e7246df5..52a0da404b72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java
index 9b362bf8b8cf..616c043d14d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.naturalid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java
index 3b7eab2c4fd0..1579e8f38c0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java
index dbb7fafd7daa..a25253b4b3e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 
@@ -42,14 +40,14 @@ public void testSimpleImmutableNaturalKeyLookup() {
 		a1.setName( "name1" );
 		s.persist( a1 );
 		newTx.commit();
-		
+
 		newTx = s.beginTransaction();
 		fetchA( s ); // put query-result into cache
 		A a2 = new A();
 		a2.setName( "xxxxxx" );
 		s.persist( a2 );
 		newTx.commit();	  // Invalidates space A in UpdateTimeStamps region
-		
+
 		//Create new session to avoid the session cache which can't be tracked
 		s.close();
 		s = openSession();
@@ -148,7 +146,7 @@ public void testCriteriaWithFetchModeJoinCollection() {
 		a2.setName( "xxxxxx" );
 		s.persist( a2 );
 		newTx.commit();	  // Invalidates space A in UpdateTimeStamps region
-		
+
 		//Create new session to avoid the session cache which can't be tracked
 		s.close();
 		s = openSession();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java
index b87e1b97b3d3..6a2c075bcf5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.naturalid;
 
 import java.math.BigDecimal;
@@ -10,7 +14,6 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java
index eb937a4a684a..9397687b95e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 import jakarta.persistence.Entity;
@@ -17,20 +15,20 @@
 @NaturalIdCache
 /**
  * Test case for NaturalId annotation - ANN-750
- * 
+ *
  * @author Emmanuel Bernard
  * @author Hardy Ferentschik
  */
 class NaturalIdOnManyToOne {
 
-    @Id
-    @GeneratedValue
-    int id;
+	@Id
+	@GeneratedValue
+	int id;
+
+	@NaturalId
+	@ManyToOne
+	Citizen citizen;
 
-    @NaturalId
-    @ManyToOne
-    Citizen citizen;
-    
 	public int getId() {
 		return id;
 	}
@@ -46,4 +44,4 @@ public Citizen getCitizen() {
 	public void setCitizen(Citizen citizen) {
 		this.citizen = citizen;
 	}
-} 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
index 5e5acb217800..4b9ed275f50c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java
index f1a1514e9abd..db1459ed7af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid;
 
@@ -69,7 +67,7 @@ public void testMappingProperties() {
 	@Test
 	public void testNaturalIdCached() {
 		saveSomeCitizens();
-		
+
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		State france = this.getState( s, "Ile de France" );
@@ -192,22 +190,22 @@ public void testNaturalIdLoaderCached() {
 		Statistics stats = sessionFactory().getStatistics();
 		stats.setStatisticsEnabled( true );
 		stats.clear();
-		
+
 		assertEquals( "NaturalId Cache Hits", 0, stats.getNaturalIdCacheHitCount() );
 		assertEquals( "NaturalId Cache Misses", 0, stats.getNaturalIdCacheMissCount() );
 		assertEquals( "NaturalId Cache Puts", 0, stats.getNaturalIdCachePutCount() );
 		assertEquals( "NaturalId Cache Queries", 0, stats.getNaturalIdQueryExecutionCount() );
 
 		saveSomeCitizens();
-		
+
 		assertEquals( "NaturalId Cache Hits", 0, stats.getNaturalIdCacheHitCount() );
 		assertEquals( "NaturalId Cache Misses", 0, stats.getNaturalIdCacheMissCount() );
 		assertEquals( "NaturalId Cache Puts", 2, stats.getNaturalIdCachePutCount() );
 		assertEquals( "NaturalId Cache Queries", 0, stats.getNaturalIdQueryExecutionCount() );
 
-		
+
 		//Try NaturalIdLoadAccess after insert
-		
+
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		State france = this.getState( s, "Ile de France" );
@@ -228,8 +226,8 @@ public void testNaturalIdLoaderCached() {
 		// cleanup
 		tx.rollback();
 		s.close();
-		
-		
+
+
 		//Try NaturalIdLoadAccess
 
 		s = openSession();
@@ -251,9 +249,9 @@ public void testNaturalIdLoaderCached() {
 		tx.rollback();
 		s.close();
 
-		
+
 		//Try NaturalIdLoadAccess after load
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
 		france = this.getState( s, "Ile de France" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java
index 37d5f563efd1..373cd1b0c2fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.naturalid;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java
index 3991ea175e53..5d29cf4e1cdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.naturalid;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java
index dee3ee4da608..0c6213411925 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid.cid;
 
@@ -16,22 +14,22 @@
  */
 @Entity
 public class A {
-    @EmbeddedId
-    private AId accountId;
-    @NaturalId(mutable = false)
-    private String shortCode;
-    
-    protected A() {
-    }
-    
-    public A(AId accountId, String shortCode) {
-        this.accountId = accountId;
-        this.shortCode = shortCode;
-    }
-    public String getShortCode() {
-        return shortCode;
-    }
-    public AId getAccountId() {
-        return accountId;
-    }
+	@EmbeddedId
+	private AId accountId;
+	@NaturalId(mutable = false)
+	private String shortCode;
+
+	protected A() {
+	}
+
+	public A(AId accountId, String shortCode) {
+		this.accountId = accountId;
+		this.shortCode = shortCode;
+	}
+	public String getShortCode() {
+		return shortCode;
+	}
+	public AId getAccountId() {
+		return accountId;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java
index 96c13e8328c3..b3907ddb634a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid.cid;
 
@@ -14,34 +12,33 @@
 
 @Embeddable
 public class AId implements java.io.Serializable {
-    private final int id;
+	private final int id;
 
-    protected AId() {
-        this.id = 0;
-    }
-    
-    public AId(int id) {
-        this.id = id;
-    }
-    public int intValue() {
-        return id;
-    }
-    @Override
-    public int hashCode() {
-        return id;
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AId other = (AId) obj;
-        if (other != null && id != other.id)
-            return false;
-        return true;
-    }
-}
+	protected AId() {
+		this.id = 0;
+	}
 
+	public AId(int id) {
+		this.id = id;
+	}
+	public int intValue() {
+		return id;
+	}
+	@Override
+	public int hashCode() {
+		return id;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AId other = (AId) obj;
+		if (other != null && id != other.id)
+			return false;
+		return true;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java
index 1978002277da..22de8815eeff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.naturalid.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java
index bca29dfb953d..b01e944b26e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -26,18 +24,18 @@ public class A {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Id
 	Long id;
-	
+
 
 	@NotNull
 	String name;
-	
-    @OneToMany( cascade = CascadeType.ALL)
-    @Cascade(org.hibernate.annotations.CascadeType.ALL)
+
+	@OneToMany( cascade = CascadeType.ALL)
+	@Cascade(org.hibernate.annotations.CascadeType.ALL)
 	@OrderBy("name")
 	java.util.List bs = new ArrayList();
-	
 
-	
+
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java
index 01e3c56eae58..3c938d7ffab2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java
index 711f3c75f722..4a1c6dbf0b13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -28,12 +26,12 @@ public class B {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Id
 	Long id;
-	
+
 	@NotNull
-	String name;	
-	
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @Cascade(org.hibernate.annotations.CascadeType.ALL)
+	String name;
+
+	@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@Cascade(org.hibernate.annotations.CascadeType.ALL)
 	@OrderBy("name")
 	java.util.List cs = new ArrayList();
 
@@ -52,7 +50,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 
 	public java.util.List getCs() {
 		return cs;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java
index 1bd56cd6dc76..f9419b432574 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java
index d0acab63f388..b285997428f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java
index c146e3757e55..10714c4de3e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -20,9 +18,9 @@ public class C {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Id
 	Long id;
-	
+
 	@NotNull
-	String name;	
+	String name;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java
index 47ef70c59034..de6fe3051e0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java
index 30529dd6680a..6707a733d94d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java
index cdb66474fde0..fec70f74f583 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -25,12 +23,12 @@
 @DiscriminatorColumn(name = "DTYPE", discriminatorType= DiscriminatorType.STRING, length = 3)
 @DiscriminatorValue(value = "WPT")
 public class Comment {
-	
+
 	private Long id;
 	private Post post;
 	private String name;
 	private Forum forum;
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id", updatable = false, insertable = false)
@@ -41,7 +39,7 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@ManyToOne(optional=true,fetch=FetchType.LAZY)
 	@JoinColumn(name="FK_PostId", nullable=true, insertable=true,updatable=false)
 	public Post getPost() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java
index 80ff9746430f..7fd84ac9fd57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java
index 4530ae710338..25d122336d0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java
index 0eca7408cf10..f6be4fc5676a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java
index 965df53d80fa..84ebc30254aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -26,7 +24,7 @@ public class Forum{
 	private String name;
 	protected List posts = new ArrayList<>();
 	protected List users = new ArrayList<>();
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id", updatable = false, insertable = false)
@@ -37,7 +35,7 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@OneToMany(mappedBy = "forum", cascade = CascadeType.ALL , orphanRemoval = false, fetch = FetchType.LAZY)
 	@OrderColumn(name = "idx2")
 	public List getPosts() {
@@ -47,7 +45,7 @@ public List getPosts() {
 	public void setPosts(List children) {
 		this.posts = children;
 	}
-	
+
 	@OneToMany(mappedBy = "forum", cascade = CascadeType.ALL , orphanRemoval = true, fetch = FetchType.LAZY)
 	@OrderColumn(name = "idx3")
 	public List getUsers() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java
index a2db5f4950e7..50c796f712d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java
index 0f1fd0073752..55d98b613bb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java
index ef3ee000420c..8ad89aa969cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java
index 10c0c48fa117..f4c1273dbb7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinColumnsUniquenessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinColumnsUniquenessTest.java
index b00d6a26b67b..a77c17ae2437 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinColumnsUniquenessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinColumnsUniquenessTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetomany;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyNonPrimaryKeyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyNonPrimaryKeyJoinTest.java
index af52605ea593..1d55172ef935 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyNonPrimaryKeyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyNonPrimaryKeyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -222,4 +220,4 @@ private void setParent(final Parent parent) {
 			this.parent = parent;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
index 3c273aded2cc..ba43e2f00814 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -531,7 +529,7 @@ public void testOrderByOnSuperclassProperty() {
 	public void testJoinColumnConfiguredInXml() {
 		PersistentClass pc = metadata().getEntityBinding( Model.class.getName() );
 		Table table = pc.getRootTable();
-        Iterator iter = table.getColumns().iterator();
+		Iterator iter = table.getColumns().iterator();
 		boolean joinColumnFound = false;
 		while(iter.hasNext()) {
 			Column column = (Column) iter.next();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java
index 0640fae78127..e6b027336398 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java
index 7b30152fecd2..3d3c73b82b44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -284,11 +282,11 @@ public void testOrderByReferencingFormulaColumn() {
 
 		session.close();
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-5732")
 	public void testInverseIndex() {
-        final CollectionPersister transactionsPersister = sessionFactory().getRuntimeMetamodels()
+		final CollectionPersister transactionsPersister = sessionFactory().getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getCollectionDescriptor( BankAccount.class.getName() + ".transactions" );
 		assertTrue( transactionsPersister.isInverse() );
@@ -307,7 +305,7 @@ public void testInverseIndex() {
 
 		s = openSession();
 		s.getTransaction().begin();
-		
+
 		try {
 			SimpleSelect select = new SimpleSelect( sessionFactory() )
 					.setTableName( transactionsPersister.getTableName() )
@@ -337,7 +335,7 @@ public void testInverseIndex() {
 			s.close();
 		}
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-8083" )
 	public void testInverseIndexCascaded() {
@@ -395,7 +393,7 @@ public void testInverseIndexCascaded() {
 		Hibernate.initialize( forum.getUsers() );
 		assertEquals( 1, forum.getUsers().size() );
 	}
-  
+
 	@Test
 	@JiraKey(value = "HHH-8794")
 	public void testOrderByNoElement() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java
index 1d79e4af23c7..1fcaff21ba7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java
index 09ed31fea5f0..2802eacb6b02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java
index cdd02bc359dc..b5a249e64d3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java
index 80edefadd704..1e64ac82aa7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java
index 6bc80e6ba58e..97f1763933ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java
index c1684b1c022e..88ff78ae3e91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java
index d054f5f2d2b1..39531d105b80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java
index b588616e074a..d42a9f9812bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.io.Serializable;
 import jakarta.persistence.Column;
@@ -58,4 +54,3 @@ public String getLastName() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java
index f0f026ae5d7f..64e71c4b249b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java
index ad7e89c1fd8b..9d806491f4ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java
index 666283f4d0a6..5aefd4149f2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java
index 29248b0d701c..d17483cb4109 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java
index 2d1eede5893b..ec6d49629c10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java
index 38b0f086de4b..fdf2288f5a68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java
index 5fbe98d3f326..d2ac6081d1dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java
index b37f2765a3c2..3b5b63c6517a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -20,13 +18,13 @@
 // "Transaction" reserved in some Dialects
 @Table( name = "BankTransaction" )
 public class Transaction {
-	
+
 	@Id
 	@GeneratedValue
 	private long id;
-	
+
 	private String code;
-	
+
 	@ManyToOne( cascade = { CascadeType.ALL } )
 	private BankAccount account;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java
index 216cc4a6de21..aae91c07d541 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetomany;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java
index 69af57f8dfbd..f943ae58f4c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
@@ -20,7 +18,7 @@ public class User {
 	private Long id;
 	private String name;
 	private Forum forum;
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id", updatable = false, insertable = false)
@@ -30,7 +28,7 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@Column
 	public String getName() {
 		return name;
@@ -38,7 +36,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@ManyToOne(optional=false,fetch=FetchType.LAZY)
 	@JoinColumn(name="FK_ForumId", nullable=false, insertable=true,updatable=false)
 	public Forum getForum() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java
index 823b06cf7d86..1dc6b6ca7f4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java
index a409d5dd3342..db9654eb3d73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/Department.java
index 704947645732..2769587fee0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/Department.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetomany.orderby;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/DepartmentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/DepartmentId.java
index 0d69724811d3..4aebf47b882a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/DepartmentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/DepartmentId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetomany.orderby;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/ECompany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/ECompany.java
index 66f94b8c5ae2..889022ea8770 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/ECompany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/ECompany.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetomany.orderby;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/IdClassAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/IdClassAndOrderByTest.java
index f0444b788423..8d7e4bca4de1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/IdClassAndOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/orderby/IdClassAndOrderByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetomany.orderby;
 
 import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java
index dea596aa5802..9f10f8f03442 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java
index 77ea15a9dae5..cbee265ef4dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java
index a31c85c619c0..157d68a1733a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java
index 1125241fdaaf..4e6e92a2884c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java
index a6e753ad94d3..157217602069 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/EmbeddedIdTest.java
index 3ded15db6707..292abfbbdfae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/EmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/EmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java
index f6199c268b1e..48a40e64ef07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.onetoone;
 
 
@@ -17,7 +12,7 @@ public class Father {
 	private int id;
 
 	private String name;
-	
+
 	public int getId() {
 		return id;
 	}
@@ -34,5 +29,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java
index 6bfe99faf170..8cad90991c67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/JoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/JoinColumnTest.java
index b83a31a9fe1a..8d1bc2ec806c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/JoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/JoinColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetoone;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneInXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneInXmlTests.java
index 0d89c44d0c46..1389623111d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneInXmlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneInXmlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java
index b6f9b6d4c600..69f38a080634 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java
index 726f821fce97..9d36bdb8cd6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
@@ -421,7 +419,7 @@ public void testDereferenceOneToOne() {
 			assertEquals( "C3", resultList.get( 0 ).getName() );
 		} );
 	}
-	
+
 	@Override
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java
index 7ab5a1c1dbf9..0e3ac2ac131f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java
index 0c51a886e774..521d506899ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java
index 94a86456e133..e2b7b28720e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java
index 81aff649be73..cb52b8a34a4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java
index c53d7e135324..1a4676936e65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.onetoone;
 
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java
index 03f59c196b31..8f9a7a2a18b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java
index a08d231e1e18..7d01c9ea02cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java
index f1470ddd63b8..709badf4d617 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java
index 48695cda605d..1d8d2f9c834a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java
index 313197f70baa..301ea72efe24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java
index 24b5c87c3651..c77ab52994a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java
index 1e3b4391fc94..c93bac613264 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 
 import jakarta.persistence.Column;
@@ -44,7 +40,7 @@ public void setId(SerialNumberPk id) {
 		this.id = id;
 	}
 
-    @Column(name="`value`")
+	@Column(name="`value`")
 	public String getValue() {
 		return value;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java
index d691d6e3dfdb..94d6dc119f4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java
index 9a886b8f3693..fcc36ae45e88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java
index f471acf3c31b..e530076e0fae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java
index 6e369eb72f61..0f60f9a1af0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.annotations.onetoone;
 
 
@@ -44,5 +39,3 @@ public void setFather(Father father) {
 		this.father = father;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java
index eca6d01776c3..9b9cdf8f96ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java
index fec0918dba9b..12d7f3fb8ab1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.onetoone;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java
index a5c89084e232..9a52bb1e946d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.FetchType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java
index 0b05833551b9..a0e9f306d6df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
index 891e2c4f763c..24e831801dbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java
index 5dc66ac80271..4a12250f5a8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java
index d6ad5c2f24b6..d2cddd3a4ea6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.DiscriminatorColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java
index df528e84b588..b1a126aaef3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java
index bbddf90f37cf..bee7b0da38e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.onetoone.hhh4851;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java
index b06120cf0948..2adfd0007bc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.override.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java
index 3c58d4e32c38..d231f4012fba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.override.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java
index d94fc3ef8895..f8b0cf630b73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.override.mappedsuperclass;
 
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java
index 661b676ef1f1..a5fb0004fa77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.override.mappedsuperclass;
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java
index 9506065ad1a1..8515c0ebe8d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.override.mappedsuperclass;
 
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java
index 7d95b6065dca..5d4c4da79349 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.override.mappedsuperclass;
 
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/AllTables.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/AllTables.java
index b4218de5d4ab..ace04d628890 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/AllTables.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/AllTables.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Column;
@@ -23,7 +21,7 @@
 						@FieldResult(name = "tableName", column = "t_name"),
 						@FieldResult(name = "daysOld", column = "t_time")
 				}))
- public class AllTables {
+public class AllTables {
 
 	@Id
 	@Column(name = "table_name", nullable = false)
@@ -48,4 +46,4 @@ public String getDaysOld() {
 	public void setDaysOld(String daysOld) {
 		this.daysOld = daysOld;
 	}
- }
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Area.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Area.java
index 601865866fb9..202073476e3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Area.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Area.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrset.java
index 649d1ce14fe7..458717c1152a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrset.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrset.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
@@ -20,7 +18,7 @@ public class Attrset {
 	@Id
 	@GeneratedValue
 	private Long id;
-	
+
 	@OneToMany
 	@JoinTable(name = "ATTRSET_X_ATTRVALUE")
 	private Set attrvalues = new HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrvalue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrvalue.java
index 1567647f6132..109de4bc677c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrvalue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Attrvalue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
@@ -13,12 +11,12 @@
 
 @Entity
 public class Attrvalue {
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
 	@Column(name = "val")
-    private String value;
+	private String value;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Captain.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Captain.java
index 7cb9d86a4dce..a59ce4ca7c71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Captain.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Captain.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import java.io.Serializable;
 import jakarta.persistence.ColumnResult;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/CasimirParticle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/CasimirParticle.java
index 3c885d5ceaab..0495eb715285 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/CasimirParticle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/CasimirParticle.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Chaos.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Chaos.java
index c17d03b88a9e..ba2daeb5c020 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Chaos.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Chaos.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Darkness.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Darkness.java
index cfcafb7b642c..da6ef75f1c81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Darkness.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Darkness.java
@@ -1,17 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $
-
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.MappedSuperclass;
 
 @org.hibernate.annotations.NamedQuery(
-		name = "night.olderThan", 
+		name = "night.olderThan",
 		query = "select n from Night n where n.date <= :date"
 )
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
index 40066fb72d5b..3a0b06e27052 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dimensions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dimensions.java
index c326008958ab..831f261a2380 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dimensions.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dimensions.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Embeddable;
 
@@ -14,7 +10,7 @@
  */
 @Embeddable
 public class Dimensions {
-	
+
 
 	private int length;
 	private int width;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employee.java
index 9e41123d42d4..aec0fa440860 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
@@ -13,15 +11,15 @@
 
 @Entity
 public class Employee {
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @ManyToOne
-    private Employeegroup employeegroup;
+	@ManyToOne
+	private Employeegroup employeegroup;
 
-    @ManyToOne
-    private Attrset attrset;
+	@ManyToOne
+	private Attrset attrset;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employeegroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employeegroup.java
index c365e5af108f..9bd2d4d5fd6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employeegroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Employeegroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
@@ -18,15 +16,15 @@
 
 @Entity
 public class Employeegroup {
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "employeegroup")
-    private List employees = new ArrayList();
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "employeegroup")
+	private List employees = new ArrayList();
 
-    @ManyToOne
-    private Attrset attrset;
+	@ManyToOne
+	private Attrset attrset;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Identity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Identity.java
index 4c827517594d..9176ecb4a698 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Identity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Identity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Mark.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Mark.java
index e72bc2570db6..9021c6c51f9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Mark.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Mark.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.ColumnResult;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java
index 2bc390db72cb..6d2f8a084843 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Night.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Night.java
index c84f838d8fe9..f4c6403ec57a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Night.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Night.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import java.util.Date;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
index cbf0b93e3393..e9b14b1ea584 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.annotations.query;
 
 import java.util.Calendar;
@@ -94,7 +89,7 @@ public String getSetting() {
 
 	@Test
 	public void testNativeQueryWithFormulaAttribute(SessionFactoryScope scope) {
-        final String dateFunctionRendered = scope.getSessionFactory().getJdbcServices().getDialect()
+		final String dateFunctionRendered = scope.getSessionFactory().getJdbcServices().getDialect()
 				.currentDate();
 
 		String sql = String.format(
@@ -128,7 +123,7 @@ public void testNativeQueryWithFormulaAttribute(SessionFactoryScope scope) {
 	public void testNativeQueryWithFormulaAttributeWithoutAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-                    String sql = "select table_name , " + scope.getSessionFactory().getJdbcServices().getDialect()
+					String sql = "select table_name , " + scope.getSessionFactory().getJdbcServices().getDialect()
 							.currentDate() + " as days_old from ALL_TABLES  where table_name = 'AUDIT_ACTIONS' ";
 					session.createNativeQuery( sql ).addEntity( "t", AllTables.class ).list();
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
index b5514aee3e61..2f8ab5b592d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SpaceShip.java
index 596a0e19ef10..23bfb296a608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SpaceShip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SpaceShip.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityResult;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SynonymousDictionary.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SynonymousDictionary.java
index 4dfd002b304e..47e1870c9f84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SynonymousDictionary.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/SynonymousDictionary.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Twilight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Twilight.java
index cdf21f0fa752..879c4c3115dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Twilight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Twilight.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $
-
 package org.hibernate.orm.test.annotations.query;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -19,7 +14,7 @@
 public class Twilight extends Darkness {
 
 	private int id;
-	
+
 	@Id
 	@GeneratedValue
 	public Integer getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
index 70378f89c878..fb4d822b2262 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.quote.resultsetmappings;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java
index be60ac799bb0..3f75e96cd45c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.quote.resultsetmappings;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/BasicsRefColNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/BasicsRefColNamesTest.java
index c3470f4c5878..b671408de920 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/BasicsRefColNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/BasicsRefColNamesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.basics;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -9,28 +13,28 @@
 @DomainModel(annotatedClasses = {Region.class, Town.class})
 @SessionFactory
 public class BasicsRefColNamesTest {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Region region = new Region();
-        PostalCode postalCode = new PostalCode();
-        postalCode.countryCode = "ES";
-        postalCode.zipCode = 69;
-        region.countryCode = postalCode.countryCode;
-        region.zipCode = postalCode.zipCode;
-        Town town = new Town();
-        TownCode townCode = new TownCode();
-        townCode.town = "Barcelona";
-        townCode.countryCode = "ES";
-        townCode.zipCode = 69;
-        town.region = region;
-        town.townCode = townCode;
-        scope.inTransaction(s -> {
-            s.persist(region);
-            s.persist(town);
-        });
-        scope.inTransaction(s -> {
-            Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
-            Assertions.assertNotNull(t);
-        });
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Region region = new Region();
+		PostalCode postalCode = new PostalCode();
+		postalCode.countryCode = "ES";
+		postalCode.zipCode = 69;
+		region.countryCode = postalCode.countryCode;
+		region.zipCode = postalCode.zipCode;
+		Town town = new Town();
+		TownCode townCode = new TownCode();
+		townCode.town = "Barcelona";
+		townCode.countryCode = "ES";
+		townCode.zipCode = 69;
+		town.region = region;
+		town.townCode = townCode;
+		scope.inTransaction(s -> {
+			s.persist(region);
+			s.persist(town);
+		});
+		scope.inTransaction(s -> {
+			Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
+			Assertions.assertNotNull(t);
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/PostalCode.java
index 3df9501fdbbc..b7f19f4857c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/PostalCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/PostalCode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.basics;
 
 import jakarta.persistence.Column;
@@ -6,8 +10,8 @@
 
 @Embeddable @MappedSuperclass
 class PostalCode {
-    @Column(name="country_code", nullable = false)
-    String countryCode;
-    @Column(name="zip_code", nullable = false)
-    int zipCode;
-}
\ No newline at end of file
+	@Column(name="country_code", nullable = false)
+	String countryCode;
+	@Column(name="zip_code", nullable = false)
+	int zipCode;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Region.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Region.java
index 533ac25475b6..f22febdbde1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Region.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Region.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.basics;
 
 import jakarta.persistence.Column;
@@ -10,19 +14,19 @@
 @Entity
 class Region {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    int id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	int id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Column(name = "country_code", nullable = false)
-    String countryCode;
+	@NaturalId
+	@Column(name = "country_code", nullable = false)
+	String countryCode;
 
-    @NaturalId
-    @Column(name = "zip_code", nullable = false)
-    int zipCode;
+	@NaturalId
+	@Column(name = "zip_code", nullable = false)
+	int zipCode;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Town.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Town.java
index f0e54ec3fced..769c83108256 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Town.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/Town.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.basics;
 
 import jakarta.persistence.Column;
@@ -13,19 +17,19 @@
 @Entity
 class Town {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    Integer id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	Integer id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Embedded
-    TownCode townCode;
+	@NaturalId
+	@Embedded
+	TownCode townCode;
 
-    @ManyToOne
-    @JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
-    @JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
-    Region region;
-}
\ No newline at end of file
+	@ManyToOne
+	@JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
+	@JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
+	Region region;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/TownCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/TownCode.java
index 86f6c3f7abb4..ed24c6620cab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/TownCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/basics/TownCode.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.basics;
 
 import jakarta.persistence.Embeddable;
 
 @Embeddable
 class TownCode extends PostalCode {
-    String town;
-}
\ No newline at end of file
+	String town;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/EmbeddedRefColNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/EmbeddedRefColNamesTest.java
index 1e9430e047bf..77dfd1870194 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/EmbeddedRefColNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/EmbeddedRefColNamesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embedded;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -9,27 +13,27 @@
 @DomainModel(annotatedClasses = {Region.class, Town.class})
 @SessionFactory
 public class EmbeddedRefColNamesTest {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Region region = new Region();
-        PostalCode postalCode = new PostalCode();
-        postalCode.countryCode = "ES";
-        postalCode.zipCode = 69;
-        region.postalCode = postalCode;
-        Town town = new Town();
-        TownCode townCode = new TownCode();
-        townCode.town = "Barcelona";
-        townCode.countryCode = "ES";
-        townCode.zipCode = 69;
-        town.region = region;
-        town.townCode = townCode;
-        scope.inTransaction(s -> {
-            s.persist(region);
-            s.persist(town);
-        });
-        scope.inTransaction(s -> {
-            Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
-            Assertions.assertNotNull(t);
-        });
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Region region = new Region();
+		PostalCode postalCode = new PostalCode();
+		postalCode.countryCode = "ES";
+		postalCode.zipCode = 69;
+		region.postalCode = postalCode;
+		Town town = new Town();
+		TownCode townCode = new TownCode();
+		townCode.town = "Barcelona";
+		townCode.countryCode = "ES";
+		townCode.zipCode = 69;
+		town.region = region;
+		town.townCode = townCode;
+		scope.inTransaction(s -> {
+			s.persist(region);
+			s.persist(town);
+		});
+		scope.inTransaction(s -> {
+			Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
+			Assertions.assertNotNull(t);
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/PostalCode.java
index e0e8593c892c..37f0e3a899fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/PostalCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/PostalCode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embedded;
 
 import jakarta.persistence.Column;
@@ -6,8 +10,8 @@
 
 @Embeddable @MappedSuperclass
 class PostalCode {
-    @Column(name="country_code", nullable = false)
-    String countryCode;
-    @Column(name="zip_code", nullable = false)
-    int zipCode;
-}
\ No newline at end of file
+	@Column(name="country_code", nullable = false)
+	String countryCode;
+	@Column(name="zip_code", nullable = false)
+	int zipCode;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Region.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Region.java
index 7fd533476798..2c7a7b9f60a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Region.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Region.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embedded;
 
 import jakarta.persistence.Column;
@@ -11,15 +15,15 @@
 @Entity
 class Region {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    int id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	int id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Embedded
-    PostalCode postalCode;
+	@NaturalId
+	@Embedded
+	PostalCode postalCode;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Town.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Town.java
index b9d06a29efd2..7e772a2b96f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Town.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/Town.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embedded;
 
 import jakarta.persistence.Column;
@@ -13,19 +17,19 @@
 @Entity
 class Town {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    Integer id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	Integer id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Embedded
-    TownCode townCode;
+	@NaturalId
+	@Embedded
+	TownCode townCode;
 
-    @ManyToOne
-    @JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
-    @JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
-    Region region;
-}
\ No newline at end of file
+	@ManyToOne
+	@JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
+	@JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
+	Region region;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/TownCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/TownCode.java
index e1431f0e3ddb..31f5ded18d27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/TownCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embedded/TownCode.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embedded;
 
 import jakarta.persistence.Embeddable;
 
 @Embeddable
 class TownCode extends PostalCode {
-    String town;
-}
\ No newline at end of file
+	String town;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/EmbeddedIdRefColNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/EmbeddedIdRefColNamesTest.java
index eee941e20d2b..f33c8b4ad6cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/EmbeddedIdRefColNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/EmbeddedIdRefColNamesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embeddedid;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -9,27 +13,27 @@
 @DomainModel(annotatedClasses = {Region.class, Town.class})
 @SessionFactory
 public class EmbeddedIdRefColNamesTest {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Region region = new Region();
-        PostalCode postalCode = new PostalCode();
-        postalCode.countryCode = "ES";
-        postalCode.zipCode = 69;
-        region.postalCode = postalCode;
-        Town town = new Town();
-        TownCode townCode = new TownCode();
-        townCode.town = "Barcelona";
-        townCode.countryCode = "ES";
-        townCode.zipCode = 69;
-        town.region = region;
-        town.townCode = townCode;
-        scope.inTransaction(s -> {
-            s.persist(region);
-            s.persist(town);
-        });
-        scope.inTransaction(s -> {
-            Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
-            Assertions.assertNotNull(t);
-        });
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Region region = new Region();
+		PostalCode postalCode = new PostalCode();
+		postalCode.countryCode = "ES";
+		postalCode.zipCode = 69;
+		region.postalCode = postalCode;
+		Town town = new Town();
+		TownCode townCode = new TownCode();
+		townCode.town = "Barcelona";
+		townCode.countryCode = "ES";
+		townCode.zipCode = 69;
+		town.region = region;
+		town.townCode = townCode;
+		scope.inTransaction(s -> {
+			s.persist(region);
+			s.persist(town);
+		});
+		scope.inTransaction(s -> {
+			Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
+			Assertions.assertNotNull(t);
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/PostalCode.java
index 1c3f1d0da0b3..ded0ecbc81b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/PostalCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/PostalCode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embeddedid;
 
 import jakarta.persistence.Column;
@@ -6,8 +10,8 @@
 
 @Embeddable @MappedSuperclass
 class PostalCode {
-    @Column(name="country_code")
-    String countryCode;
-    @Column(name="zip_code")
-    int zipCode;
-}
\ No newline at end of file
+	@Column(name="country_code")
+	String countryCode;
+	@Column(name="zip_code")
+	int zipCode;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Region.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Region.java
index 6a00135b0252..a97f6af0e377 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Region.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Region.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embeddedid;
 
 import jakarta.persistence.AttributeOverride;
@@ -7,8 +11,8 @@
 
 @Entity
 class Region {
-    @EmbeddedId
-    @AttributeOverride(name = "countryCode", column=@Column(name="region_country_code"))
-    @AttributeOverride(name = "zipCode", column=@Column(name="region_zip_code"))
-    PostalCode postalCode;
+	@EmbeddedId
+	@AttributeOverride(name = "countryCode", column=@Column(name="region_country_code"))
+	@AttributeOverride(name = "zipCode", column=@Column(name="region_zip_code"))
+	PostalCode postalCode;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Town.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Town.java
index 68bc0541003d..07989196fdcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Town.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/Town.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embeddedid;
 
 import jakarta.persistence.AttributeOverride;
@@ -9,13 +13,13 @@
 
 @Entity
 class Town {
-    @EmbeddedId
-    @AttributeOverride(name = "countryCode", column=@Column(name="town_country_code"))
-    @AttributeOverride(name = "zipCode", column=@Column(name="town_zip_code"))
-    TownCode townCode;
+	@EmbeddedId
+	@AttributeOverride(name = "countryCode", column=@Column(name="town_country_code"))
+	@AttributeOverride(name = "zipCode", column=@Column(name="town_zip_code"))
+	TownCode townCode;
 
-    @ManyToOne
-    @JoinColumn(name = "town_zip_code", referencedColumnName = "region_zip_code", insertable = false, updatable = false)
-    @JoinColumn(name = "town_country_code", referencedColumnName = "region_country_code", insertable = false, updatable = false)
-    Region region;
-}
\ No newline at end of file
+	@ManyToOne
+	@JoinColumn(name = "town_zip_code", referencedColumnName = "region_zip_code", insertable = false, updatable = false)
+	@JoinColumn(name = "town_country_code", referencedColumnName = "region_country_code", insertable = false, updatable = false)
+	Region region;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/TownCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/TownCode.java
index 1a15db7af303..7dcffcdee9ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/TownCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/embeddedid/TownCode.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.embeddedid;
 
 import jakarta.persistence.Embeddable;
 
 @Embeddable
 class TownCode extends PostalCode {
-    String town;
-}
\ No newline at end of file
+	String town;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java
index 0ee96630d05d..0aebb2f81fc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Entity;
@@ -18,36 +22,36 @@
 @SessionFactory
 @JiraKey(value = "HHH-15355")
 public class Misc0Test {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction(s->{
-            EntityA a = new EntityA();
-            EntityB b = new EntityB();
-            a.flag = 1;
-            a.entityB = b;
-            b.entityA = a;
-            s.persist(a);
-            s.persist(b);
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(s->{
+			EntityA a = new EntityA();
+			EntityB b = new EntityB();
+			a.flag = 1;
+			a.entityB = b;
+			b.entityA = a;
+			s.persist(a);
+			s.persist(b);
 
-            s.createQuery("from B join entityA", EntityB.class).getSingleResult();
-        });
-    }
+			s.createQuery("from B join entityA", EntityB.class).getSingleResult();
+		});
+	}
 
-    @Entity(name = "A")
-    public static class EntityA implements Serializable {
-        @Id long entityBKey;
-        @Id int flag;
-        @OneToOne(mappedBy = "entityA")
-        public EntityB entityB;
-    }
+	@Entity(name = "A")
+	public static class EntityA implements Serializable {
+		@Id long entityBKey;
+		@Id int flag;
+		@OneToOne(mappedBy = "entityA")
+		public EntityB entityB;
+	}
 
-    @Entity(name = "B")
-    public static class EntityB implements Serializable {
-        @Id long entityBKey;
-        @OneToOne
+	@Entity(name = "B")
+	public static class EntityB implements Serializable {
+		@Id long entityBKey;
+		@OneToOne
 
-        @JoinColumnOrFormula(column = @JoinColumn(name = "entityBKey", referencedColumnName = "entityBKey", insertable = false, updatable = false))
-        @JoinColumnOrFormula(formula = @JoinFormula(value = "1", referencedColumnName = "flag"))
-        public EntityA entityA;
-    }
+		@JoinColumnOrFormula(column = @JoinColumn(name = "entityBKey", referencedColumnName = "entityBKey", insertable = false, updatable = false))
+		@JoinColumnOrFormula(formula = @JoinFormula(value = "1", referencedColumnName = "flag"))
+		public EntityA entityA;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java
index 9c7d5b42b82e..ff4870743c12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Entity;
@@ -16,35 +20,35 @@
 @SessionFactory
 @JiraKey(value = "HHH-15355")
 public class Misc1Test {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction(s->{
-            EntityA a = new EntityA();
-            EntityB b = new EntityB();
-            a.entityB = b;
-            b.entityA = a;
-            s.persist(a);
-            s.persist(b);
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(s->{
+			EntityA a = new EntityA();
+			EntityB b = new EntityB();
+			a.entityB = b;
+			b.entityA = a;
+			s.persist(a);
+			s.persist(b);
 
-            s.createQuery("from B join entityA", EntityB.class).getSingleResult();
-        });
-    }
+			s.createQuery("from B join entityA", EntityB.class).getSingleResult();
+		});
+	}
 
-    @Entity(name = "A")
-    public static class EntityA implements Serializable {
-        @Id long entityBKey;
-        @Id boolean flag;
-        @OneToOne(mappedBy = "entityA")
-        public EntityB entityB;
-    }
+	@Entity(name = "A")
+	public static class EntityA implements Serializable {
+		@Id long entityBKey;
+		@Id boolean flag;
+		@OneToOne(mappedBy = "entityA")
+		public EntityB entityB;
+	}
 
-    @Entity(name = "B")
-    public static class EntityB implements Serializable {
-        @Id long entityBKey;
-        @Id boolean flag;
-        @OneToOne
-        @JoinColumn(name = "entityBKey", referencedColumnName = "entityBKey", insertable = false, updatable = false)
-        @JoinColumn(name = "flag", referencedColumnName = "flag", insertable = false, updatable = false)
-        public EntityA entityA;
-    }
+	@Entity(name = "B")
+	public static class EntityB implements Serializable {
+		@Id long entityBKey;
+		@Id boolean flag;
+		@OneToOne
+		@JoinColumn(name = "entityBKey", referencedColumnName = "entityBKey", insertable = false, updatable = false)
+		@JoinColumn(name = "flag", referencedColumnName = "flag", insertable = false, updatable = false)
+		public EntityA entityA;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java
index b9e55a0e99d9..df7e89e8243e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Column;
@@ -23,131 +27,131 @@
 @SessionFactory
 @JiraKey(value = "HHH-15277")
 public class Misc2Test {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction(s-> {
-            String aid = "boo";
-
-            A a = new A(aid, "baa");
-            B b = new B("some2", "thing2");
-            s.persist(a);
-            a.b_R1 = b;
-            b.a_R1 = a;
-            s.persist(b);
-
-            A result = s.createQuery("SELECT a FROM A a WHERE a.id.aOne = :param", A.class)
-                    .setParameter("param", aid).getSingleResult();
-            assertEquals( result.id.aOne, aid );
-        });
-    }
-
-    @Entity(name = "A")
-    @Table(name = "a_table")
-    public static class A {
-
-        @EmbeddedId
-        private AId id;
-
-        // primary side of relationship
-        @OneToOne(mappedBy = "a_R1", fetch = FetchType.LAZY, targetEntity = B.class)
-        private B b_R1;
-
-        public A(String aOne, String aTwo) {
-            this.id = new AId(aOne, aTwo);
-        }
-
-    }
-
-    @Embeddable
-    public static class AId implements Serializable {
-
-        @Column(name = "a_one", nullable = false)
-        private String aOne;
-
-        @Column(name = "a_two", nullable = false)
-        private String aTwo;
-
-        private AId() {}
-
-        public AId(String aOne, String aTwo) {
-            this.aOne = aOne;
-            this.aTwo = aTwo;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(aOne, aTwo);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            AId other = (AId) obj;
-            return Objects.equals(aOne, other.aOne) && Objects.equals(aTwo, other.aTwo);
-        }
-    }
-
-    @Entity(name = "B")
-    @Table(name = "b_table")
-    public static class B {
-
-        @EmbeddedId
-        private BId id;
-        // secondary side of relationship
-        @OneToOne(targetEntity = A.class, fetch = FetchType.LAZY)
-        @JoinColumn(name = "b_a_two", referencedColumnName = "a_two")
-        @JoinColumn(name = "b_a_one", referencedColumnName = "a_one")
-        private A a_R1;
-
-        public B(String bOne, String bTwo) {
-            this.id = new BId(bOne, bTwo);
-        }
-
-    }
-
-    @Embeddable
-    public static class BId implements Serializable {
-
-        @Column(name = "b_one", nullable = false)
-        private String bOne = new String("");
-
-        @Column(name = "b_two", nullable = false)
-        private String bTwo = new String("");
-
-        private BId() {}
-
-        public BId(String bOne, String bTwo) {
-            this.bOne = bOne;
-            this.bTwo = bTwo;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(bOne, bTwo);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            BId other = (BId) obj;
-            return Objects.equals(bOne, other.bOne) && Objects.equals(bTwo, other.bTwo);
-        }
-
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(s-> {
+			String aid = "boo";
+
+			A a = new A(aid, "baa");
+			B b = new B("some2", "thing2");
+			s.persist(a);
+			a.b_R1 = b;
+			b.a_R1 = a;
+			s.persist(b);
+
+			A result = s.createQuery("SELECT a FROM A a WHERE a.id.aOne = :param", A.class)
+					.setParameter("param", aid).getSingleResult();
+			assertEquals( result.id.aOne, aid );
+		});
+	}
+
+	@Entity(name = "A")
+	@Table(name = "a_table")
+	public static class A {
+
+		@EmbeddedId
+		private AId id;
+
+		// primary side of relationship
+		@OneToOne(mappedBy = "a_R1", fetch = FetchType.LAZY, targetEntity = B.class)
+		private B b_R1;
+
+		public A(String aOne, String aTwo) {
+			this.id = new AId(aOne, aTwo);
+		}
+
+	}
+
+	@Embeddable
+	public static class AId implements Serializable {
+
+		@Column(name = "a_one", nullable = false)
+		private String aOne;
+
+		@Column(name = "a_two", nullable = false)
+		private String aTwo;
+
+		private AId() {}
+
+		public AId(String aOne, String aTwo) {
+			this.aOne = aOne;
+			this.aTwo = aTwo;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(aOne, aTwo);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null) {
+				return false;
+			}
+			if (getClass() != obj.getClass()) {
+				return false;
+			}
+			AId other = (AId) obj;
+			return Objects.equals(aOne, other.aOne) && Objects.equals(aTwo, other.aTwo);
+		}
+	}
+
+	@Entity(name = "B")
+	@Table(name = "b_table")
+	public static class B {
+
+		@EmbeddedId
+		private BId id;
+		// secondary side of relationship
+		@OneToOne(targetEntity = A.class, fetch = FetchType.LAZY)
+		@JoinColumn(name = "b_a_two", referencedColumnName = "a_two")
+		@JoinColumn(name = "b_a_one", referencedColumnName = "a_one")
+		private A a_R1;
+
+		public B(String bOne, String bTwo) {
+			this.id = new BId(bOne, bTwo);
+		}
+
+	}
+
+	@Embeddable
+	public static class BId implements Serializable {
+
+		@Column(name = "b_one", nullable = false)
+		private String bOne = new String("");
+
+		@Column(name = "b_two", nullable = false)
+		private String bTwo = new String("");
+
+		private BId() {}
+
+		public BId(String bOne, String bTwo) {
+			this.bOne = bOne;
+			this.bTwo = bTwo;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(bOne, bTwo);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null) {
+				return false;
+			}
+			if (getClass() != obj.getClass()) {
+				return false;
+			}
+			BId other = (BId) obj;
+			return Objects.equals(bOne, other.bOne) && Objects.equals(bTwo, other.bTwo);
+		}
+
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java
index 95ffe11432b8..a9b4041490d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Basic;
@@ -5,7 +9,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinColumns;
@@ -23,56 +26,56 @@
 @JiraKey(value = "HHH-14687")
 public class Misc3Test {
 
-    @Test
-    void test(SessionFactoryScope scope) {
-        scope.inTransaction(x -> {});
-    }
+	@Test
+	void test(SessionFactoryScope scope) {
+		scope.inTransaction(x -> {});
+	}
 
-    @Entity
-    @Table(name = "A")
-    public static final class A {
-        @Id
-        @GeneratedValue
-        private Long id;
-        @Basic
-        private String name;
-    }
+	@Entity
+	@Table(name = "A")
+	public static final class A {
+		@Id
+		@GeneratedValue
+		private Long id;
+		@Basic
+		private String name;
+	}
 
-    @Entity
-    @Table(name = "B", uniqueConstraints = {@UniqueConstraint(columnNames = {"a_id", "uniqueName"})})
-    public static final class B {
-        @Id
-        @GeneratedValue
-        private Long id;
+	@Entity
+	@Table(name = "B", uniqueConstraints = {@UniqueConstraint(columnNames = {"a_id", "uniqueName"})})
+	public static final class B {
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        @Basic
-        private String uniqueName;
-        @ManyToOne
-        @JoinColumn(name="a_id", referencedColumnName="id")
-        private A a;
-    }
+		@Basic
+		private String uniqueName;
+		@ManyToOne
+		@JoinColumn(name="a_id", referencedColumnName="id")
+		private A a;
+	}
 
-    @Entity
-    @Table(name = "C", uniqueConstraints = {@UniqueConstraint(columnNames = {"a_id", "uniqueName"})})
-    public static final class C {
-        @Id
-        @GeneratedValue
-        private Long id;
+	@Entity
+	@Table(name = "C", uniqueConstraints = {@UniqueConstraint(columnNames = {"a_id", "uniqueName"})})
+	public static final class C {
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        @Basic
-        private String uniqueName;
+		@Basic
+		private String uniqueName;
 
-        @ManyToOne
-        @JoinColumn(name="a_id", referencedColumnName="id")
-        private A a;
-        @ManyToOne
-        @JoinColumns(
-                value = {
-                        @JoinColumn(name = "uniqueName", referencedColumnName = "uniqueName", insertable = false, updatable = false),
-                        @JoinColumn(name = "a_id", referencedColumnName = "a_id", insertable = false, updatable = false)
-                },
-                foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)
-        )
-        private B b;
-    }
+		@ManyToOne
+		@JoinColumn(name="a_id", referencedColumnName="id")
+		private A a;
+		@ManyToOne
+		@JoinColumns(
+				value = {
+						@JoinColumn(name = "uniqueName", referencedColumnName = "uniqueName", insertable = false, updatable = false),
+						@JoinColumn(name = "a_id", referencedColumnName = "a_id", insertable = false, updatable = false)
+				},
+				foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)
+		)
+		private B b;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java
index 203b64b23a17..37402245564c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Basic;
@@ -26,272 +30,272 @@
 @JiraKey(value = "HHH-13054")
 public class Misc4Test {
 
-    @Test
-    void test(SessionFactoryScope scope) {
-        scope.inTransaction(x -> {});
-    }
-
-    @Entity
-    @Table(name = "A", schema = "", catalog = "")
-    @IdClass(APK.class)
-    public static class A {
-
-      private String a1;
-      private String a2;
-      private String a3;
-      private String a4;
-      private String a5;
-      private String a6;
-      private List bObj;
-
-      @Id
-      @Column(name = "A1", nullable = false, length = 15)
-      public String getA1() {
-        return a1;
-      }
-
-      public void setA1(String a1) {
-        this.a1 = a1;
-      }
-
-      @Basic
-      @Column(name = "A2", nullable = false, length = 15)
-      public String getA2() {
-        return a2;
-      }
-
-      public void setA2(String a2) {
-        this.a2 = a2;
-      }
-
-      @Basic
-      @Column(name = "A3", nullable = false, length = 15)
-      public String getA3() {
-        return a3;
-      }
-
-      public void setA3(String a3) {
-        this.a3 = a3;
-      }
-
-
-      @Id
-      @Column(name = "A4", nullable = false, length = 15)
-      public String getA4() {
-        return a4;
-      }
-
-      public void setA4(String a4) {
-        this.a4 = a4;
-      }
-
-
-      @Id
-      @Column(name = "A5", nullable = false, length = 15)
-      public String getA5() {
-        return a5;
-      }
-
-      public void setA5(String a5) {
-        this.a5 = a5;
-      }
-
-      @Id
-      @Column(name = "A6", nullable = false, length = 15)
-      public String getA6() {
-        return a6;
-      }
-
-      public void setA6(String a6) {
-        this.a6 = a6;
-      }
-
-      @OneToMany(mappedBy = "aObj")
-      public List getB() {
-        return bObj;
-      }
-
-      public void setB(List bObj) {
-        this.bObj = bObj;
-      }
-    }
-
-    public static class APK implements Serializable {
-
-      private String a1;
-      private String a4;
-      private String a5;
-      private String a6;
-
-      @Column(name = "A1", nullable = false, length = 15)
-      @Id
-      public String getA1() {
-        return a1;
-      }
-
-      public void setA1(String a1) {
-        this.a1 = a1;
-      }
-
-      @Column(name = "A4", nullable = false, length = 15)
-      @Id
-      public String getA4() {
-        return a4;
-      }
-
-      public void setA4(String a4) {
-        this.a4 = a4;
-      }
-
-      @Column(name = "A5", nullable = false, length = 15)
-      @Id
-      public String getA5() {
-        return a5;
-      }
-
-      public void setA5(String a5) {
-        this.a5 = a5;
-      }
-
-      public String getA6() {
-        return a6;
-      }
-
-      public void setA6(String a6) {
-        this.a6 = a6;
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        if (this == o) {
-          return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-          return false;
-        }
-        APK apk = (APK) o;
-        return Objects.equals(a1, apk.a1) &&
-            Objects.equals(a4, apk.a4) &&
-            Objects.equals(a5, apk.a5) &&
-            Objects.equals(a6, apk.a6);
-      }
-
-      @Override
-      public int hashCode() {
-
-        return Objects.hash(a1, a4, a5, a6);
-      }
-    }
-
-    @Entity
-    @Table(name = "B", schema = "", catalog = "")
-    @IdClass(BPK.class)
-    public static class B {
-
-      private int a1;
-      private String a2;
-      private String a3;
-      private String b1;
-      private String b2;
-      private A aObj;
-
-      @Id
-      @Column(name = "A1", nullable = false, length = 15)
-      public int getA1() {
-        return a1;
-      }
-
-      public void setA1(int a1) {
-        this.a1 = a1;
-      }
-
-      @Id
-      @Column(name = "A2", nullable = false, length = 15)
-      public String getA2() {
-        return a2;
-      }
-
-      public void setA2(String a2) {
-        this.a2 = a2;
-      }
-
-      @Id
-      @Column(name = "A3", nullable = false, length = 15)
-      public String getA3() {
-        return a3;
-      }
-
-      public void setA3(String a3) {
-        this.a3 = a3;
-      }
-
-      @Basic
-      @Column(name = "B1", nullable = false, length = 15)
-      public String getB1() {
-        return b1;
-      }
-
-      public void setB1(String b1) {
-        this.b1 = b1;
-      }
-
-      @Basic
-      @Column(name = "B2", nullable = false, length = 15)
-      public String getB2() {
-        return b2;
-      }
-
-      public void setB2(String b2) {
-        this.b2 = b2;
-      }
-
-
-      @ManyToOne(targetEntity = A.class)
-      @Fetch(FetchMode.SELECT)
-      @JoinColumn(name ="A1", referencedColumnName = "A1" , insertable = false, updatable = false)
-      public A getaObj() {
-        return aObj;
-      }
-
-      public void setaObj(A aObj) {
-        this.aObj = aObj;
-      }
-    }
-
-    public static class BPK implements Serializable {
-
-      private int a1;
-      private String a2;
-      private String a3;
-
-      @Column(name = "A1", nullable = false, length = 15)
-      @Id
-      public int getA1() {
-        return a1;
-      }
-
-      public void setA1(int a1) {
-        this.a1 = a1;
-      }
-
-      @Column(name = "A2", nullable = false, length = 15)
-      @Id
-      public String getA2() {
-        return a2;
-      }
-
-      public void setA2(String a2) {
-        this.a2 = a2;
-      }
-
-      @Column(name = "A3", nullable = false, length = 15)
-      @Id
-      public String getA3() {
-        return a3;
-      }
-
-      public void setA3(String a3) {
-        this.a3 = a3;
-      }
-    }
+	@Test
+	void test(SessionFactoryScope scope) {
+		scope.inTransaction(x -> {});
+	}
+
+	@Entity
+	@Table(name = "A", schema = "", catalog = "")
+	@IdClass(APK.class)
+	public static class A {
+
+	private String a1;
+	private String a2;
+	private String a3;
+	private String a4;
+	private String a5;
+	private String a6;
+	private List bObj;
+
+	@Id
+	@Column(name = "A1", nullable = false, length = 15)
+	public String getA1() {
+		return a1;
+	}
+
+	public void setA1(String a1) {
+		this.a1 = a1;
+	}
+
+	@Basic
+	@Column(name = "A2", nullable = false, length = 15)
+	public String getA2() {
+		return a2;
+	}
+
+	public void setA2(String a2) {
+		this.a2 = a2;
+	}
+
+	@Basic
+	@Column(name = "A3", nullable = false, length = 15)
+	public String getA3() {
+		return a3;
+	}
+
+	public void setA3(String a3) {
+		this.a3 = a3;
+	}
+
+
+	@Id
+	@Column(name = "A4", nullable = false, length = 15)
+	public String getA4() {
+		return a4;
+	}
+
+	public void setA4(String a4) {
+		this.a4 = a4;
+	}
+
+
+	@Id
+	@Column(name = "A5", nullable = false, length = 15)
+	public String getA5() {
+		return a5;
+	}
+
+	public void setA5(String a5) {
+		this.a5 = a5;
+	}
+
+	@Id
+	@Column(name = "A6", nullable = false, length = 15)
+	public String getA6() {
+		return a6;
+	}
+
+	public void setA6(String a6) {
+		this.a6 = a6;
+	}
+
+	@OneToMany(mappedBy = "aObj")
+	public List getB() {
+		return bObj;
+	}
+
+	public void setB(List bObj) {
+		this.bObj = bObj;
+	}
+	}
+
+	public static class APK implements Serializable {
+
+	private String a1;
+	private String a4;
+	private String a5;
+	private String a6;
+
+	@Column(name = "A1", nullable = false, length = 15)
+	@Id
+	public String getA1() {
+		return a1;
+	}
+
+	public void setA1(String a1) {
+		this.a1 = a1;
+	}
+
+	@Column(name = "A4", nullable = false, length = 15)
+	@Id
+	public String getA4() {
+		return a4;
+	}
+
+	public void setA4(String a4) {
+		this.a4 = a4;
+	}
+
+	@Column(name = "A5", nullable = false, length = 15)
+	@Id
+	public String getA5() {
+		return a5;
+	}
+
+	public void setA5(String a5) {
+		this.a5 = a5;
+	}
+
+	public String getA6() {
+		return a6;
+	}
+
+	public void setA6(String a6) {
+		this.a6 = a6;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+		return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+		return false;
+		}
+		APK apk = (APK) o;
+		return Objects.equals(a1, apk.a1) &&
+			Objects.equals(a4, apk.a4) &&
+			Objects.equals(a5, apk.a5) &&
+			Objects.equals(a6, apk.a6);
+	}
+
+	@Override
+	public int hashCode() {
+
+		return Objects.hash(a1, a4, a5, a6);
+	}
+	}
+
+	@Entity
+	@Table(name = "B", schema = "", catalog = "")
+	@IdClass(BPK.class)
+	public static class B {
+
+	private int a1;
+	private String a2;
+	private String a3;
+	private String b1;
+	private String b2;
+	private A aObj;
+
+	@Id
+	@Column(name = "A1", nullable = false, length = 15)
+	public int getA1() {
+		return a1;
+	}
+
+	public void setA1(int a1) {
+		this.a1 = a1;
+	}
+
+	@Id
+	@Column(name = "A2", nullable = false, length = 15)
+	public String getA2() {
+		return a2;
+	}
+
+	public void setA2(String a2) {
+		this.a2 = a2;
+	}
+
+	@Id
+	@Column(name = "A3", nullable = false, length = 15)
+	public String getA3() {
+		return a3;
+	}
+
+	public void setA3(String a3) {
+		this.a3 = a3;
+	}
+
+	@Basic
+	@Column(name = "B1", nullable = false, length = 15)
+	public String getB1() {
+		return b1;
+	}
+
+	public void setB1(String b1) {
+		this.b1 = b1;
+	}
+
+	@Basic
+	@Column(name = "B2", nullable = false, length = 15)
+	public String getB2() {
+		return b2;
+	}
+
+	public void setB2(String b2) {
+		this.b2 = b2;
+	}
+
+
+	@ManyToOne(targetEntity = A.class)
+	@Fetch(FetchMode.SELECT)
+	@JoinColumn(name ="A1", referencedColumnName = "A1" , insertable = false, updatable = false)
+	public A getaObj() {
+		return aObj;
+	}
+
+	public void setaObj(A aObj) {
+		this.aObj = aObj;
+	}
+	}
+
+	public static class BPK implements Serializable {
+
+	private int a1;
+	private String a2;
+	private String a3;
+
+	@Column(name = "A1", nullable = false, length = 15)
+	@Id
+	public int getA1() {
+		return a1;
+	}
+
+	public void setA1(int a1) {
+		this.a1 = a1;
+	}
+
+	@Column(name = "A2", nullable = false, length = 15)
+	@Id
+	public String getA2() {
+		return a2;
+	}
+
+	public void setA2(String a2) {
+		this.a2 = a2;
+	}
+
+	@Column(name = "A3", nullable = false, length = 15)
+	@Id
+	public String getA3() {
+		return a3;
+	}
+
+	public void setA3(String a3) {
+		this.a3 = a3;
+	}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java
index 5fe344ab8d08..c8e0e1a80d64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.misc;
 
 import jakarta.persistence.Column;
@@ -23,7 +27,7 @@
 @SessionFactory
 @JiraKey(value = "HHH-14014")
 public class Misc5Test {
-	@Test 
+	@Test
 	void test(SessionFactoryScope scope) {
 		scope.inTransaction(x -> {
 			Animal a = new Animal();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/MixedRefColNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/MixedRefColNamesTest.java
index ea51150c4399..ac65d3d6018a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/MixedRefColNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/MixedRefColNamesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.mixed;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -9,28 +13,28 @@
 @DomainModel(annotatedClasses = {Region.class, Town.class})
 @SessionFactory
 public class MixedRefColNamesTest {
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Region region = new Region();
-        PostalCode postalCode = new PostalCode();
-        postalCode.countryCode = "ES";
-        postalCode.zipCode = 69;
-        region.postalCode = postalCode;
-        Town town = new Town();
-        TownCode townCode = new TownCode();
-        townCode.town = "Barcelona";
-        townCode.countryCode = "ES";
-        townCode.zipCode = 69;
-        town.region = region;
-        town.townCode = townCode;
-        scope.inTransaction(s -> {
-            s.persist(region);
-            town.regionId = region.id;
-            s.persist(town);
-        });
-        scope.inTransaction(s -> {
-            Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
-            Assertions.assertNotNull(t);
-        });
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Region region = new Region();
+		PostalCode postalCode = new PostalCode();
+		postalCode.countryCode = "ES";
+		postalCode.zipCode = 69;
+		region.postalCode = postalCode;
+		Town town = new Town();
+		TownCode townCode = new TownCode();
+		townCode.town = "Barcelona";
+		townCode.countryCode = "ES";
+		townCode.zipCode = 69;
+		town.region = region;
+		town.townCode = townCode;
+		scope.inTransaction(s -> {
+			s.persist(region);
+			town.regionId = region.id;
+			s.persist(town);
+		});
+		scope.inTransaction(s -> {
+			Town t = s.createQuery("from Town join fetch region", Town.class).getSingleResult();
+			Assertions.assertNotNull(t);
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/PostalCode.java
index 2c5bf87e5e88..71081141c0e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/PostalCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/PostalCode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.mixed;
 
 import jakarta.persistence.Column;
@@ -6,8 +10,8 @@
 
 @Embeddable @MappedSuperclass
 class PostalCode {
-    @Column(name="country_code", nullable = false)
-    String countryCode;
-    @Column(name="zip_code", nullable = false)
-    int zipCode;
-}
\ No newline at end of file
+	@Column(name="country_code", nullable = false)
+	String countryCode;
+	@Column(name="zip_code", nullable = false)
+	int zipCode;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Region.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Region.java
index 6f6cde524794..939607dce230 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Region.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Region.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.mixed;
 
 import jakarta.persistence.Column;
@@ -11,15 +15,15 @@
 @Entity
 class Region {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    int id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	int id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Embedded
-    PostalCode postalCode;
+	@NaturalId
+	@Embedded
+	PostalCode postalCode;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Town.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Town.java
index 455d7bdd4343..1eeac1e9550f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Town.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/Town.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.mixed;
 
 import jakarta.persistence.Column;
@@ -13,23 +17,23 @@
 @Entity
 class Town {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id", nullable = false)
-    Integer id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id", nullable = false)
+	Integer id;
 
-    String name;
+	String name;
 
-    @NaturalId
-    @Embedded
-    TownCode townCode;
+	@NaturalId
+	@Embedded
+	TownCode townCode;
 
-    @Column(name = "region_id", nullable = false)
-    int regionId;
+	@Column(name = "region_id", nullable = false)
+	int regionId;
 
-    @ManyToOne
-    @JoinColumn(name = "region_id", referencedColumnName = "id", nullable = false, insertable = false, updatable = false)
-    @JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
-    @JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
-    Region region;
-}
\ No newline at end of file
+	@ManyToOne
+	@JoinColumn(name = "region_id", referencedColumnName = "id", nullable = false, insertable = false, updatable = false)
+	@JoinColumn(name = "country_code", referencedColumnName = "country_code", nullable = false, insertable = false, updatable = false)
+	@JoinColumn(name = "zip_code", referencedColumnName = "zip_code", nullable = false, insertable = false, updatable = false)
+	Region region;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/TownCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/TownCode.java
index 7224a9b685c7..e6858089766f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/TownCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/mixed/TownCode.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.mixed;
 
 import jakarta.persistence.Embeddable;
 
 @Embeddable
 class TownCode extends PostalCode {
-    String town;
-}
\ No newline at end of file
+	String town;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java
index 54ab193a4b8e..700ac7f05f75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.secondary;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Reference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Reference.java
index ca4d733da0c3..c2a2c7aa9818 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Reference.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Reference.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.secondary;
 
 import jakarta.persistence.Column;
@@ -6,7 +10,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.SecondaryTable;
 
 @Entity
 public class Reference {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Split.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Split.java
index 1803a4a3a0c0..c0c09ab59e88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Split.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/Split.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.secondary;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Animal.java
index bc728f0cda1f..a42f0f1db2c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Animal.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.refcolnames.subclass;
 
-import org.hibernate.annotations.NaturalId;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Cat.java
index f3b101d5b84a..83e86f4904df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Cat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.refcolnames.subclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/RefToJoinedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/RefToJoinedSuperclassTest.java
index 5de3a52d78f9..b9630f490b5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/RefToJoinedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/RefToJoinedSuperclassTest.java
@@ -1,9 +1,6 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.refcolnames.subclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Toy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Toy.java
index c7bd7f789a94..a76ab9a504d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Toy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/subclass/Toy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.refcolnames.subclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
index 9b6ad664fb63..4275810ccc5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.superclass;
 
 import jakarta.persistence.CascadeType;
@@ -8,7 +12,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
index 8ae50b500404..0af93063ff2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.superclass;
 
 import jakarta.persistence.*;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedUnionSuperclassColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedUnionSuperclassColumnTest.java
index 8eed257716b9..3b94148d6867 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedUnionSuperclassColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedUnionSuperclassColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.refcolnames.superclass;
 
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Bag.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Bag.java
index 259597adab06..d607afc47683 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Bag.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Bag.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
index 5fa5d039e129..3d0206b570c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/House.java
index 8709cb8627e0..2c604175045b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/House.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/HousePlaces.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/HousePlaces.java
index 07a9b7c1ef28..76be19a2f11d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/HousePlaces.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/HousePlaces.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Inhabitant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Inhabitant.java
index a7a8d568c1e6..f336330b31cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Inhabitant.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Inhabitant.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Item.java
index 7db4fb4c3186..5123215622ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ItemCost.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ItemCost.java
index 4fc403ac575e..f1626b550e96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ItemCost.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ItemCost.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
index ab02ab2b99f1..88f4324327b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Place.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Place.java
index 5b75a647188b..184a2ca3f429 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Place.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Place.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Places.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Places.java
index 8f8adc99d09a..f43063a09649 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Places.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Places.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Postman.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Postman.java
index 63ebb8885549..9a523650fbde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Postman.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Postman.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Rambler.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Rambler.java
index cb4cb684d914..d4b2ee36f566 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Rambler.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Rambler.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
index dd25e528c671..0a2d2f12b2e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Vendor.java
index 8e63590bb392..83a71acab46e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Vendor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Vendor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -27,4 +23,3 @@ public void setId(int id) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/WarehouseItem.java
index 6952df04cce0..2fabba31183a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/WarehouseItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/WarehouseItem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 import java.math.BigDecimal;
 import jakarta.persistence.Entity;
@@ -60,7 +56,7 @@ public void setVendor(Vendor vendor) {
 		this.vendor = vendor;
 	}
 
-    @ManyToOne
+	@ManyToOne
 	@JoinColumn(name="vendor_id", referencedColumnName="vendor_id", insertable=false, updatable=false)
 	@JoinColumn(name="item_id", referencedColumnName="item_id", insertable=false, updatable=false)
 	public ItemCost getDefaultCost() {
@@ -71,4 +67,3 @@ public void setDefaultCost(ItemCost defaultCost) {
 		this.defaultCost = defaultCost;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java
index b76fbaa90e68..40333a8775bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java
index db1696876ee9..ebd5d1b47e8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java
index a9ae8748f397..c4f4d701c9f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import java.util.Date;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java
index 6f6bf541ef72..fff5bd3ec8ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java
index dfaaa07cecc5..6023f087201e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java
index bc37d00b15e5..51aaac7e52a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java
index 73e533474440..12101288fef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java
index 816db1298069..2608e8feb2ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 
 import jakarta.persistence.PostPersist;
@@ -23,10 +19,10 @@ public class LogListener {
 	@PrePersist
 	@PostPersist
 	public void log(Object entity) {
-        log.debug("Logging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
+		log.debug("Logging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
 	}
 
 	public void noLog(Object entity) {
-        log.debug("NoLogging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
+		log.debug("NoLogging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java
index 40320ce58159..44694b67203c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java
index 3d9f903ef01d..60679b40f917 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java
index c4d6237ac6c4..72a711af529c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
 
@@ -13,15 +11,15 @@
  */
 public class OrganizationConverter implements AttributeConverter {
 
-    @Override
-    public String convertToDatabaseColumn(Organization organization) {
-        return "ORG-" + organization.getOrganizationId();
-    }
+	@Override
+	public String convertToDatabaseColumn(Organization organization) {
+		return "ORG-" + organization.getOrganizationId();
+	}
 
-    @Override
-    public Organization convertToEntityAttribute(String organizationId) {
-        Organization organization = new Organization();
-        organization.setOrganizationId(organizationId.replace("ORG-", ""));
-        return organization;
-    }
+	@Override
+	public Organization convertToEntityAttribute(String organizationId) {
+		Organization organization = new Organization();
+		organization.setOrganizationId(organizationId.replace("ORG-", ""));
+		return organization;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java
index e3604181fc2c..c3ac26e65b6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 
 import jakarta.persistence.PostPersist;
@@ -22,10 +18,10 @@ public class OtherLogListener {
 	@PrePersist
 	@PostPersist
 	public void log(Object entity) {
-        log.debug("Logging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
+		log.debug("Logging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
 	}
 
 	public void noLog(Object entity) {
-        log.debug("NoLogging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
+		log.debug("NoLogging entity " + entity.getClass().getName() + " with hashCode: " + entity.hashCode());
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java
index cf3f54c44f2e..3a53c17553e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java
index 18b4be6779b0..9e42e63aa1ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java
index 5305b2b1c641..9dd539f11249 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java
index 331c31f3cb43..bb20df965268 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.reflection;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java
index 29ad98438d61..70a2bacca20b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java
index 54ce30e3d2bd..f37c7dffb422 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.secondarytable;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableDynamicUpateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableDynamicUpateTest.java
index 7e35bd7319ba..4e047f837cb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableDynamicUpateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableDynamicUpateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.secondarytable;
 
 import org.hibernate.annotations.DynamicUpdate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java
index ba1196edfb5b..9050675c5af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.secondarytable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/AbstractChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/AbstractChild.java
index b599b880db46..a9a363f808a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/AbstractChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/AbstractChild.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.sharedfk;
 
 import jakarta.persistence.*;
@@ -15,4 +19,4 @@ public abstract class AbstractChild {
 	@GeneratedValue
 	@Column(name = "ID")
 	Integer id;
-}	
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild1.java
index 786bb24dff61..9e4ee3b3fdd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild1.java
@@ -1,7 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.sharedfk;
 
-import jakarta.persistence.Access;
-import jakarta.persistence.AccessType;
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild2.java
index 0a8399607675..3ab8ba2fe1ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/ConcreteChild2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.sharedfk;
 
 import jakarta.persistence.*;
@@ -8,4 +12,4 @@ public class ConcreteChild2 extends AbstractChild {
 	@Basic(optional = false)
 	@Column(name = "VALUE2")
 	String value;
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/Parent.java
index 2021d910c441..75c4a74c2121 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/Parent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.sharedfk;
 
 import jakarta.persistence.*;
@@ -25,4 +29,4 @@ public class Parent {
 	@JoinColumn(name = "PARENT_ID")
 	@OrderColumn(name = "ORDER_C")
 	List child2s= new LinkedList<>();
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java
index fad581c333b2..faec314bb5de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.sharedfk;
 
 import org.hibernate.PropertyValueException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java
index 344af423c99f..efc59d8d96ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.strategy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java
index 15c47cd2f66c..11225eb32af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.strategy;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java
index f7cd39b31dd9..3ecbcd9e821b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.strategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java
index 857709a530c8..faa7578211c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.subselect;
 import jakarta.persistence.Entity;
@@ -18,9 +16,9 @@ public class Bid {
 	private int id;
 	private long itemId;
 	private double amount;
-	
+
 	@Id
-    public int getId() {
+	public int getId() {
 		return id;
 	}
 	public void setId(int id) {
@@ -38,7 +36,7 @@ public double getAmount() {
 	public void setAmount(double val) {
 		this.amount = val;
 	}
-	
-	
-	
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java
index d3ff381ca3f4..30672a81da6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.subselect;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -20,10 +17,10 @@
 @Subselect("select Item.name as name, max(Bid.amount) as amount from Item, Bid where Bid.itemId = Item.id group by Item.name")
 @Synchronize({"Item", "Bid"})
 public class HighestBid {
-	 
+
 	private String name;
 	private double amount;
-	
+
 	@Id
 	public String getName() {
 		return name;
@@ -37,7 +34,7 @@ public double getAmount() {
 	public void setAmount(double amount) {
 		this.amount = amount;
 	}
-	
-	
-	
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java
index f91d0ad99045..3bfc1b8674a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.annotations.subselect;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -17,9 +14,9 @@ public class Item {
 
 	private long id;
 	private String name;
-	
+
 	@Id
-    public long getId() {
+	public long getId() {
 		return id;
 	}
 	public void setId(long id) {
@@ -31,6 +28,6 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java
index 04123002efd7..c81c160ce3ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.subselect;
 
@@ -33,31 +31,31 @@ public void testSubselectWithSynchronize() {
 		item.setName("widget");
 		item.setId(itemId);
 		s.persist(item);
-		
+
 		Bid bid1 = new Bid();
 		bid1.setAmount(100.0);
 		bid1.setItemId(itemId);
 		bid1.setId(1);
 		s.persist(bid1);
-		
+
 		Bid bid2 = new Bid();
 		bid2.setAmount(200.0);
 		bid2.setItemId(itemId);
 		bid2.setId(2);
 		s.persist(bid2);
-		
+
 		//Because we use 'synchronize' annotation, this query should trigger session flush
 		Query query = s.createQuery("from HighestBid b where b.name = :name");
 		query.setParameter( "name", "widget", StandardBasicTypes.STRING );
 		HighestBid highestBid = (HighestBid) query.list().iterator().next();
-		
+
 		Assert.assertEquals( 200.0, highestBid.getAmount(), 0.01 );
-		tx.rollback();		
-		s.close();	
-		
-		
+		tx.rollback();
+		s.close();
+
+
 	}
-	
+
 	@Override
 	protected Class[] getAnnotatedClasses() {
 		return new Class[]{
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java
index 066655c3c4d4..668a43126eb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.tableperclass;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java
index d9eb9e70eb60..cb8c3399ec1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.tableperclass;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java
index e2a8e6eda0fe..ad03173c67e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.tableperclass;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java
index bf7663f5ec52..613557695fc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.tableperclass;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java
index 329a55ace379..8444969ee504 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.tableperclass;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java
index 3c01380ae72f..d9a46fe01645 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java
index e11581796056..67e91f6d635a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java
index 34d7505036a6..180161a5616a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java
index e86a11438949..b8ee15839809 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 import jakarta.persistence.Embedded;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java
index 6b397f47b26c..13882c65737b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java
index 04078f856e26..237bd3a06740 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java
index 47d7e86acefb..aace288a1981 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java
index 67596b020f70..496ef7c0a18f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 import jakarta.persistence.Column;
@@ -13,7 +11,7 @@
  */
 @Embeddable
 public class SizeImpl implements Size {
-    @Column(name = "name", nullable = false)
+	@Column(name = "name", nullable = false)
 	private String name;
 
 	public String getName() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java
index d8124f196bd9..76ee66479c07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.target;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java
index 39c8981a9cf7..91cf06ff31bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.type;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOid.java
index 0310929f9e2e..2caf75c8f108 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.type;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOidGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOidGenerator.java
index bd3e104bd681..07d6b4a53e57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOidGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/MyOidGenerator.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.type;
 
 import org.hibernate.HibernateException;
@@ -24,4 +20,3 @@ public Object generate(SharedSessionContractImplementor session, Object aObject)
 		return new MyOid( 0, 0, 0, counter );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java
index 8505e2fc38ed..983171d15b41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/AbstractEntity.java
index b21e12341344..ae9240b23a1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/AbstractEntity.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java
index b24b031afb16..650690225ce4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java
@@ -1,32 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.FunctionContributor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.BasicDomainType;
 import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource;
 import org.hibernate.persister.entity.EntityPersister;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity1.java
index ad5791adce53..b7ae607794e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity1.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity2.java
index 6c074e0b05d3..9fe62dace5da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity2.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity3.java
index b005d8734fa6..f0635d9d7d39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/Entity3.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyGenericType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyGenericType.java
index 1b2171d0df3f..88f5e1ac75e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyGenericType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyGenericType.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
@@ -48,7 +29,7 @@ public ParameterType getParameterType() {
 	@Override
 	public void setParameterValues(Properties params) {
 		parameterType = (ParameterType) params.get(PARAMETER_TYPE);
-    }
+	}
 
 	@Override
 	public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyStringType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyStringType.java
index 41999c9f4b6a..0dd3327f8e87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyStringType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/MyStringType.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type.dynamicparameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
index 4da1fd155204..4d5163bbb4ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
@@ -15,24 +13,24 @@
 @MappedSuperclass
 public class Building {
 
-    public Long height;
+	public Long height;
 
-    private Room room;
+	private Room room;
 
-    public Long getHeight() {
-        return height;
-    }
+	public Long getHeight() {
+		return height;
+	}
 
-    public void setHeight(Long height) {
-        this.height = height;
-    }
+	public void setHeight(Long height) {
+		this.height = height;
+	}
 
-    @ManyToOne(optional = false)
-    public Room getRoom() {
-        return room;
-    }
+	@ManyToOne(optional = false)
+	public Room getRoom() {
+		return room;
+	}
 
-    public void setRoom(Room room) {
-        this.room = room;
-    }
+	public void setRoom(Room room) {
+		this.room = room;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
index 270e02b8d982..1d57168e8fe1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
@@ -20,24 +18,24 @@
 @Table(uniqueConstraints = {@UniqueConstraint(name = "uniqueWithInherited", columnNames = {"room_id", "cost"} )})
 public class House extends Building {
 	@Column(nullable = false)
-    public Long id;
+	public Long id;
 	@NotNull
-    public Integer cost;
+	public Integer cost;
 
-    @Id
-    public Long getId() {
-        return id;
-    }
+	@Id
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Integer getCost() {
-        return cost;
-    }
+	public Integer getCost() {
+		return cost;
+	}
 
-    public void setCost(Integer cost) {
-        this.cost = cost;
-    }
+	public void setCost(Integer cost) {
+		this.cost = cost;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
index 67764dbd4298..7b4600f41db8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
@@ -15,25 +13,25 @@
  */
 @Entity
 public class Room {
-    private Long id;
+	private Long id;
 
-    private String name;
+	private String name;
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    @Id
+	@Id
 	@Column(nullable = false)
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java
index 1c606e830021..5e0d3c01ae33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java
index 5b2c2f935f2c..9d36e9cf8849 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
@@ -28,43 +26,43 @@
 @DomainModel( annotatedClasses = { Room.class, Building.class, House.class } )
 @SessionFactory
 @SkipForDialect( dialectClass = SybaseDialect.class,
-        matchSubTypes = true,
-        reason = "Sybase does not properly support unique constraints on nullable columns" )
+		matchSubTypes = true,
+		reason = "Sybase does not properly support unique constraints on nullable columns" )
 public class UniqueConstraintTest {
 
 	@Test
 	public void testUniquenessConstraintWithSuperclassProperty(SessionFactoryScope scope) {
-        scope.inTransaction( (s) -> {
-            Room livingRoom = new Room();
-            livingRoom.setId(1l);
-            livingRoom.setName("livingRoom");
-            s.persist(livingRoom);
-            s.flush();
-            House house = new House();
-            house.setId(1l);
-            house.setCost(100);
-            house.setHeight(1000l);
-            house.setRoom(livingRoom);
-            s.persist(house);
-            s.flush();
-            House house2 = new House();
-            house2.setId(2l);
-            house2.setCost(100);
-            house2.setHeight(1001l);
-            house2.setRoom(livingRoom);
-            s.persist(house2);
-            try {
-                s.flush();
-                fail( "Database constraint non-existent" );
-            }
-            catch (PersistenceException e) {
-                assertTyping( JDBCException.class, e );
-                //success
-            }
-            finally {
-                s.getTransaction().markRollbackOnly();
-            }
-        } );
-    }
-    
+		scope.inTransaction( (s) -> {
+			Room livingRoom = new Room();
+			livingRoom.setId(1l);
+			livingRoom.setName("livingRoom");
+			s.persist(livingRoom);
+			s.flush();
+			House house = new House();
+			house.setId(1l);
+			house.setCost(100);
+			house.setHeight(1000l);
+			house.setRoom(livingRoom);
+			s.persist(house);
+			s.flush();
+			House house2 = new House();
+			house2.setId(2l);
+			house2.setCost(100);
+			house2.setHeight(1001l);
+			house2.setRoom(livingRoom);
+			s.persist(house2);
+			try {
+				s.flush();
+				fail( "Database constraint non-existent" );
+			}
+			catch (PersistenceException e) {
+				assertTyping( JDBCException.class, e );
+				//success
+			}
+			finally {
+				s.getTransaction().markRollbackOnly();
+			}
+		} );
+	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java
index 46c75612679f..c99f4cefd33c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
index 4d5509e1c134..b0a9a2c1e1bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
@@ -62,7 +60,7 @@ else if ( table.getName().equals( "UniqueNoNameB" ) ) {
 			}
 
 			assertTrue( "Could not find the expected tables.", tableA != null && tableB != null );
-            assertFalse(
+			assertFalse(
 					tableA.getUniqueKeys().values().iterator().next().getName().equals(
 							tableB.getUniqueKeys().values().iterator().next().getName()
 					)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java
index 800a6cdcad1b..690200226dbc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Antenna.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Antenna.java
index 2c3498ee240a..2b9bd4bd5ced 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Antenna.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Antenna.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.various;
 
 import org.hibernate.annotations.Generated;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java
index 8b37c6d90e95..f963dcb5a8d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java
index 10b47bffeea2..6ae881d13c48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.various;
 import java.util.Date;
 import jakarta.persistence.Entity;
@@ -45,5 +41,3 @@ public void setLastUpdate(Date lastUpdate) {
 		this.lastUpdate = lastUpdate;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java
index f1d20d7993b6..b3694d02414e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java
index 73a73a04f7da..34fd1d94689a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java
index 14372eeff8f3..dde784928fbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.various;
 
 import org.hibernate.annotations.Subselect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java
index 8aefaf3682e8..ff30031b43f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.annotations.various;
 
 import org.hibernate.annotations.OptimisticLock;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java
index bd7616a042c1..a004907c7356 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/ProfessionalAgreement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/ProfessionalAgreement.java
index c077ff357c68..4a19ebd09dfe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/ProfessionalAgreement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/ProfessionalAgreement.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.various;
 import java.util.Date;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
index ba684b8cf1bf..dbbb99726520 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java
index 0b2b30808019..a5024887d31c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/VMTimestamped.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/VMTimestamped.java
index b2ade7da1a95..2506060cf470 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/VMTimestamped.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/VMTimestamped.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.annotations.various;
 import java.util.Date;
 import jakarta.persistence.Entity;
@@ -44,5 +40,3 @@ public void setLastUpdate(Date lastUpdate) {
 		this.lastUpdate = lastUpdate;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java
index 7f5214b2255b..704374742130 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.various;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java
index e8ea29193cc9..eb43d5f70cba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java
index 6a25dc404a04..c0a3eae21e99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
index e1954c9639be..6d5f04225738 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
index 498d1e506ea8..d26618eb1a15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
index 14c334194fc8..2045db95cf67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
index bc3795196d1b..92d0a3211030 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
index 844ef2fd0fa2..25bf9510cd24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java
index 8c5e1a0935ba..f943410edb49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java
index 99acc90c1228..a874e70bfed1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java
index 560822e18a50..fcb9a31cf3e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java
index a6e9b1537ae2..1d74caea5bbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java
index 25ea9e7aaf18..4f15fe880f62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java
index ed06d549b599..1a9264f76858 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java
index c8c1f565d449..fb9a4c7852c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java
index 63b952b27451..2da37142989f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java
index 3f99a797f9fc..a297fe4cefae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java
index 899467d913ba..3fe42e6a029b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java
index 527a236195fd..1372c74f5437 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/A.java
index e99e614ff228..0a2ab7bd7774 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/AImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/AImpl.java
index 416d7d6165a4..674e59f77187 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/AImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/AImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/B.java
index 21bd586d99fd..229aa538407c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/BImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/BImpl.java
index 6b3f167e1078..03f281bffda6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/BImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/BImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/CloudType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/CloudType.java
index 2b60ea96a414..2386c67fe0bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/CloudType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/CloudType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Government.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Government.java
index c5344c8683cd..265aedf93507 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Government.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Government.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java
index e86a5aba78c8..f4a8e0207bb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmWithIdentityTest.java
index 7e3650ebbf96..5f209089655c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmWithIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmWithIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java
index b94ea20397bf..d2bb7a8030f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PrimeMinister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PrimeMinister.java
index ee2d1aaa0793..f862dddf44bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PrimeMinister.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PrimeMinister.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id:PrimeMinister.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
 package org.hibernate.orm.test.annotations.xml.hbm;
 import java.util.Set;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Sky.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Sky.java
index e7978b3857e8..a79931185b4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Sky.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Sky.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Z.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Z.java
index eb354cf9c82d..a5af986c6bf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Z.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/Z.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 
 
@@ -13,11 +9,11 @@
  * @author Emmanuel Bernard
  */
 public interface Z extends java.io.Serializable {
-  public Integer getZId();
+public Integer getZId();
 
-  public void setZId(Integer zId);
+public void setZId(Integer zId);
 
-  public B getB();
+public B getB();
 
-  public void setB(B b);
+public void setB(B b);
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/ZImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/ZImpl.java
index fd3ef8eb82d3..9a13dbf4bc0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/ZImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/ZImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.annotations.xml.hbm;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyExplicitSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyExplicitSelectTest.java
index 8d4b2e4aaa1f..2e69062c9765 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyExplicitSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyExplicitSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java
index e2eba5691241..e48efebcfdcf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyMergeTest.java
index 664bb1d54434..4132cadfbddf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyMergeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.any.annotations;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
index 0e8c7640bdc3..6e059dc90c7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyOnExistingColumnsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyOnExistingColumnsTest.java
index 105cf624c21a..f228e11b5888 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyOnExistingColumnsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyOnExistingColumnsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java
index 17a8da390d28..42a615faf7f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java
index 8f42e88adff8..7b8ff99a9f62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ComposedAnyDiscriminatorMappingsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ComposedAnyDiscriminatorMappingsTests.java
index 9880ef6ace8c..3a91dee73437 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ComposedAnyDiscriminatorMappingsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ComposedAnyDiscriminatorMappingsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java
index 54c94060b7b1..39b35c07283e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.any.annotations;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java
index 8ca943db6350..f631a5a7a899 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyHolder.java
index c18448b6968a..efda3ea303ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyList.java
index 3ef32cc7a353..2238a632b0d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -46,19 +44,19 @@ public ImplicitPropertyList(String name) {
 	@ManyToAny
 	@Column(name = "property_type")
 	@AnyKeyJavaClass( Integer.class )
-    @Cascade( CascadeType.ALL )
-    @JoinTable(name = "list_properties",
+	@Cascade( CascadeType.ALL )
+	@JoinTable(name = "list_properties",
 			joinColumns = @JoinColumn(name = "obj_id"),
 			inverseJoinColumns = @JoinColumn(name = "property_id")
 	)
-    @OrderColumn(name = "prop_index")
-    public List getGeneralProperties() {
-        return generalProperties;
-    }
+	@OrderColumn(name = "prop_index")
+	public List getGeneralProperties() {
+		return generalProperties;
+	}
 
-    public void setGeneralProperties(List generalProperties) {
-        this.generalProperties = generalProperties;
-    }
+	public void setGeneralProperties(List generalProperties) {
+		this.generalProperties = generalProperties;
+	}
 
 	@Id
 	@GeneratedValue
@@ -78,7 +76,7 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-    @Any
+	@Any
 	@Column(name = "property_type")
 	@JoinColumn(name = "property_id")
 	@AnyKeyJavaClass( Integer.class )
@@ -88,8 +86,8 @@ public void setName(String name) {
 	@AnyDiscriminatorValue( discriminator = "L", entity = LongProperty.class)
 	@Cascade( CascadeType.ALL )
 	public T getSomeProperty() {
-        return someProperty;
-    }
+		return someProperty;
+	}
 
 	public void setSomeProperty(T someProperty) {
 		this.someProperty = someProperty;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyMap.java
index 93348e55ae86..30befc99ade6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyMap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertyMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -14,7 +12,6 @@
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.Table;
-import org.hibernate.annotations.AnyDiscriminatorValue;
 import org.hibernate.annotations.AnyKeyJavaClass;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.ManyToAny;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertySet.java
index a20d494cea44..2307c6b2bc85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertySet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/ImplicitPropertySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java
index 6285657bf025..c20d8c084491 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -18,7 +16,7 @@ public class IntegerProperty implements Property {
 	private Integer id;
 	private String name;
 	private Integer value;
-	
+
 	public IntegerProperty() {
 		super();
 	}
@@ -60,5 +58,5 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java
index 6fe901408847..40796c87d958 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -18,9 +16,7 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -34,7 +30,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 @Jpa(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java
index 38c7babddd8c..0c6d2009845f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -13,7 +11,6 @@
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import from.In;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java
index 1ace85503383..581068cb98ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 import jakarta.persistence.Entity;
@@ -14,50 +12,50 @@
 @Entity
 @Table(name = "long_property")
 public class LongProperty implements Property {
-    private Integer id;
-
-    private String name;
-    private Long value;
-
-    public LongProperty() {
-        super();
-    }
-
-    public LongProperty(String name, Long value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    public String asString() {
-        return Long.toString(value);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Id
-    @GeneratedValue
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    @Column(name = "`value`")
-    public Long getValue() {
-        return value;
-    }
-
-    public void setValue(Long value) {
-        this.value = value;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
+	private Integer id;
+
+	private String name;
+	private Long value;
+
+	public LongProperty() {
+		super();
+	}
+
+	public LongProperty(String name, Long value) {
+		super();
+		this.name = name;
+		this.value = value;
+	}
+
+	public String asString() {
+		return Long.toString(value);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	@Id
+	@GeneratedValue
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	@Column(name = "`value`")
+	public Long getValue() {
+		return value;
+	}
+
+	public void setValue(Long value) {
+		this.value = value;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/Property.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/Property.java
index 6881d270f9c7..a6bcbf54590c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/Property.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/Property.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyDiscriminatorMapping.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyDiscriminatorMapping.java
index 123b82bd8e3b..387a716bdc20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyDiscriminatorMapping.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyDiscriminatorMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyHolder.java
index c9895adb954b..ad9f26856a65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java
index 4595fb2fa7f6..54943a0a0cff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
@@ -51,19 +49,19 @@ public PropertyList(String name) {
 	@AnyDiscriminatorValue( discriminator = "I", entity = IntegerProperty.class)
 	@AnyDiscriminatorValue( discriminator = "S", entity = StringProperty.class)
 	@AnyDiscriminatorValue( discriminator = "L", entity = LongProperty.class)
-    @Cascade( { CascadeType.ALL })
-    @JoinTable(name = "list_properties",
+	@Cascade( { CascadeType.ALL })
+	@JoinTable(name = "list_properties",
 			joinColumns = @JoinColumn(name = "obj_id"),
 			inverseJoinColumns = @JoinColumn(name = "property_id")
 	)
-    @OrderColumn(name = "prop_index")
-    public List getGeneralProperties() {
-        return generalProperties;
-    }
+	@OrderColumn(name = "prop_index")
+	public List getGeneralProperties() {
+		return generalProperties;
+	}
 
-    public void setGeneralProperties(List generalProperties) {
-        this.generalProperties = generalProperties;
-    }
+	public void setGeneralProperties(List generalProperties) {
+		this.generalProperties = generalProperties;
+	}
 
 	@Id
 	@GeneratedValue
@@ -83,7 +81,7 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-    @Any
+	@Any
 	@Column(name = "property_type")
 	@JoinColumn(name = "property_id")
 	@AnyKeyJavaClass( Integer.class )
@@ -93,8 +91,8 @@ public void setName(String name) {
 	@AnyDiscriminatorValue( discriminator = "L", entity = LongProperty.class)
 	@Cascade( CascadeType.ALL )
 	public T getSomeProperty() {
-        return someProperty;
-    }
+		return someProperty;
+	}
 
 	public void setSomeProperty(T someProperty) {
 		this.someProperty = someProperty;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java
index 465ca31995db..78fd4b6ac37f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java
index b3d2bc565787..24a6b4fad8ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java
index 981936dcd489..1e52a55591ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.annotations;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Address.java
index acfc6b782639..04d3ee95df44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java
index 783b6f980ae0..0cee9c869a0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java
index 2c4a82e2d60b..1d9836e439ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java
index 0bbb2b0b1d9c..3c53ddbec6c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/ComplexPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/ComplexPropertyValue.java
index 8049b5978b5c..4e50c44fe34f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/ComplexPropertyValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/ComplexPropertyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/IntegerPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/IntegerPropertyValue.java
index 91758cdcea42..c4ad3a82f9c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/IntegerPropertyValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/IntegerPropertyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Person.java
index 75f4d5d98d8a..f6db49828535 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertySet.java
index 688ce8ffd694..2ed05bca275c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertySet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertySet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertyValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertyValue.java
index eaeda10762b9..866127f4ac6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertyValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/PropertyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/StringPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/StringPropertyValue.java
index 7c6fcf5e1d44..1401242413ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/StringPropertyValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/StringPropertyValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.any.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java
index 0eab57aee05c..ecd6432876c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java
index df1676a439a4..094bf912974e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java
index 718b840f6ff5..782758b38b4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: B.java 6527 2005-04-26 16:58:52Z oneovthafew $
 package org.hibernate.orm.test.array;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/DateArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/DateArrayTest.java
index 658c8f66391c..13b8ef75fd8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/array/DateArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/array/DateArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.array;
 
@@ -17,8 +15,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 public class DateArrayTest extends BaseCoreFunctionalTestCase {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/BidirectionalTwoOneToManyMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/BidirectionalTwoOneToManyMapsIdTest.java
index 3d4badec699c..32ab24afa1d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/BidirectionalTwoOneToManyMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/BidirectionalTwoOneToManyMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/CompositeIdAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/CompositeIdAssociationTest.java
index dfb75633a19c..54b4fc524bdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/CompositeIdAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/CompositeIdAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java
index a59c4209f548..c3dfb3dedcaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierTest.java
index 0ff0775f91d0..99187639fd0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/DerivedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
index 7a40a838f97f..4610976a5b27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.associations;
 
 import jakarta.persistence.Entity;
@@ -13,19 +17,19 @@
 @DomainModel(annotatedClasses = {FieldWithUnderscoreTest.A.class, FieldWithUnderscoreTest.B.class})
 public class FieldWithUnderscoreTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inSession(s -> s.createSelectionQuery("from B join _a", B.class).getResultList());
-        scope.inSession(s -> s.createSelectionQuery("from B left join fetch _a", B.class).getResultList());
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inSession(s -> s.createSelectionQuery("from B join _a", B.class).getResultList());
+		scope.inSession(s -> s.createSelectionQuery("from B left join fetch _a", B.class).getResultList());
+	}
 
-    @Entity(name = "A")
-    static class A {
-        @Id Long _id;
+	@Entity(name = "A")
+	static class A {
+		@Id Long _id;
 
-    }
-    @Entity(name = "B")
-    static class B {
-        @Id Long _id;
-        @ManyToOne(fetch = FetchType.LAZY) A _a;
-    }
+	}
+	@Entity(name = "B")
+	static class B {
+		@Id Long _id;
+		@ManyToOne(fetch = FetchType.LAZY) A _a;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinColumnOrFormulaTest.java
index 26fdf569d6fd..cc19929a1c96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinColumnOrFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinColumnOrFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinFormulaTest.java
index 754f7142142f..fb2f00f267f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/JoinFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalTest.java
index 163f695d925e..260ecc5c255e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalWithLinkEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalWithLinkEntityTest.java
index 7747bdafc7ef..65812b0dcda2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalWithLinkEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyBidirectionalWithLinkEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyUnidirectionalTest.java
index 42f57d5a8821..57a72d590984 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyUnidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToManyUnidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneBidirectionalTest.java
index 9045421308cc..883045e708b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneBidirectionalTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.associations;
 
 import java.util.Arrays;
@@ -235,4 +239,3 @@ public void setName(String name) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneJoinTableTest.java
index 7b167f8eadd1..d38e65e46ce7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneJoinTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.associations;
 
 import jakarta.persistence.Entity;
@@ -13,36 +17,36 @@
 
 @SessionFactory
 @DomainModel(annotatedClasses =
-        {ManyToOneJoinTableTest.Book.class, ManyToOneJoinTableTest.Publisher.class, ManyToOneJoinTableTest.Company.class})
+		{ManyToOneJoinTableTest.Book.class, ManyToOneJoinTableTest.Publisher.class, ManyToOneJoinTableTest.Company.class})
 public class ManyToOneJoinTableTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inSession( s -> s.createSelectionQuery( "from Book join publisher", Object[].class ).getResultList() );
-        scope.inSession( s -> s.createSelectionQuery( "from Book join publisher join company", Object[].class ).getResultList() );
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inSession( s -> s.createSelectionQuery( "from Book join publisher", Object[].class ).getResultList() );
+		scope.inSession( s -> s.createSelectionQuery( "from Book join publisher join company", Object[].class ).getResultList() );
+	}
 
-    @Entity(name="Book")
-    static class Book {
-        @Id
-        @GeneratedValue
-        long id;
-        @ManyToOne
-        @JoinTable // no explicit table name!
-        Publisher publisher;
-    }
-    @Entity(name="Publisher")
-    static class Publisher {
-        @Id
-        @GeneratedValue
-        long id;
-        @OneToOne
-        @JoinTable // no explicit table name!
-        Company company;
-    }
-    @Entity(name="Company")
-    static class Company {
-        @Id
-        @GeneratedValue
-        long id;
-    }
+	@Entity(name="Book")
+	static class Book {
+		@Id
+		@GeneratedValue
+		long id;
+		@ManyToOne
+		@JoinTable // no explicit table name!
+		Publisher publisher;
+	}
+	@Entity(name="Publisher")
+	static class Publisher {
+		@Id
+		@GeneratedValue
+		long id;
+		@OneToOne
+		@JoinTable // no explicit table name!
+		Company company;
+	}
+	@Entity(name="Company")
+	static class Company {
+		@Id
+		@GeneratedValue
+		long id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneTest.java
index 17ede96ad87f..d44d18d1cc8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/NotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/NotFoundTest.java
index 131bd552277d..3127e2fcd359 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/NotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/NotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.associations;
 
 import java.io.Serializable;
@@ -14,8 +18,6 @@
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.Jpa;
 
 import org.junit.jupiter.api.AfterEach;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyBidirectionalTest.java
index 703e7a9ea899..05db8bacd0af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyUnidirectionalTest.java
index fc5a2a99d5d1..59ef7a54a1bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyUnidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToManyUnidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalLazyTest.java
index 5a31dd499391..45fa20982f7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
@@ -34,9 +32,9 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testLifecycle() {
-		
+
 	}
-	
+
 	//tag::associations-one-to-one-bidirectional-lazy-example[]
 	@Entity(name = "Phone")
 	public static class Phone {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalTest.java
index 1eae7522378c..f6e21ce6c11f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneMapsIdTest.java
index 4445f0b1a0cf..5087e34bb777 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneMapsIdTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOnePrimaryKeyJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOnePrimaryKeyJoinColumnTest.java
index a9a724042e18..0b507c94bda6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOnePrimaryKeyJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOnePrimaryKeyJoinColumnTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.PrimaryKeyJoinColumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneUnidirectionalTest.java
index 715b120d69dc..eb412b5cdf0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneUnidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/OneToOneUnidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/UnidirectionalManyToManyRemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/UnidirectionalManyToManyRemoveTest.java
index 2660deb1bcef..0605120788d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/UnidirectionalManyToManyRemoveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/UnidirectionalManyToManyRemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyBidirectionalTest.java
index 8626ba817e61..bda7419e9c27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyTest.java
index a980a7a8d668..a3c05e13cf9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/AnyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -18,84 +16,84 @@
  */
 public class AnyTest extends BaseCoreFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            IntegerProperty.class,
-            StringProperty.class,
-            PropertyHolder.class,
-            PropertyHolder2.class,
-        };
-    }
-
-    @Override
-    protected String[] getAnnotatedPackages() {
-        return new String[] {
-            getClass().getPackage().getName()
-        };
-    }
-
-    @Test
-    public void test() {
-
-        doInHibernate(this::sessionFactory, session -> {
-            //tag::associations-any-persist-example[]
-            IntegerProperty ageProperty = new IntegerProperty();
-            ageProperty.setId(1L);
-            ageProperty.setName("age");
-            ageProperty.setValue(23);
-
-            session.persist(ageProperty);
-
-            StringProperty nameProperty = new StringProperty();
-            nameProperty.setId(1L);
-            nameProperty.setName("name");
-            nameProperty.setValue("John Doe");
-
-            session.persist(nameProperty);
-
-            PropertyHolder namePropertyHolder = new PropertyHolder();
-            namePropertyHolder.setId(1L);
-            namePropertyHolder.setProperty(nameProperty);
-
-            session.persist(namePropertyHolder);
-            //end::associations-any-persist-example[]
-        });
-
-        doInHibernate(this::sessionFactory, session -> {
-            //tag::associations-any-query-example[]
-            PropertyHolder propertyHolder = session.get(PropertyHolder.class, 1L);
-
-            assertEquals("name", propertyHolder.getProperty().getName());
-            assertEquals("John Doe", propertyHolder.getProperty().getValue());
-            //end::associations-any-query-example[]
-        });
-    }
-
-
-    @Test
-    @Jira( "https://hibernate.atlassian.net/browse/HHH-16938" )
-    public void testMetaAnnotated() {
-        doInHibernate( this::sessionFactory, session -> {
-            final StringProperty nameProperty = new StringProperty();
-            nameProperty.setId( 2L );
-            nameProperty.setName( "name2" );
-            nameProperty.setValue( "Mario Rossi" );
-            session.persist( nameProperty );
-            final PropertyHolder2 namePropertyHolder = new PropertyHolder2();
-            namePropertyHolder.setId( 2L );
-            namePropertyHolder.setProperty( nameProperty );
-            session.persist( namePropertyHolder );
-        } );
-        doInHibernate( this::sessionFactory, session -> {
-            final PropertyHolder2 propertyHolder = session.get( PropertyHolder2.class, 2L );
-            assertEquals( "name2", propertyHolder.getProperty().getName() );
-            assertEquals( "Mario Rossi", propertyHolder.getProperty().getValue() );
-            final String propertyType = (String) session.createNativeQuery(
-                    "select property_type from property_holder2",
-                    String.class
-            ).getSingleResult();
-            assertEquals( "S", propertyType );
-        } );
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			IntegerProperty.class,
+			StringProperty.class,
+			PropertyHolder.class,
+			PropertyHolder2.class,
+		};
+	}
+
+	@Override
+	protected String[] getAnnotatedPackages() {
+		return new String[] {
+			getClass().getPackage().getName()
+		};
+	}
+
+	@Test
+	public void test() {
+
+		doInHibernate(this::sessionFactory, session -> {
+			//tag::associations-any-persist-example[]
+			IntegerProperty ageProperty = new IntegerProperty();
+			ageProperty.setId(1L);
+			ageProperty.setName("age");
+			ageProperty.setValue(23);
+
+			session.persist(ageProperty);
+
+			StringProperty nameProperty = new StringProperty();
+			nameProperty.setId(1L);
+			nameProperty.setName("name");
+			nameProperty.setValue("John Doe");
+
+			session.persist(nameProperty);
+
+			PropertyHolder namePropertyHolder = new PropertyHolder();
+			namePropertyHolder.setId(1L);
+			namePropertyHolder.setProperty(nameProperty);
+
+			session.persist(namePropertyHolder);
+			//end::associations-any-persist-example[]
+		});
+
+		doInHibernate(this::sessionFactory, session -> {
+			//tag::associations-any-query-example[]
+			PropertyHolder propertyHolder = session.get(PropertyHolder.class, 1L);
+
+			assertEquals("name", propertyHolder.getProperty().getName());
+			assertEquals("John Doe", propertyHolder.getProperty().getValue());
+			//end::associations-any-query-example[]
+		});
+	}
+
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-16938" )
+	public void testMetaAnnotated() {
+		doInHibernate( this::sessionFactory, session -> {
+			final StringProperty nameProperty = new StringProperty();
+			nameProperty.setId( 2L );
+			nameProperty.setName( "name2" );
+			nameProperty.setValue( "Mario Rossi" );
+			session.persist( nameProperty );
+			final PropertyHolder2 namePropertyHolder = new PropertyHolder2();
+			namePropertyHolder.setId( 2L );
+			namePropertyHolder.setProperty( nameProperty );
+			session.persist( namePropertyHolder );
+		} );
+		doInHibernate( this::sessionFactory, session -> {
+			final PropertyHolder2 propertyHolder = session.get( PropertyHolder2.class, 2L );
+			assertEquals( "name2", propertyHolder.getProperty().getName() );
+			assertEquals( "Mario Rossi", propertyHolder.getProperty().getValue() );
+			final String propertyType = (String) session.createNativeQuery(
+					"select property_type from property_holder2",
+					String.class
+			).getSingleResult();
+			assertEquals( "S", propertyType );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/IntegerProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/IntegerProperty.java
index 1f9ee3844aa3..186becbaf651 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/IntegerProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/IntegerProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -17,44 +15,43 @@
 @Table(name="integer_property")
 public class IntegerProperty implements Property {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Column(name = "`name`")
-    private String name;
+	@Column(name = "`name`")
+	private String name;
 
-    @Column(name = "`value`")
-    private Integer value;
+	@Column(name = "`value`")
+	private Integer value;
 
-    @Override
-    public String getName() {
-        return name;
-    }
+	@Override
+	public String getName() {
+		return name;
+	}
 
-    @Override
-    public Integer getValue() {
-        return value;
-    }
+	@Override
+	public Integer getValue() {
+		return value;
+	}
 
-    //Getters and setters omitted for brevity
+	//Getters and setters omitted for brevity
 //end::associations-any-property-example[]
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public void setValue(Integer value) {
-        this.value = value;
-    }
+	public void setValue(Integer value) {
+		this.value = value;
+	}
 //tag::associations-any-property-example[]
 }
 //end::associations-any-property-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyMergeTest.java
index 1615b9c5adf3..8865b78c9ce9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
index 39b4e29d9a2b..9609efe7f8c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.associations.any;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyTest.java
index c2bad8c30234..73fce219bf77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -18,63 +16,63 @@
  */
 public class ManyToAnyTest extends BaseCoreFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            IntegerProperty.class,
-            StringProperty.class,
-            PropertyRepository.class
-        };
-    }
-
-    @Override
-    protected String[] getAnnotatedPackages() {
-        return new String[] {
-            getClass().getPackage().getName()
-        };
-    }
-
-    @Test
-    public void test() {
-
-        doInHibernate(this::sessionFactory, session -> {
-            //tag::associations-many-to-any-persist-example[]
-            IntegerProperty ageProperty = new IntegerProperty();
-            ageProperty.setId(1L);
-            ageProperty.setName("age");
-            ageProperty.setValue(23);
-
-            session.persist(ageProperty);
-
-            StringProperty nameProperty = new StringProperty();
-            nameProperty.setId(1L);
-            nameProperty.setName("name");
-            nameProperty.setValue("John Doe");
-
-            session.persist(nameProperty);
-
-            PropertyRepository propertyRepository = new PropertyRepository();
-            propertyRepository.setId(1L);
-
-            propertyRepository.getProperties().add(ageProperty);
-            propertyRepository.getProperties().add(nameProperty);
-
-            session.persist(propertyRepository);
-            //end::associations-many-to-any-persist-example[]
-        });
-
-        doInHibernate(this::sessionFactory, session -> {
-            //tag::associations-many-to-any-query-example[]
-            PropertyRepository propertyRepository = session.get(PropertyRepository.class, 1L);
-
-            assertEquals(2, propertyRepository.getProperties().size());
-
-            for(Property property : propertyRepository.getProperties()) {
-                assertNotNull(property.getValue());
-            }
-            //end::associations-many-to-any-query-example[]
-        });
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			IntegerProperty.class,
+			StringProperty.class,
+			PropertyRepository.class
+		};
+	}
+
+	@Override
+	protected String[] getAnnotatedPackages() {
+		return new String[] {
+			getClass().getPackage().getName()
+		};
+	}
+
+	@Test
+	public void test() {
+
+		doInHibernate(this::sessionFactory, session -> {
+			//tag::associations-many-to-any-persist-example[]
+			IntegerProperty ageProperty = new IntegerProperty();
+			ageProperty.setId(1L);
+			ageProperty.setName("age");
+			ageProperty.setValue(23);
+
+			session.persist(ageProperty);
+
+			StringProperty nameProperty = new StringProperty();
+			nameProperty.setId(1L);
+			nameProperty.setName("name");
+			nameProperty.setValue("John Doe");
+
+			session.persist(nameProperty);
+
+			PropertyRepository propertyRepository = new PropertyRepository();
+			propertyRepository.setId(1L);
+
+			propertyRepository.getProperties().add(ageProperty);
+			propertyRepository.getProperties().add(nameProperty);
+
+			session.persist(propertyRepository);
+			//end::associations-many-to-any-persist-example[]
+		});
+
+		doInHibernate(this::sessionFactory, session -> {
+			//tag::associations-many-to-any-query-example[]
+			PropertyRepository propertyRepository = session.get(PropertyRepository.class, 1L);
+
+			assertEquals(2, propertyRepository.getProperties().size());
+
+			for(Property property : propertyRepository.getProperties()) {
+				assertNotNull(property.getValue());
+			}
+			//end::associations-many-to-any-query-example[]
+		});
+	}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/Property.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/Property.java
index 0ce013e981ff..041fc4dbc2a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/Property.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/Property.java
@@ -1,16 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
 //tag::associations-any-property-example[]
 public interface Property {
 
-    String getName();
+	String getName();
 
-    T getValue();
+	T getValue();
 }
 //end::associations-any-property-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyDiscriminationDef.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyDiscriminationDef.java
index 93426205d6a0..e7f1a79cabf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyDiscriminationDef.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyDiscriminationDef.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder.java
index 2aa5a9920bac..20bd18dee6b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -23,36 +21,36 @@
 @Table(name = "property_holder")
 public class PropertyHolder {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Any
-    @AnyDiscriminator(DiscriminatorType.STRING)
-    @AnyDiscriminatorValue(discriminator = "S", entity = StringProperty.class)
-    @AnyDiscriminatorValue(discriminator = "I", entity = IntegerProperty.class)
-    @AnyKeyJavaClass(Long.class)
-    @Column(name = "property_type")
-    @JoinColumn(name = "property_id")
-    private Property property;
+	@Any
+	@AnyDiscriminator(DiscriminatorType.STRING)
+	@AnyDiscriminatorValue(discriminator = "S", entity = StringProperty.class)
+	@AnyDiscriminatorValue(discriminator = "I", entity = IntegerProperty.class)
+	@AnyKeyJavaClass(Long.class)
+	@Column(name = "property_type")
+	@JoinColumn(name = "property_id")
+	private Property property;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::associations-any-example[]
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Property getProperty() {
-        return property;
-    }
+	public Property getProperty() {
+		return property;
+	}
 
-    public void setProperty(Property property) {
-        this.property = property;
-    }
+	public void setProperty(Property property) {
+		this.property = property;
+	}
 //tag::associations-any-example[]
 }
 //end::associations-any-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder2.java
index e036460a564d..ff5c9d19fcd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyHolder2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -19,33 +17,33 @@
 @Table(name = "property_holder2")
 public class PropertyHolder2 {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Any
-    @PropertyDiscriminationDef
-    @Column(name = "property_type")
-    @JoinColumn(name = "property_id")
-    private Property property;
+	@Any
+	@PropertyDiscriminationDef
+	@Column(name = "property_type")
+	@JoinColumn(name = "property_id")
+	private Property property;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::associations-any-def-example[]
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Property getProperty() {
-        return property;
-    }
+	public Property getProperty() {
+		return property;
+	}
 
-    public void setProperty(Property property) {
-        this.property = property;
-    }
+	public void setProperty(Property property) {
+		this.property = property;
+	}
 //tag::associations-any-def-example[]
 }
 //end::associations-any-def-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyRepository.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyRepository.java
index 1362e9c9c2a0..a5f57192c2d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyRepository.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/PropertyRepository.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -29,37 +27,37 @@
 @Table(name = "property_repository")
 public class PropertyRepository {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @ManyToAny
-    @AnyDiscriminator(DiscriminatorType.STRING)
-    @Column(name = "property_type")
-    @AnyKeyJavaClass(Long.class)
-    @AnyDiscriminatorValue(discriminator = "S", entity = StringProperty.class)
-    @AnyDiscriminatorValue(discriminator = "I", entity = IntegerProperty.class)
-    @Cascade(ALL)
-    @JoinTable(name = "repository_properties",
-            joinColumns = @JoinColumn(name = "repository_id"),
-            inverseJoinColumns = @JoinColumn(name = "property_id")
-   )
-    private List> properties = new ArrayList<>();
+	@ManyToAny
+	@AnyDiscriminator(DiscriminatorType.STRING)
+	@Column(name = "property_type")
+	@AnyKeyJavaClass(Long.class)
+	@AnyDiscriminatorValue(discriminator = "S", entity = StringProperty.class)
+	@AnyDiscriminatorValue(discriminator = "I", entity = IntegerProperty.class)
+	@Cascade(ALL)
+	@JoinTable(name = "repository_properties",
+			joinColumns = @JoinColumn(name = "repository_id"),
+			inverseJoinColumns = @JoinColumn(name = "property_id")
+)
+	private List> properties = new ArrayList<>();
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::associations-many-to-any-example[]
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public List> getProperties() {
-        return properties;
-    }
+	public List> getProperties() {
+		return properties;
+	}
 
-    //tag::associations-many-to-any-example[]
+	//tag::associations-many-to-any-example[]
 }
 //end::associations-many-to-any-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/StringProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/StringProperty.java
index 424b1a089d6c..8896805eaea4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/StringProperty.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/StringProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.associations.any;
 
@@ -17,43 +15,43 @@
 @Table(name="string_property")
 public class StringProperty implements Property {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Column(name = "`name`")
-    private String name;
+	@Column(name = "`name`")
+	private String name;
 
-    @Column(name = "`value`")
-    private String value;
+	@Column(name = "`value`")
+	private String value;
 
-    @Override
-    public String getName() {
-        return name;
-    }
+	@Override
+	public String getName() {
+		return name;
+	}
 
-    @Override
-    public String getValue() {
-        return value;
-    }
+	@Override
+	public String getValue() {
+		return value;
+	}
 
-    //Getters and setters omitted for brevity
+	//Getters and setters omitted for brevity
 //end::associations-any-property-example[]
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public void setValue(String value) {
-        this.value = value;
-    }
+	public void setValue(String value) {
+		this.value = value;
+	}
 //tag::associations-any-property-example[]
 }
 //end::associations-any-property-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndBagCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndBagCollectionTest.java
index f56b0537baa0..97fd4d625eb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndBagCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndBagCollectionTest.java
@@ -1,161 +1,150 @@
-/*
- * Copyright 2014 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.hibernate.orm.test.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@DomainModel(
-		annotatedClasses = {
-				BatchAndBagCollectionTest.EntityA.class,
-				BatchAndBagCollectionTest.EntityB.class
-		}
-)
-@ServiceRegistry(
-		settings = {
-				@Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "10")
-		}
-)
-@SessionFactory
-@JiraKey("HHH-16570")
-public class BatchAndBagCollectionTest {
-
-	@BeforeAll
-	public void setUp(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					EntityA entityA = new EntityA( 1 );
-					EntityA childA1 = new EntityA( 2 );
-					EntityA childA2 = new EntityA( 3 );
-
-					EntityB entityB1 = new EntityB();
-					EntityB entityB2 = new EntityB();
-					EntityB entityB3 = new EntityB();
-
-					entityA.addChild( childA1 );
-					entityA.addChild( childA2 );
-
-					childA1.setListOfEntitiesB( List.of( entityB1, entityB2, entityB3 ) );
-
-					session.persist( entityA );
-					session.persist( childA1 );
-					session.persist( childA2 );
-					session.persist( entityB1 );
-					session.persist( entityB2 );
-					session.persist( entityB3 );
-				}
-		);
-
-	}
-
-	@Test
-	public void testOneToManyHasCorrectSize(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					List entitiesA = session.createQuery(
-									"select a from EntityA a where a.parent is null",
-									EntityA.class
-							)
-							.getResultList();
-					assertThat( entitiesA ).hasSize( 1 );
-					EntityA entityA = entitiesA.get( 0 );
-					assertThat( entityA.getId() ).isEqualTo( 1 );
-					assertThat( entityA.getChildren() ).hasSize( 2 );
-				}
-		);
-	}
-
-	@Entity(name = "EntityA")
-	@Table(name = "ENTITY_A")
-	public static class EntityA {
-		@Id
-		Integer id;
-
-		String name;
-
-		@ManyToOne
-		EntityA parent;
-
-		@OneToMany(mappedBy = "parent")
-		List children = new ArrayList<>();
-
-		@OneToMany
-		@Fetch(FetchMode.JOIN)
-		List listOfEntitiesB = new ArrayList<>();
-
-		public EntityA() {
-		}
-
-		public EntityA(Integer id) {
-			this.id = id;
-		}
-
-		public Integer getId() {
-			return id;
-		}
-
-		public List getChildren() {
-			return children;
-		}
-
-		public void setChildren(List children) {
-			this.children = children;
-		}
-
-		public void setListOfEntitiesB(List listOfEntitiesB) {
-			this.listOfEntitiesB = listOfEntitiesB;
-		}
-
-		public void addChild(EntityA childA) {
-			children.add( childA );
-			childA.parent = this;
-		}
-	}
-
-	@Entity(name = "EntityB")
-	@Table(name = "ENTITY_B")
-	public static class EntityB {
-		@Id
-		@GeneratedValue
-		@Column(name = "ID")
-		Integer id;
-
-		String name;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(
+		annotatedClasses = {
+				BatchAndBagCollectionTest.EntityA.class,
+				BatchAndBagCollectionTest.EntityB.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "10")
+		}
+)
+@SessionFactory
+@JiraKey("HHH-16570")
+public class BatchAndBagCollectionTest {
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					EntityA entityA = new EntityA( 1 );
+					EntityA childA1 = new EntityA( 2 );
+					EntityA childA2 = new EntityA( 3 );
+
+					EntityB entityB1 = new EntityB();
+					EntityB entityB2 = new EntityB();
+					EntityB entityB3 = new EntityB();
+
+					entityA.addChild( childA1 );
+					entityA.addChild( childA2 );
+
+					childA1.setListOfEntitiesB( List.of( entityB1, entityB2, entityB3 ) );
+
+					session.persist( entityA );
+					session.persist( childA1 );
+					session.persist( childA2 );
+					session.persist( entityB1 );
+					session.persist( entityB2 );
+					session.persist( entityB3 );
+				}
+		);
+
+	}
+
+	@Test
+	public void testOneToManyHasCorrectSize(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					List entitiesA = session.createQuery(
+									"select a from EntityA a where a.parent is null",
+									EntityA.class
+							)
+							.getResultList();
+					assertThat( entitiesA ).hasSize( 1 );
+					EntityA entityA = entitiesA.get( 0 );
+					assertThat( entityA.getId() ).isEqualTo( 1 );
+					assertThat( entityA.getChildren() ).hasSize( 2 );
+				}
+		);
+	}
+
+	@Entity(name = "EntityA")
+	@Table(name = "ENTITY_A")
+	public static class EntityA {
+		@Id
+		Integer id;
+
+		String name;
+
+		@ManyToOne
+		EntityA parent;
+
+		@OneToMany(mappedBy = "parent")
+		List children = new ArrayList<>();
+
+		@OneToMany
+		@Fetch(FetchMode.JOIN)
+		List listOfEntitiesB = new ArrayList<>();
+
+		public EntityA() {
+		}
+
+		public EntityA(Integer id) {
+			this.id = id;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public List getChildren() {
+			return children;
+		}
+
+		public void setChildren(List children) {
+			this.children = children;
+		}
+
+		public void setListOfEntitiesB(List listOfEntitiesB) {
+			this.listOfEntitiesB = listOfEntitiesB;
+		}
+
+		public void addChild(EntityA childA) {
+			children.add( childA );
+			childA.parent = this;
+		}
+	}
+
+	@Entity(name = "EntityB")
+	@Table(name = "ENTITY_B")
+	public static class EntityB {
+		@Id
+		@GeneratedValue
+		@Column(name = "ID")
+		Integer id;
+
+		String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java
index 22366849f3a7..378e607eabf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdCollectionTest.java
index ad13aa9cfbb1..2e0c0fa3357c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java
index a64e444d6065..5c3c13a989a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java
index 0d7c2880f73c..1e1cc66d25de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java
index 03391231dd82..d9208bfbbea9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java
@@ -1,12 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
-import org.hibernate.DuplicateMappingException;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.cfg.AvailableSettings;
@@ -27,7 +29,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java
index d76e0c4afe6a..bfce7fb62b4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEnumIdTest.java
index 3aadd3e5337a..52f8b3ca37ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEnumIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEnumIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java
index 8594ea49e63f..99becda85d3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithDisabledProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithDisabledProxyTest.java
index 60abd0921443..f0a48710218e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithDisabledProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithDisabledProxyTest.java
@@ -1,183 +1,186 @@
-package org.hibernate.orm.test.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@SessionFactory
-@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
-@DomainModel(annotatedClasses = {
-		BatchEntityWithDisabledProxyTest.Order.class,
-		BatchEntityWithDisabledProxyTest.Product.class,
-})
-@JiraKey("HHH-16890")
-public class BatchEntityWithDisabledProxyTest {
-
-	@BeforeAll
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-
-		order.addProduct( cheese1 );
-		order.addProduct( cheese2 );
-
-		cheese1.setBestCheese( cheese1 );
-		cheese2.setBestCheese( cheese1 );
-		cheese3.setBestCheese( cheese1 );
-
-		cheese1.setReplacement( cheese2 );
-		cheese2.setReplacement( cheese1 );
-		cheese3.setReplacement( cheese1 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-		} );
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Order o = s.get( Order.class, 1 );
-
-			assertEquals( 2, o.getProducts().size() );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Product.class );
-			Root root = cr.from( Product.class );
-			CriteriaQuery query = cr.select( root );
-
-			List products = s.createQuery( query ).getResultList();
-
-			assertEquals( 3, products.size() );
-		} );
-	}
-
-	@Test
-	@JiraKey("HHH-16966")
-	public void testGetReference(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product = s.getReference( Product.class, 3 );
-			assertFalse( Hibernate.isInitialized( product) );
-
-			Hibernate.initialize( product );
-
-			assertTrue( Hibernate.isInitialized( product) );
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@OneToMany
-		List products = new ArrayList<>();
-
-		public List getProducts() {
-			return products;
-		}
-
-		public void addProduct(Product product) {
-			this.products.add( product );
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-		@ManyToOne(fetch = FetchType.LAZY)
-		@Fetch(FetchMode.SELECT)
-		Product replacement;
-
-		@ManyToOne(fetch = FetchType.LAZY)
-		@Fetch(FetchMode.SELECT)
-		Product bestCheese;
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		public Product getReplacement() {
-			return replacement;
-		}
-
-		public void setReplacement(Product replacement) {
-			this.replacement = replacement;
-		}
-
-		public Product getBestCheese() {
-			return bestCheese;
-		}
-
-		public void setBestCheese(Product bestCheese) {
-			this.bestCheese = bestCheese;
-		}
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
+@DomainModel(annotatedClasses = {
+		BatchEntityWithDisabledProxyTest.Order.class,
+		BatchEntityWithDisabledProxyTest.Product.class,
+})
+@JiraKey("HHH-16890")
+public class BatchEntityWithDisabledProxyTest {
+
+	@BeforeAll
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+
+		order.addProduct( cheese1 );
+		order.addProduct( cheese2 );
+
+		cheese1.setBestCheese( cheese1 );
+		cheese2.setBestCheese( cheese1 );
+		cheese3.setBestCheese( cheese1 );
+
+		cheese1.setReplacement( cheese2 );
+		cheese2.setReplacement( cheese1 );
+		cheese3.setReplacement( cheese1 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+		} );
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Order o = s.get( Order.class, 1 );
+
+			assertEquals( 2, o.getProducts().size() );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Product.class );
+			Root root = cr.from( Product.class );
+			CriteriaQuery query = cr.select( root );
+
+			List products = s.createQuery( query ).getResultList();
+
+			assertEquals( 3, products.size() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16966")
+	public void testGetReference(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product = s.getReference( Product.class, 3 );
+			assertFalse( Hibernate.isInitialized( product) );
+
+			Hibernate.initialize( product );
+
+			assertTrue( Hibernate.isInitialized( product) );
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@OneToMany
+		List products = new ArrayList<>();
+
+		public List getProducts() {
+			return products;
+		}
+
+		public void addProduct(Product product) {
+			this.products.add( product );
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@Fetch(FetchMode.SELECT)
+		Product replacement;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@Fetch(FetchMode.SELECT)
+		Product bestCheese;
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Product getReplacement() {
+			return replacement;
+		}
+
+		public void setReplacement(Product replacement) {
+			this.replacement = replacement;
+		}
+
+		public Product getBestCheese() {
+			return bestCheese;
+		}
+
+		public void setBestCheese(Product bestCheese) {
+			this.bestCheese = bestCheese;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithSubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithSubselectFetchTest.java
index 9e46c5e19b54..cd304f165c7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithSubselectFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchEntityWithSubselectFetchTest.java
@@ -1,181 +1,185 @@
-package org.hibernate.orm.test.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@SessionFactory
-@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
-@DomainModel(annotatedClasses = {
-		BatchEntityWithSubselectFetchTest.Order.class,
-		BatchEntityWithSubselectFetchTest.Product.class,
-})
-@JiraKey("HHH-16890")
-public class BatchEntityWithSubselectFetchTest {
-
-	@BeforeAll
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-
-		order.addProduct( cheese1 );
-		order.addProduct( cheese2 );
-
-		cheese1.setBestCheese( cheese1 );
-		cheese2.setBestCheese( cheese1 );
-
-		cheese1.setReplacement( cheese2 );
-		cheese2.setReplacement( cheese1 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-		} );
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Order o = s.get( Order.class, 1 );
-
-			assertEquals( 2, o.getProducts().size() );
-		} );
-	}
-
-	@Test
-	public void testGetProduct(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product3 = s.getReference( Product.class, 3l );
-			assertFalse( Hibernate.isInitialized( product3 ) );
-
-			Product product1 = s.get( Product.class, 1l );
-
-			assertThat( product1 ).isNotNull();
-			assertTrue( Hibernate.isInitialized( product3 ) );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Product.class );
-			Root root = cr.from( Product.class );
-			CriteriaQuery query = cr.select( root );
-
-			List products = s.createQuery( query ).getResultList();
-
-			assertEquals( 3, products.size() );
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@OneToMany
-		List products = new ArrayList<>();
-
-		public List getProducts() {
-			return products;
-		}
-
-		public void addProduct(Product product) {
-			this.products.add( product );
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-		@ManyToOne(fetch = FetchType.LAZY)
-		@Fetch(FetchMode.SELECT)
-		Product replacement;
-
-		@ManyToOne(fetch = FetchType.LAZY)
-		@Fetch(FetchMode.SELECT)
-		Product bestCheese;
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		public Product getReplacement() {
-			return replacement;
-		}
-
-		public void setReplacement(Product replacement) {
-			this.replacement = replacement;
-		}
-
-		public Product getBestCheese() {
-			return bestCheese;
-		}
-
-		public void setBestCheese(Product bestCheese) {
-			this.bestCheese = bestCheese;
-		}
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
+@DomainModel(annotatedClasses = {
+		BatchEntityWithSubselectFetchTest.Order.class,
+		BatchEntityWithSubselectFetchTest.Product.class,
+})
+@JiraKey("HHH-16890")
+public class BatchEntityWithSubselectFetchTest {
+
+	@BeforeAll
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+
+		order.addProduct( cheese1 );
+		order.addProduct( cheese2 );
+
+		cheese1.setBestCheese( cheese1 );
+		cheese2.setBestCheese( cheese1 );
+
+		cheese1.setReplacement( cheese2 );
+		cheese2.setReplacement( cheese1 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+		} );
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Order o = s.get( Order.class, 1 );
+
+			assertEquals( 2, o.getProducts().size() );
+		} );
+	}
+
+	@Test
+	public void testGetProduct(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product3 = s.getReference( Product.class, 3l );
+			assertFalse( Hibernate.isInitialized( product3 ) );
+
+			Product product1 = s.get( Product.class, 1l );
+
+			assertThat( product1 ).isNotNull();
+			assertTrue( Hibernate.isInitialized( product3 ) );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Product.class );
+			Root root = cr.from( Product.class );
+			CriteriaQuery query = cr.select( root );
+
+			List products = s.createQuery( query ).getResultList();
+
+			assertEquals( 3, products.size() );
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@OneToMany
+		List products = new ArrayList<>();
+
+		public List getProducts() {
+			return products;
+		}
+
+		public void addProduct(Product product) {
+			this.products.add( product );
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@Fetch(FetchMode.SELECT)
+		Product replacement;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@Fetch(FetchMode.SELECT)
+		Product bestCheese;
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Product getReplacement() {
+			return replacement;
+		}
+
+		public void setReplacement(Product replacement) {
+			this.replacement = replacement;
+		}
+
+		public Product getBestCheese() {
+			return bestCheese;
+		}
+
+		public void setBestCheese(Product bestCheese) {
+			this.bestCheese = bestCheese;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchFetchInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchFetchInstantiationTest.java
index c2d7916294d9..544c8bce7507 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchFetchInstantiationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchFetchInstantiationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchGeneratedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchGeneratedAssociationTest.java
index 691bdc379169..de9d3a9b37f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchGeneratedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchGeneratedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java
index ed0e65960436..99ea330224bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
index de01110f142f..b8014ce734ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
@@ -127,4 +125,3 @@ public static class Person {
 		private long version;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java
index f22d08ab3750..5d68aae2f502 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
index 3ba5280e5c8e..5e5571114e92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java
index 77b9486a6842..233dee43a020 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchRowCountWarningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSelectAndForceIncrementVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSelectAndForceIncrementVersionTest.java
index a6393c07e8e7..5a902264ca8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSelectAndForceIncrementVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSelectAndForceIncrementVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
@@ -155,4 +153,4 @@ public void setSearchProperty(String searchProperty) {
 			this.searchProperty = searchProperty;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java
index 735a1f6845ba..7f55d5371a6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
-import org.hibernate.Session;
 import org.hibernate.StatelessSession;
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
index cfe50487ecf4..67ff48b6a133 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection3Test.java
index 397cda48810e..a253e64e0eb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection3Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollectionTest.java
index 3313316f54c8..1f2589297119 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
index 9a9ccb944e8c..16e7282be798 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
@@ -125,4 +123,3 @@ public void doBatchInsertUpdate(int nEntities, int nBeforeFlush) {
 		s.close();
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java
index ec19963fec31..b9cdac8e93ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndJoinedInheritanceTest.java
index e507b2be54af..dc433c988e9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
index ca45f1cd20c7..c6d7d952ed38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchedMultiTableDynamicStatementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchedMultiTableDynamicStatementTests.java
index eef480d53768..999cc261d44e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchedMultiTableDynamicStatementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchedMultiTableDynamicStatementTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
@@ -13,7 +11,6 @@
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java
index e14525587d77..8774c9dde211 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java
index f7545f176dca..0a4ea5eed2ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
@@ -25,7 +23,6 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java
index 256da41fbef4..e06e3815672a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdAndElementCollectionBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdAndElementCollectionBatchingTest.java
index 8d077a249b51..c490beb5f6a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdAndElementCollectionBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdAndElementCollectionBatchingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdWithOneFieldAndElementCollectionBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdWithOneFieldAndElementCollectionBatchingTest.java
index af036e4734b2..c42497c204c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdWithOneFieldAndElementCollectionBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/CompositeIdWithOneFieldAndElementCollectionBatchingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java
index 42081f4e469b..d7d7b972e987 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DataPoint.java 4343 2004-08-16 11:46:19Z oneovthafew $
 package org.hibernate.orm.test.batch;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java
index f0c418868e37..05d084fdd4d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
index 6137dbdbdfd5..3df9445aeff5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableAndFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableAndFetchModeSelectTest.java
index 21ae4ad9c585..6740cc3df39e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableAndFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableAndFetchModeSelectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java
index 571b9ac1a69a..d27f584f54b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java
index 29b4abf1dde1..2147ff3e8c5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneBatchingTest.java
index fd51da209582..49825557c7e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneEmbeddedBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneEmbeddedBatchingTest.java
index 2221faf86f83..94ba418d2201 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneEmbeddedBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/InheritanceManyToOneEmbeddedBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
index a1748283fdf8..add9c19bff2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/ManyToOneBatchLoadErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/ManyToOneBatchLoadErrorTest.java
index 2501654c154b..6f5c5d436c68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/ManyToOneBatchLoadErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/ManyToOneBatchLoadErrorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/MultiKeyLoadSizingStrategyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/MultiKeyLoadSizingStrategyTests.java
index ebd180bb457f..c928b9714609 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/MultiKeyLoadSizingStrategyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/MultiKeyLoadSizingStrategyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java
index f1a00b8117e2..d6bb8309a981 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java
index c16de03fc725..197a2b4e55aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java
index e55cd6c569c7..6f91e46ce344 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SetAndBagCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SetAndBagCollectionTest.java
index adb41137bc13..5d1f3131eff5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SetAndBagCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SetAndBagCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SubselectTest.java
index 6bbb074ee275..d9fc774c9b8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/SubselectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batch;
 
 import java.util.ArrayList;
@@ -18,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/A.java
index 67bda0bf06fd..12e9dadc6a1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
@@ -13,42 +11,42 @@
 
 @Entity
 public class A {
-  @Id
-  private Integer id;
+@Id
+private Integer id;
 
-  private String otherProperty;
+private String otherProperty;
 
-  @OneToOne(fetch = FetchType.LAZY)
-  private B b;
+@OneToOne(fetch = FetchType.LAZY)
+private B b;
 
-  public A() {
-  }
+public A() {
+}
 
-  public A(Integer id) {
-    this.id = id;
-  }
+public A(Integer id) {
+	this.id = id;
+}
 
-  public Integer getId() {
-    return id;
-  }
+public Integer getId() {
+	return id;
+}
 
-  public void setId(Integer id) {
-    this.id = id;
-  }
+public void setId(Integer id) {
+	this.id = id;
+}
 
-  public String getOtherProperty() {
-    return otherProperty;
-  }
+public String getOtherProperty() {
+	return otherProperty;
+}
 
-  public void setOtherProperty(String otherProperty) {
-    this.otherProperty = otherProperty;
-  }
+public void setOtherProperty(String otherProperty) {
+	this.otherProperty = otherProperty;
+}
 
-  public B getB() {
-    return b;
-  }
+public B getB() {
+	return b;
+}
 
-  public void setB(B b) {
-    this.b = b;
-  }
+public void setB(B b) {
+	this.b = b;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/B.java
index 60368d030946..b8aa68f34c0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
@@ -17,43 +15,43 @@
 @BatchSize(size = 1000)
 public class B {
 
-  @Id
-  private Integer idPart1;
+@Id
+private Integer idPart1;
 
-  @Id
-  private Integer idPart2;
+@Id
+private Integer idPart2;
 
-  private String otherProperty;
+private String otherProperty;
 
-  public B() {
-  }
+public B() {
+}
 
-  public B(Integer idPart1, Integer idPart2) {
-    this.idPart1 = idPart1;
-    this.idPart2 = idPart2;
-  }
+public B(Integer idPart1, Integer idPart2) {
+	this.idPart1 = idPart1;
+	this.idPart2 = idPart2;
+}
 
-  public Integer getIdPart1() {
-    return idPart1;
-  }
+public Integer getIdPart1() {
+	return idPart1;
+}
 
-  public void setIdPart1(Integer idPart1) {
-    this.idPart1 = idPart1;
-  }
+public void setIdPart1(Integer idPart1) {
+	this.idPart1 = idPart1;
+}
 
-  public Integer getIdPart2() {
-    return idPart2;
-  }
+public Integer getIdPart2() {
+	return idPart2;
+}
 
-  public void setIdPart2(Integer idPart2) {
-    this.idPart2 = idPart2;
-  }
+public void setIdPart2(Integer idPart2) {
+	this.idPart2 = idPart2;
+}
 
-  public String getOtherProperty() {
-    return otherProperty;
-  }
+public String getOtherProperty() {
+	return otherProperty;
+}
 
-  public void setOtherProperty(String otherProperty) {
-    this.otherProperty = otherProperty;
-  }
+public void setOtherProperty(String otherProperty) {
+	this.otherProperty = otherProperty;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BId.java
index 6bd424bea54f..f0ecdaf12a2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BId.java
@@ -1,46 +1,44 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
 import java.io.Serializable;
 
 public class BId
-    implements Serializable {
-  private static final long serialVersionUID = 1L;
+	implements Serializable {
+private static final long serialVersionUID = 1L;
 
-  private Integer idPart1;
-  private Integer idPart2;
+private Integer idPart1;
+private Integer idPart2;
 
-  public BId() {
-  }
+public BId() {
+}
 
-  public BId(Integer idPart1, Integer idPart2) {
-    this.idPart1 = idPart1;
-    this.idPart2 = idPart2;
-  }
+public BId(Integer idPart1, Integer idPart2) {
+	this.idPart1 = idPart1;
+	this.idPart2 = idPart2;
+}
 
-  public Integer getIdPart1() {
-    return idPart1;
-  }
+public Integer getIdPart1() {
+	return idPart1;
+}
 
-  public void setIdPart1(Integer idPart1) {
-    this.idPart1 = idPart1;
-  }
+public void setIdPart1(Integer idPart1) {
+	this.idPart1 = idPart1;
+}
 
-  public Integer getIdPart2() {
-    return idPart2;
-  }
+public Integer getIdPart2() {
+	return idPart2;
+}
 
-  public void setIdPart2(Integer idPart2) {
-    this.idPart2 = idPart2;
-  }
+public void setIdPart2(Integer idPart2) {
+	this.idPart2 = idPart2;
+}
 
-  @Override
-  public String toString() {
-    return "BId (" + idPart1 + ", " + idPart2 + ")";
-  }
+@Override
+public String toString() {
+	return "BId (" + idPart1 + ", " + idPart2 + ")";
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchBootstrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchBootstrapTest.java
index 11e014c31d42..c4ffbc650620 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchBootstrapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchBootstrapTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batchfetch;
 
 import java.util.LinkedHashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java
index 967c468caf85..b91c41e7ddf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
@@ -34,7 +32,6 @@
 import jakarta.persistence.OneToOne;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java
index 2fc2d05b4827..367a105f20ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchRefreshTest.java
index 6c92c7374186..2165be87b375 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchRefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchRefreshTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchStrategyLoadingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchStrategyLoadingTests.java
index 2a9b55720cd6..44d61dfe57b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchStrategyLoadingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchStrategyLoadingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
@@ -94,9 +92,9 @@ public void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "Thing1" )
 	@Table( name = "Thing1" )
 	public static class Thing1 {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@ManyToOne
 		@JoinColumn( name = "thing2_fk" )
@@ -137,9 +135,9 @@ public void setThing2(Thing2 thing2) {
 	@Table( name = "Thing2" )
 	@BatchSize( size = 64 )
 	public static class Thing2 {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		protected Thing2() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java
index 09d4e7e89f01..48d4065ed142 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
@@ -192,4 +190,3 @@ public void tearDown(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchLoadableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchLoadableEntity.java
index e9db07c66832..f5be2d9feb63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchLoadableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchLoadableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java
index 86bc2583330a..5dd9a0925f0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.batchfetch;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/City.java
index b794e0265590..c083d7ba71ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/City.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Country.java
index c18ae1fde568..e02080af5223 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
index a324896fa19a..273a3c8f9bb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java
index 92f6d2fc38d4..70e9c0a5a299 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
index 76857a868a18..3cbf0ffd8308 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
index 5d5ec7fe00c2..779b8390ed3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneStreamTest.java
index f18fc3e5939d..5d359318a19d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneStreamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
index a8008793187f..616f6033eb16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Model.java
index 22e860c3dc55..80dc80f13ca1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Model.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/Model.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Model.java 4460 2004-08-29 12:04:14Z oneovthafew $
 package org.hibernate.orm.test.batchfetch;
 
 
@@ -17,14 +13,14 @@ public class Model {
 	private String name;
 	private String description;
 	private ProductLine productLine;
-	
+
 	Model() {}
-	
+
 	public Model(ProductLine pl) {
 		this.productLine = pl;
 		pl.getModels().add(this);
 	}
-	
+
 	public String getDescription() {
 		return description;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/NestedLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/NestedLazyManyToOneTest.java
index 5cfb0848eabd..65a9009e303c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/NestedLazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/NestedLazyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/ProductLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/ProductLine.java
index f88b5b5eb249..f848ac74449f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/ProductLine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/ProductLine.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ProductLine.java 4460 2004-08-29 12:04:14Z oneovthafew $
 package org.hibernate.orm.test.batchfetch;
 import java.util.HashSet;
 import java.util.Set;
@@ -18,7 +14,7 @@ public class ProductLine {
 	private String id;
 	private String description;
 	private Set models = new HashSet();
-	
+
 	public String getDescription() {
 		return description;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java
index f70537246c24..851ef64f56cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.batchfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AbstractBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AbstractBid.java
index 7d9557d498d3..a27d40a7d4b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AbstractBid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AbstractBid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.bidi;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java
index c955bacd16dc..2d37408a26ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Auction.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.bidi;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java
index 9dc398d99499..e2f1300b8222 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bidi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java
index 7596b22aed33..a8681b570ca2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bidi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java
index 865ae5766c42..1a34339cd50d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bidi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java
index b3696aa5c30d..67a8718d3f80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.bidi;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialAuction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialAuction.java
index 91f143b16a8b..e45f2c494b76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialAuction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialAuction.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Auction.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.bidi;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialBid.java
index f67c80f08c7d..097c3719f21d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialBid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/SpecialBid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.bidi;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/BootLoggingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/BootLoggingTests.java
index b4f1a4d91c4d..6b095f55b3c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/BootLoggingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/BootLoggingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot;
 
@@ -16,8 +14,6 @@
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Logger;
-import org.hibernate.testing.orm.junit.LoggingInspections;
-import org.hibernate.testing.orm.junit.LoggingInspectionsScope;
 import org.hibernate.testing.orm.junit.MessageKeyInspection;
 import org.hibernate.testing.orm.junit.MessageKeyWatcher;
 import org.hibernate.testing.orm.junit.RequiresDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/SessionFactoryNamingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/SessionFactoryNamingTests.java
index 7e0f46c5b484..b52b18add4e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/SessionFactoryNamingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/SessionFactoryNamingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java
index d38de4de510c..5dcfcf53dac5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.cfgXml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java
index c6b19a47625f..be347b8417d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.cfgXml;
 
@@ -24,7 +22,6 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java
index 1dea8f661a6b..c085ba856114 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.database.metadata;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java
index 355f60c3a2aa..c31eb5d7cb5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.database.qualfiedTableNaming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java
index 5731722cfcc9..2c1ceab9e21f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.database.qualfiedTableNaming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java
index 45552e3c0c7c..c6780098fad5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.database.qualfiedTableNaming;
 
@@ -73,7 +71,7 @@ public void testQualifiedNameSeparator() throws Exception {
 
 		assertNotNull( expectedName );
 
-        SingleTableEntityPersister persister = (SingleTableEntityPersister) sessionFactory().getRuntimeMetamodels()
+		SingleTableEntityPersister persister = (SingleTableEntityPersister) sessionFactory().getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getEntityDescriptor( Box.class.getName());
 		assertEquals( expectedName, persister.getTableName() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/XmlDefinedNamespaceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/XmlDefinedNamespaceTests.java
index de6d7ceb9b67..1d2d12884453 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/XmlDefinedNamespaceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/XmlDefinedNamespaceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.database.qualfiedTableNaming;
 
@@ -89,21 +87,21 @@ private String generateScript(
 				domainModel,
 				serviceRegistry,
 				new TargetDescriptor() {
-					  @Override
-					  public EnumSet getTargetTypes() {
-						  return EnumSet.of( TargetType.SCRIPT );
-					  }
+					@Override
+					public EnumSet getTargetTypes() {
+						return EnumSet.of( TargetType.SCRIPT );
+					}
 
-					  @Override
-					  public ScriptTargetOutput getScriptTargetOutput() {
-						  return new ScriptTargetOutputToWriter( writer ) {
-							  @Override
-							  public void accept(String command) {
-								  super.accept( command );
-							  }
-						  };
-					  }
-				  }
+					@Override
+					public ScriptTargetOutput getScriptTargetOutput() {
+						return new ScriptTargetOutputToWriter( writer ) {
+							@Override
+							public void accept(String command) {
+								super.accept( command );
+							}
+						};
+					}
+				}
 		);
 		return writer.toString();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java
index d9ef62d3880c..4be357fd52a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicComposition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicComposition.java
index 07554965858d..dea998cf7f82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicComposition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicComposition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicEntity.java
index cb5ab2d30fb4..c144539bf0db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm;
 
@@ -39,4 +37,4 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicTransformationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicTransformationTests.java
index 65899bfc6847..b3410d87fd30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicTransformationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/BasicTransformationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/TransformationHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/TransformationHelper.java
index 476f5bc8bac1..f3e24bb75d08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/TransformationHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/TransformationHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm;
 
@@ -16,7 +14,6 @@
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.XMLEventReader;
 
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java
index 108aaf6c1347..87cedd88f129 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/RepresentationModeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/RepresentationModeConverterTest.java
index a5cee778949e..64448a3b5741 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/RepresentationModeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/RepresentationModeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java
index 693d6dfeb4f9..d78ff50a2fd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.hbm.internal;
 
@@ -13,7 +11,6 @@
 import jakarta.xml.bind.Marshaller;
 
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.XmlMappingBinderAccess;
 import org.hibernate.service.ServiceRegistry;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/BasicMappingJaxbTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/BasicMappingJaxbTests.java
index 9c18e3b558c2..8b7075e34c82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/BasicMappingJaxbTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/BasicMappingJaxbTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/CachingOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/CachingOverrideTest.java
index 54f05646f3b7..ac0de2c1a6e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/CachingOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/CachingOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HbmTransformationJaxbTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HbmTransformationJaxbTests.java
index 371343dd8129..d12700e33c50 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HbmTransformationJaxbTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HbmTransformationJaxbTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HibernateOrmSpecificAttributesMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HibernateOrmSpecificAttributesMappingTest.java
index 87ff3dd16ea0..10e928167b28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HibernateOrmSpecificAttributesMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/HibernateOrmSpecificAttributesMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/PartialJaxbTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/PartialJaxbTests.java
index a67a5d9b439c..2cbe61fc4182 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/PartialJaxbTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/PartialJaxbTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/SimpleEntity.java
index 5cdb1a02a6c2..a156c86d315f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.jaxb.mapping;
 
@@ -42,4 +40,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java
index 34dee62091c7..942503bf12ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.model.relational;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java
index 3b33d2a24ab4..e077cd516a69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.model.source;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
index 70e0a5eee063..b6ff4774e166 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyStringConverter.java
index a5817be44d5f..6d34dc707faf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyStringConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyStringConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyUuidConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyUuidConverter.java
index d1c387586a78..081ca28d56ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyUuidConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyUuidConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java
index f0f1a8110f59..fe26378cbdf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java
index eec5d3475de9..0266e43725df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/XmlHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/XmlHelper.java
index d16e721ac753..d49d186637d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/XmlHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/XmlHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java
index 3b596a947920..d7ce31e107d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.annotation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/_extends/ExtendsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/_extends/ExtendsTests.java
index e05683622a9d..dee419fee34b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/_extends/ExtendsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/_extends/ExtendsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm._extends;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Category.java
index b84a8d09ead7..94ca0eb1752d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.collections.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/ListTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/ListTests.java
index d9c5094368e0..8aa35df201b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/ListTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/ListTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.collections.list;
 
@@ -19,8 +17,6 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Root.java
index 0e4461f804f1..650c30140c29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.collections.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/User.java
index 3f7dc1fa2576..4111f68577fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/collections/list/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.collections.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/Address.java
index 79c975d0f822..eff94ae8ea76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.entityname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/DuplicateClassMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/DuplicateClassMappingTests.java
index 884309f7d543..7a664790350d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/DuplicateClassMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/entityname/DuplicateClassMappingTests.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.entityname;
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.cfg.MappingSettings;
-import org.hibernate.mapping.PersistentClass;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/ForeignGeneratorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/ForeignGeneratorTests.java
index cd10a390a83b..9e1e500b4985 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/ForeignGeneratorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/ForeignGeneratorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.foreigngenerator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Info.java
index 732c144a1afa..aca05193969b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.foreigngenerator;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Basic;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Thing.java
index 10df2071f967..32251c847f7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/foreigngenerator/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.foreigngenerator;
 
@@ -10,7 +8,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Basic;
 import jakarta.persistence.OneToOne;
-import jakarta.persistence.SequenceGenerator;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/IPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/IPerson.java
index 6dcb2d2d3152..b67a75ffe6cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/IPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/IPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/InterfaceMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/InterfaceMappingTests.java
index 2c56cc1f97e9..0b7fe9ead59d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/InterfaceMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/InterfaceMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/Person.java
index f1b41bfbb2c5..71dd7b7593c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/intf/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Customer.java
index 54cd59c5f86b..432fbebc9632 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Order.java
index 46f9132f823b..90856085f791 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/SimpleInverseTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/SimpleInverseTests.java
index 93dafb58d1ff..3b9221171202 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/SimpleInverseTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/inverse/SimpleInverseTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Data.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Data.java
index 12ed7860ae5f..7813dcd14ac0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Data.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Data.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Person.java
index 31791263a37e..5605bcb6e8a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SecondaryTableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SecondaryTableTests.java
index 2b0f4de89c02..827669a73fa0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SecondaryTableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SecondaryTableTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SupplementalDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SupplementalDetails.java
index 73da7062b43f..723bdb659acc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SupplementalDetails.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/join/SupplementalDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Address.java
index 1330ad5cfdef..adc02090f6c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.joinformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Contact.java
index c7e2e283701f..ee1936363ed0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.joinformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/JoinColumnAndFormulaTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/JoinColumnAndFormulaTests.java
index 52c89c0877dc..958e5bf27dda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/JoinColumnAndFormulaTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/JoinColumnAndFormulaTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.joinformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/ManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/ManyToOneTests.java
index 865a85398bd6..34a5cbb759b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/ManyToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/ManyToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.joinformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/OneToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/OneToOneTests.java
index 95317ba2b645..267a66ad0c20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/OneToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/joinformula/OneToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.joinformula;
 
@@ -10,15 +8,10 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.cfg.MappingSettings;
-import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Formula;
-import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.OneToOne;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.ToOne;
-import org.hibernate.mapping.Value;
 import org.hibernate.orm.test.onetoone.formula.Person;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Base.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Base.java
index 54821820da53..8cbf5c67824e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Base.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Base.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.mappedsuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/ImpliedMappedSuperTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/ImpliedMappedSuperTests.java
index 9c53724ebd4b..f7be68d1eba5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/ImpliedMappedSuperTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/ImpliedMappedSuperTests.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.mappedsuper;
 
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.MappingSettings;
 import org.hibernate.mapping.PersistentClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing1.java
index 13cb97ffbff6..23acba2e6c1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.mappedsuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing2.java
index f653ce0032ad..5f34de64e197 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/mappedsuper/Thing2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.mappedsuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Employee2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Employee2.java
index b213509aed2f..1f1d5f81d99e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Employee2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Employee2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/HbmNotFoundTransformationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/HbmNotFoundTransformationTests.java
index 858ccde06ebc..9bf53d4d62c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/HbmNotFoundTransformationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/HbmNotFoundTransformationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Person2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Person2.java
index f831cf8d3009..e179a6e7a642 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Person2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/notfound/Person2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Address.java
index 9eeaadc03f6d..b2d91425aed3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.properties;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/PropertiesGroupingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/PropertiesGroupingTests.java
index 36a2a6249e3e..c1f9cec3a2b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/PropertiesGroupingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/PropertiesGroupingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.properties;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Server.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Server.java
index 11ed7a69c6af..c6a24d5a6535 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Server.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/properties/Server.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.properties;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
index 8827db4736ba..2276656d6f20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/GroupedPropertyRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/GroupedPropertyRefTests.java
index 3604bc27e813..f6bdd7eb2c56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/GroupedPropertyRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/GroupedPropertyRefTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ManyToOnePropertyRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ManyToOnePropertyRefTests.java
index 37c61fa92a87..0651355c4dc2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ManyToOnePropertyRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ManyToOnePropertyRefTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.propertyref;
 
@@ -20,7 +18,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceManyToOneTests.java
index baaeab624b0a..acb660ff64cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceManyToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceManyToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceOneToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceOneToOneTests.java
index ea70d9eac7a9..6e97fa10585b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceOneToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/ReferenceOneToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/EntityWithElementCollections.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/EntityWithElementCollections.java
index 5c058fb6e397..7a8e2b4dfcce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/EntityWithElementCollections.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/EntityWithElementCollections.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/SpecialTypeTransformationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/SpecialTypeTransformationTests.java
index 852f21e45069..fc818818f2ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/SpecialTypeTransformationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/SpecialTypeTransformationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.hbm.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/MyUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/MyUserType.java
index bacee92dc967..dd6309db673b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/MyUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/MyUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/SimpleEntity.java
index 7d844d02360b..932927b0b2e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java
index bc924b2bfe9f..6d691e1d50df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
index 0e0b19375e3f..a527d71ba99d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.attr;
 
@@ -13,8 +11,6 @@
 import org.hibernate.annotations.AnyDiscriminator;
 import org.hibernate.annotations.AnyDiscriminatorValue;
 import org.hibernate.boot.internal.AnyKeyType;
-import org.hibernate.boot.internal.BootstrapContextImpl;
-import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
 import org.hibernate.boot.registry.StandardServiceRegistry;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java
index 3fde6049fe3d..4dd39902da8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.attr;
 
@@ -17,8 +15,6 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.annotations.OptimisticLock;
-import org.hibernate.boot.internal.BootstrapContextImpl;
-import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.internal.Target;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/AnEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/AnEntity.java
index 0bc4b8ab700a..7920e67216c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/AnEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/AnEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.column;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java
index 02d6d37189a0..94849c00e768 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.column;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/Item.java
index 9b5ccb5593a7..58d62ae1fcff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.column.transform;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java
index 19a4f58fcd92..eaebfce331a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.column.transform;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java
index abc80205a231..3e498dde0485 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java
index 70ad0a78ef57..ab24889366aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java
@@ -1,29 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
-import org.hibernate.boot.internal.MetadataBuilderImpl;
-import org.hibernate.boot.internal.MetadataBuilderImpl.MetadataBuildingOptionsImpl;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
-import org.hibernate.orm.test.boot.models.BootstrapContextTesting;
-import org.hibernate.orm.test.boot.models.SourceModelTestHelper;
 
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.junit.jupiter.api.Test;
 
-import org.jboss.jandex.Index;
 
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java
index 58b91f183ae9..6aed2b3a4d63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java
index 1d6d40f52e83..09d197438700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java
@@ -1,19 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
 import org.hibernate.annotations.DiscriminatorFormula;
-import org.hibernate.boot.internal.BootstrapContextImpl;
-import org.hibernate.boot.internal.MetadataBuilderImpl;
-import org.hibernate.boot.internal.MetadataBuilderImpl.MetadataBuildingOptionsImpl;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.SourceModelBuildingContext;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Name.java
index 2f08f4a0e866..8d82fd648117 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Root.java
index afa44b1b65c4..9939cf1fa1b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java
index 8a897ae235fb..021c7ae8a39f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimplePerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimplePerson.java
index 25e341d322ac..f33c34df07dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimplePerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimplePerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Sub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Sub.java
index b6d355ad7614..27c8c3a6d29b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Sub.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Sub.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Thing.java
index 0bc2f0c90270..2bd4285b1d0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Address.java
index 0a0b669d5d49..6500c2fa5f90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java
index 7881c5d54f27..0339f740642c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Employee.java
index 9058bf83f039..e41baa637810 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/Employee.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
 import java.util.List;
 
-import org.hibernate.orm.test.boot.models.xml.SimpleEntity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/EmployeePK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/EmployeePK.java
index 38597d448e4d..d4f4f77b855e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/EmployeePK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/EmployeePK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java
index c170f174de36..09689061a0f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java
index ee589a8d5702..243e96ab9ff4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java
index f4a57c8a8def..4d25589843c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/GlobalEntityListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/GlobalEntityListener.java
index b68915ab3626..8f73839c03e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/GlobalEntityListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/GlobalEntityListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.globals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/JpaEventListenerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/JpaEventListenerTests.java
index dabdfe9f2bd8..c2967281fd1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/JpaEventListenerTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/globals/JpaEventListenerTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.globals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java
index dad52217ecfc..2fd6fe028eee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.lifecycle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/SimpleEntityListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/SimpleEntityListener.java
index 37c107fb7e68..3a88f8d27e15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/SimpleEntityListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/SimpleEntityListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.lifecycle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/AttributeOverrideXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/AttributeOverrideXmlTests.java
index e74c2f95339f..f33e282229d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/AttributeOverrideXmlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/AttributeOverrideXmlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java
index 6500b3dedecb..72c3a93ee7b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.boot.models.xml.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java
index 755b88563e77..b06e1d7ee187 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap;
 
@@ -73,692 +71,692 @@
  */
 public class BootstrapTest {
 
-    @Test
-    public void test_bootstrap_bootstrap_native_registry_BootstrapServiceRegistry_example() {
-
-        ClassLoader customClassLoader = Thread.currentThread().getContextClassLoader();
-        Integrator customIntegrator = new BeanValidationIntegrator();
-
-        //tag::example-bootstrap-native-BootstrapServiceRegistry[]
-        BootstrapServiceRegistryBuilder bootstrapRegistryBuilder =
-            new BootstrapServiceRegistryBuilder();
-        // add a custom ClassLoader
-        bootstrapRegistryBuilder.applyClassLoader(customClassLoader);
-        // manually add an Integrator
-        bootstrapRegistryBuilder.applyIntegrator(customIntegrator);
-
-        BootstrapServiceRegistry bootstrapRegistry = bootstrapRegistryBuilder.build();
-        //end::example-bootstrap-native-BootstrapServiceRegistry[]
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_native_registry_StandardServiceRegistryBuilder_example_1() {
-        //tag::example-bootstrap-native-StandardServiceRegistryBuilder[]
-        // An example using an implicitly built BootstrapServiceRegistry
-        StandardServiceRegistryBuilder standardRegistryBuilder =
-            new StandardServiceRegistryBuilder();
-        //end::example-bootstrap-native-StandardServiceRegistryBuilder[]
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_native_registry_StandardServiceRegistryBuilder_example_2() {
-        //tag::example-bootstrap-native-StandardServiceRegistryBuilder[]
-
-        // An example using an explicitly built BootstrapServiceRegistry
-        BootstrapServiceRegistry bootstrapRegistry =
-            new BootstrapServiceRegistryBuilder().build();
-
-        StandardServiceRegistryBuilder standardRegistryBuilder =
-            new StandardServiceRegistryBuilder(bootstrapRegistry);
-        //end::example-bootstrap-native-StandardServiceRegistryBuilder[]
-    }
-
-    @Test
-    @Disabled
-    public void testMetadataSources() {
-        //tag::example-bootstrap-native-MetadataSources[]
-        ServiceRegistry standardRegistry =
-                new StandardServiceRegistryBuilder().build();
-
-        MetadataSources sources = new MetadataSources(standardRegistry);
-
-        // add a class using JPA/Hibernate annotations for mapping
-        sources.addAnnotatedClass(MyEntity.class);
-
-        // add the name of a class using JPA/Hibernate annotations for mapping.
-        // differs from above in that accessing the Class is deferred which is
-        // important if using runtime bytecode-enhancement
-        sources.addAnnotatedClassName("org.hibernate.example.Customer");
-
-        // Read package-level metadata.
-        sources.addPackage("hibernate.example");
-
-        // Adds the named JPA orm.xml resource as a source: which performs the
-        // classpath lookup and parses the XML
-        sources.addResource("org/hibernate/example/Product.orm.xml");
-        //end::example-bootstrap-native-MetadataSources[]
-    }
-
-    @Test
-    @Disabled
-    public void testMetadataSourcesChaining() {
-        //tag::example-bootstrap-native-MetadataSources-chained[]
-        ServiceRegistry standardRegistry =
-                new StandardServiceRegistryBuilder().build();
-
-        MetadataSources sources = new MetadataSources(standardRegistry)
-                .addAnnotatedClass(MyEntity.class)
-                .addAnnotatedClassName("org.hibernate.example.Customer")
-                .addPackage("hibernate.example")
-                .addResource("org/hibernate/example/Product.orm.xml");
-        //end::example-bootstrap-native-MetadataSources-chained[]
-    }
-
-    @Test
-    public void testBuildMetadataNoBuilder() {
-        ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
-        MetadataSources sources = new MetadataSources(standardRegistry).addAnnotatedClass(MyEntity.class);
-
-        //tag::example-bootstrap-native-Metadata-no-builder[]
-        Metadata metadata = sources.buildMetadata();
-        //end::example-bootstrap-native-Metadata-no-builder[]
-    }
-
-    @Test
-    public void testBuildMetadataUsingBuilder() {
-        ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
-        MetadataSources sources = new MetadataSources(standardRegistry).addAnnotatedClass(MyEntity.class);
-
-        //tag::example-bootstrap-native-Metadata-using-builder[]
-        Metadata metadata = sources.getMetadataBuilder()
-                // configure second-level caching
-                .applyAccessType( AccessType.READ_WRITE )
-                // default catalog
-                .applyImplicitCatalogName( "my_catalog" )
-                // default schema
-                .applyImplicitSchemaName( "my_schema" )
-                .build();
-        //end::example-bootstrap-native-Metadata-using-builder[]
-    }
-
-    @Test
-    public void testBuildSessionFactoryNoBuilder() {
-        ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
-        Metadata metadata = new MetadataSources(standardRegistry)
-                .addAnnotatedClass(MyEntity.class)
-                .buildMetadata();
-
-        //tag::example-bootstrap-native-SessionFactory-no-builder[]
-        final SessionFactory sessionFactory = metadata.buildSessionFactory();
-        //end::example-bootstrap-native-SessionFactory-no-builder[]
-
-        sessionFactory.close();
-    }
-
-    @Test
-    public void testBuildSessionFactoryUsingBuilder() {
-        ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
-        Metadata metadata = new MetadataSources(standardRegistry)
-                .addAnnotatedClass(MyEntity.class)
-                .buildMetadata();
-
-        //tag::example-bootstrap-native-SessionFactory-using-builder[]
-        final SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
-                .applyStatisticsSupport( true )
-                .build();
-        //end::example-bootstrap-native-SessionFactory-using-builder[]
-
-        sessionFactory.close();
-    }
-
-    @Test
-    public void testNativeBuilders() {
-        //tag::example-bootstrap-native-MetadataBuilder[]
-        ServiceRegistry standardRegistry =
-                new StandardServiceRegistryBuilder().build();
-
-        MetadataSources sources = new MetadataSources(standardRegistry);
-        // ...
-        //end::example-bootstrap-native-MetadataBuilder[]
-
-        sources.addAnnotatedClass(MyEntity.class);
-
-        //tag::example-bootstrap-native-MetadataBuilder[]
-        final MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
-
-        // configure second-level caching
-        metadataBuilder.applyAccessType( AccessType.READ_WRITE );
-
-        // default catalog
-        metadataBuilder.applyImplicitCatalogName( "my_catalog" );
-
-        // default schema
-        metadataBuilder.applyImplicitSchemaName( "my_schema" );
-        //end::example-bootstrap-native-MetadataBuilder[]
-
-        //tag::example-bootstrap-native-Metadata[]
-        Metadata metadata = metadataBuilder.build();
-        // or Metadata metadata = sources.buildMetadata()
-        //end::example-bootstrap-native-Metadata[]
-
-        //tag::example-bootstrap-native-SessionFactoryBuilder[]
-        SessionFactoryBuilder sessionFactoryBuilder
-                = metadata.getSessionFactoryBuilder();
-
-        // collect statistics
-        sessionFactoryBuilder.applyStatisticsSupport( true );
-        //end::example-bootstrap-native-SessionFactoryBuilder[]
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_native_registry_MetadataSources_example() {
-
-        try {
-            //tag::bootstrap-bootstrap-native-registry-MetadataSources-example[]
-            ServiceRegistry standardRegistry =
-                    new StandardServiceRegistryBuilder().build();
-
-            MetadataSources sources = new MetadataSources(standardRegistry);
-
-            // alternatively, we can build the MetadataSources without passing
-            // a service registry, in which case it will build a default
-            // BootstrapServiceRegistry to use.  But the approach shown
-            // above is preferred
-            // MetadataSources sources = new MetadataSources();
-
-            // add a class using JPA/Hibernate annotations for mapping
-            sources.addAnnotatedClass(MyEntity.class);
-
-            // add the name of a class using JPA/Hibernate annotations for mapping.
-            // differs from above in that accessing the Class is deferred which is
-            // important if using runtime bytecode-enhancement
-            sources.addAnnotatedClassName("org.hibernate.example.Customer");
-
-            // Read package-level metadata.
-            sources.addPackage("hibernate.example");
-
-            // Read package-level metadata.
-            sources.addPackage(MyEntity.class.getPackage());
-
-            // Adds the named hbm.xml resource as a source: which performs the
-            // classpath lookup and parses the XML
-            sources.addResource("org/hibernate/example/Order.hbm.xml");
-
-            // Adds the named JPA orm.xml resource as a source: which performs the
-            // classpath lookup and parses the XML
-            sources.addResource("org/hibernate/example/Product.orm.xml");
-
-            // Read all mapping documents from a directory tree.
-            // Assumes that any file named *.hbm.xml is a mapping document.
-            sources.addDirectory(new File("."));
-
-            // Read mappings from a particular XML file
-            sources.addFile(new File("./mapping.xml"));
-
-            // Read all mappings from a jar file.
-            // Assumes that any file named *.hbm.xml is a mapping document.
-            sources.addJar(new File("./entities.jar"));
-            //end::bootstrap-bootstrap-native-registry-MetadataSources-example[]
-        }
-        catch (Exception ignore) {
-
-        }
-    }
-
-
-    @Test
-    public void test_bootstrap_bootstrap_native_metadata_source_example() {
-        try {
-            {
-                //tag::bootstrap-native-metadata-source-example[]
-                ServiceRegistry standardRegistry =
-                        new StandardServiceRegistryBuilder().build();
-
-                MetadataSources sources = new MetadataSources(standardRegistry)
-                    .addAnnotatedClass(MyEntity.class)
-                    .addAnnotatedClassName("org.hibernate.example.Customer")
-                    .addResource("org/hibernate/example/Order.hbm.xml")
-                    .addResource("org/hibernate/example/Product.orm.xml");
-                //end::bootstrap-native-metadata-source-example[]
-            }
-
-            {
-                AttributeConverter myAttributeConverter = new AttributeConverter() {
-                    @Override
-                    public Object convertToDatabaseColumn(Object attribute) {
-                        return null;
-                    }
-
-                    @Override
-                    public Object convertToEntityAttribute(Object dbData) {
-                        return null;
-                    }
-                } ;
-                //tag::bootstrap-native-metadata-builder-example[]
-                ServiceRegistry standardRegistry =
-                    new StandardServiceRegistryBuilder().build();
-
-                MetadataSources sources = new MetadataSources(standardRegistry);
-
-                MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
-
-                // Use the JPA-compliant implicit naming strategy
-                metadataBuilder.applyImplicitNamingStrategy(
-                    ImplicitNamingStrategyJpaCompliantImpl.INSTANCE);
-
-                // specify the schema name to use for tables, etc when none is explicitly specified
-                metadataBuilder.applyImplicitSchemaName("my_default_schema");
-
-                // specify a custom Attribute Converter
-                metadataBuilder.applyAttributeConverter(myAttributeConverter);
-
-                Metadata metadata = metadataBuilder.build();
-                //end::bootstrap-native-metadata-builder-example[]
-            }
-        }
-        catch (Exception ignore) {
-
-        }
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_native_SessionFactory_example() {
-        try {
-            {
-                //tag::bootstrap-native-SessionFactory-example[]
-                StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
-                    .configure("org/hibernate/example/hibernate.cfg.xml")
-                    .build();
-
-                Metadata metadata = new MetadataSources(standardRegistry)
-                    .addAnnotatedClass(MyEntity.class)
-                    .addAnnotatedClassName("org.hibernate.example.Customer")
-                    .addResource("org/hibernate/example/Order.hbm.xml")
-                    .addResource("org/hibernate/example/Product.orm.xml")
-                    .getMetadataBuilder()
-                    .applyImplicitNamingStrategy(ImplicitNamingStrategyJpaCompliantImpl.INSTANCE)
-                    .build();
-
-                SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
-                    .applyBeanManager(getBeanManager())
-                    .build();
-                //end::bootstrap-native-SessionFactory-example[]
-            }
-            {
-                //tag::bootstrap-native-SessionFactoryBuilder-example[]
-                StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
-                        .configure("org/hibernate/example/hibernate.cfg.xml")
-                        .build();
-
-                Metadata metadata = new MetadataSources(standardRegistry)
-                    .addAnnotatedClass(MyEntity.class)
-                    .addAnnotatedClassName("org.hibernate.example.Customer")
-                    .addResource("org/hibernate/example/Order.hbm.xml")
-                    .addResource("org/hibernate/example/Product.orm.xml")
-                    .getMetadataBuilder()
-                    .applyImplicitNamingStrategy(ImplicitNamingStrategyJpaCompliantImpl.INSTANCE)
-                    .build();
-
-                SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
-
-                // Supply a SessionFactory-level Interceptor
-                sessionFactoryBuilder.applyInterceptor(new CustomSessionFactoryInterceptor());
-
-                // Add a custom observer
-                sessionFactoryBuilder.addSessionFactoryObservers(new CustomSessionFactoryObserver());
-
-                // Apply a CDI BeanManager (for JPA event listeners)
-                sessionFactoryBuilder.applyBeanManager(getBeanManager());
-
-                SessionFactory sessionFactory = sessionFactoryBuilder.build();
-                //end::bootstrap-native-SessionFactoryBuilder-example[]
-            }
-        }
-        catch (Exception ignore) {
-
-        }
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_jpa_compliant_EntityManagerFactory_example() {
-        try {
-            //tag::bootstrap-jpa-compliant-EntityManagerFactory-example[]
-            // Create an EMF for our CRM persistence-unit.
-            EntityManagerFactory emf = Persistence.createEntityManagerFactory("CRM");
-            //end::bootstrap-jpa-compliant-EntityManagerFactory-example[]
-        } catch (Exception ignore) {}
-    }
-
-    @Test
-    public void test_bootstrap_bootstrap_native_EntityManagerFactory_example() {
-
-        try {
-            //tag::bootstrap-native-EntityManagerFactory-example[]
-            String persistenceUnitName = "CRM";
-            List entityClassNames = new ArrayList<>();
-            Properties properties = new Properties();
-
-            PersistenceUnitInfoImpl persistenceUnitInfo = new PersistenceUnitInfoImpl(
-                persistenceUnitName,
-                entityClassNames,
-                properties
-           );
-
-            Map integrationSettings = ServiceRegistryUtil.createBaseSettings();
-            integrationSettings.put(
-                AvailableSettings.INTERCEPTOR,
-                new CustomSessionFactoryInterceptor()
-           );
-
-            EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
-                new EntityManagerFactoryBuilderImpl(
-                    new PersistenceUnitInfoDescriptor(persistenceUnitInfo),
-                    integrationSettings
-               );
-
-            EntityManagerFactory emf = entityManagerFactoryBuilder.build();
-            //end::bootstrap-native-EntityManagerFactory-example[]
-        }
-        catch (Exception ignore) {
-        }
-    }
-
-    @Test
-    @JiraKey("HHH-17154")
-    public void build_EntityManagerFactory_with_NewTempClassLoader() {
-        new EntityManagerFactoryBuilderImpl(
-                new PersistenceUnitInfoDescriptor(
-                        new PersistenceUnitInfoImpl( "", new ArrayList<>(), new Properties() ) {
-                            @Override
-                            public ClassLoader getNewTempClassLoader() {
-                                return Thread.currentThread().getContextClassLoader();
-                            }
-                        }
-                ),
+	@Test
+	public void test_bootstrap_bootstrap_native_registry_BootstrapServiceRegistry_example() {
+
+		ClassLoader customClassLoader = Thread.currentThread().getContextClassLoader();
+		Integrator customIntegrator = new BeanValidationIntegrator();
+
+		//tag::example-bootstrap-native-BootstrapServiceRegistry[]
+		BootstrapServiceRegistryBuilder bootstrapRegistryBuilder =
+			new BootstrapServiceRegistryBuilder();
+		// add a custom ClassLoader
+		bootstrapRegistryBuilder.applyClassLoader(customClassLoader);
+		// manually add an Integrator
+		bootstrapRegistryBuilder.applyIntegrator(customIntegrator);
+
+		BootstrapServiceRegistry bootstrapRegistry = bootstrapRegistryBuilder.build();
+		//end::example-bootstrap-native-BootstrapServiceRegistry[]
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_native_registry_StandardServiceRegistryBuilder_example_1() {
+		//tag::example-bootstrap-native-StandardServiceRegistryBuilder[]
+		// An example using an implicitly built BootstrapServiceRegistry
+		StandardServiceRegistryBuilder standardRegistryBuilder =
+			new StandardServiceRegistryBuilder();
+		//end::example-bootstrap-native-StandardServiceRegistryBuilder[]
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_native_registry_StandardServiceRegistryBuilder_example_2() {
+		//tag::example-bootstrap-native-StandardServiceRegistryBuilder[]
+
+		// An example using an explicitly built BootstrapServiceRegistry
+		BootstrapServiceRegistry bootstrapRegistry =
+			new BootstrapServiceRegistryBuilder().build();
+
+		StandardServiceRegistryBuilder standardRegistryBuilder =
+			new StandardServiceRegistryBuilder(bootstrapRegistry);
+		//end::example-bootstrap-native-StandardServiceRegistryBuilder[]
+	}
+
+	@Test
+	@Disabled
+	public void testMetadataSources() {
+		//tag::example-bootstrap-native-MetadataSources[]
+		ServiceRegistry standardRegistry =
+				new StandardServiceRegistryBuilder().build();
+
+		MetadataSources sources = new MetadataSources(standardRegistry);
+
+		// add a class using JPA/Hibernate annotations for mapping
+		sources.addAnnotatedClass(MyEntity.class);
+
+		// add the name of a class using JPA/Hibernate annotations for mapping.
+		// differs from above in that accessing the Class is deferred which is
+		// important if using runtime bytecode-enhancement
+		sources.addAnnotatedClassName("org.hibernate.example.Customer");
+
+		// Read package-level metadata.
+		sources.addPackage("hibernate.example");
+
+		// Adds the named JPA orm.xml resource as a source: which performs the
+		// classpath lookup and parses the XML
+		sources.addResource("org/hibernate/example/Product.orm.xml");
+		//end::example-bootstrap-native-MetadataSources[]
+	}
+
+	@Test
+	@Disabled
+	public void testMetadataSourcesChaining() {
+		//tag::example-bootstrap-native-MetadataSources-chained[]
+		ServiceRegistry standardRegistry =
+				new StandardServiceRegistryBuilder().build();
+
+		MetadataSources sources = new MetadataSources(standardRegistry)
+				.addAnnotatedClass(MyEntity.class)
+				.addAnnotatedClassName("org.hibernate.example.Customer")
+				.addPackage("hibernate.example")
+				.addResource("org/hibernate/example/Product.orm.xml");
+		//end::example-bootstrap-native-MetadataSources-chained[]
+	}
+
+	@Test
+	public void testBuildMetadataNoBuilder() {
+		ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
+		MetadataSources sources = new MetadataSources(standardRegistry).addAnnotatedClass(MyEntity.class);
+
+		//tag::example-bootstrap-native-Metadata-no-builder[]
+		Metadata metadata = sources.buildMetadata();
+		//end::example-bootstrap-native-Metadata-no-builder[]
+	}
+
+	@Test
+	public void testBuildMetadataUsingBuilder() {
+		ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
+		MetadataSources sources = new MetadataSources(standardRegistry).addAnnotatedClass(MyEntity.class);
+
+		//tag::example-bootstrap-native-Metadata-using-builder[]
+		Metadata metadata = sources.getMetadataBuilder()
+				// configure second-level caching
+				.applyAccessType( AccessType.READ_WRITE )
+				// default catalog
+				.applyImplicitCatalogName( "my_catalog" )
+				// default schema
+				.applyImplicitSchemaName( "my_schema" )
+				.build();
+		//end::example-bootstrap-native-Metadata-using-builder[]
+	}
+
+	@Test
+	public void testBuildSessionFactoryNoBuilder() {
+		ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
+		Metadata metadata = new MetadataSources(standardRegistry)
+				.addAnnotatedClass(MyEntity.class)
+				.buildMetadata();
+
+		//tag::example-bootstrap-native-SessionFactory-no-builder[]
+		final SessionFactory sessionFactory = metadata.buildSessionFactory();
+		//end::example-bootstrap-native-SessionFactory-no-builder[]
+
+		sessionFactory.close();
+	}
+
+	@Test
+	public void testBuildSessionFactoryUsingBuilder() {
+		ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().build();
+		Metadata metadata = new MetadataSources(standardRegistry)
+				.addAnnotatedClass(MyEntity.class)
+				.buildMetadata();
+
+		//tag::example-bootstrap-native-SessionFactory-using-builder[]
+		final SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
+				.applyStatisticsSupport( true )
+				.build();
+		//end::example-bootstrap-native-SessionFactory-using-builder[]
+
+		sessionFactory.close();
+	}
+
+	@Test
+	public void testNativeBuilders() {
+		//tag::example-bootstrap-native-MetadataBuilder[]
+		ServiceRegistry standardRegistry =
+				new StandardServiceRegistryBuilder().build();
+
+		MetadataSources sources = new MetadataSources(standardRegistry);
+		// ...
+		//end::example-bootstrap-native-MetadataBuilder[]
+
+		sources.addAnnotatedClass(MyEntity.class);
+
+		//tag::example-bootstrap-native-MetadataBuilder[]
+		final MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
+
+		// configure second-level caching
+		metadataBuilder.applyAccessType( AccessType.READ_WRITE );
+
+		// default catalog
+		metadataBuilder.applyImplicitCatalogName( "my_catalog" );
+
+		// default schema
+		metadataBuilder.applyImplicitSchemaName( "my_schema" );
+		//end::example-bootstrap-native-MetadataBuilder[]
+
+		//tag::example-bootstrap-native-Metadata[]
+		Metadata metadata = metadataBuilder.build();
+		// or Metadata metadata = sources.buildMetadata()
+		//end::example-bootstrap-native-Metadata[]
+
+		//tag::example-bootstrap-native-SessionFactoryBuilder[]
+		SessionFactoryBuilder sessionFactoryBuilder
+				= metadata.getSessionFactoryBuilder();
+
+		// collect statistics
+		sessionFactoryBuilder.applyStatisticsSupport( true );
+		//end::example-bootstrap-native-SessionFactoryBuilder[]
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_native_registry_MetadataSources_example() {
+
+		try {
+			//tag::bootstrap-bootstrap-native-registry-MetadataSources-example[]
+			ServiceRegistry standardRegistry =
+					new StandardServiceRegistryBuilder().build();
+
+			MetadataSources sources = new MetadataSources(standardRegistry);
+
+			// alternatively, we can build the MetadataSources without passing
+			// a service registry, in which case it will build a default
+			// BootstrapServiceRegistry to use.  But the approach shown
+			// above is preferred
+			// MetadataSources sources = new MetadataSources();
+
+			// add a class using JPA/Hibernate annotations for mapping
+			sources.addAnnotatedClass(MyEntity.class);
+
+			// add the name of a class using JPA/Hibernate annotations for mapping.
+			// differs from above in that accessing the Class is deferred which is
+			// important if using runtime bytecode-enhancement
+			sources.addAnnotatedClassName("org.hibernate.example.Customer");
+
+			// Read package-level metadata.
+			sources.addPackage("hibernate.example");
+
+			// Read package-level metadata.
+			sources.addPackage(MyEntity.class.getPackage());
+
+			// Adds the named hbm.xml resource as a source: which performs the
+			// classpath lookup and parses the XML
+			sources.addResource("org/hibernate/example/Order.hbm.xml");
+
+			// Adds the named JPA orm.xml resource as a source: which performs the
+			// classpath lookup and parses the XML
+			sources.addResource("org/hibernate/example/Product.orm.xml");
+
+			// Read all mapping documents from a directory tree.
+			// Assumes that any file named *.hbm.xml is a mapping document.
+			sources.addDirectory(new File("."));
+
+			// Read mappings from a particular XML file
+			sources.addFile(new File("./mapping.xml"));
+
+			// Read all mappings from a jar file.
+			// Assumes that any file named *.hbm.xml is a mapping document.
+			sources.addJar(new File("./entities.jar"));
+			//end::bootstrap-bootstrap-native-registry-MetadataSources-example[]
+		}
+		catch (Exception ignore) {
+
+		}
+	}
+
+
+	@Test
+	public void test_bootstrap_bootstrap_native_metadata_source_example() {
+		try {
+			{
+				//tag::bootstrap-native-metadata-source-example[]
+				ServiceRegistry standardRegistry =
+						new StandardServiceRegistryBuilder().build();
+
+				MetadataSources sources = new MetadataSources(standardRegistry)
+					.addAnnotatedClass(MyEntity.class)
+					.addAnnotatedClassName("org.hibernate.example.Customer")
+					.addResource("org/hibernate/example/Order.hbm.xml")
+					.addResource("org/hibernate/example/Product.orm.xml");
+				//end::bootstrap-native-metadata-source-example[]
+			}
+
+			{
+				AttributeConverter myAttributeConverter = new AttributeConverter() {
+					@Override
+					public Object convertToDatabaseColumn(Object attribute) {
+						return null;
+					}
+
+					@Override
+					public Object convertToEntityAttribute(Object dbData) {
+						return null;
+					}
+				} ;
+				//tag::bootstrap-native-metadata-builder-example[]
+				ServiceRegistry standardRegistry =
+					new StandardServiceRegistryBuilder().build();
+
+				MetadataSources sources = new MetadataSources(standardRegistry);
+
+				MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
+
+				// Use the JPA-compliant implicit naming strategy
+				metadataBuilder.applyImplicitNamingStrategy(
+					ImplicitNamingStrategyJpaCompliantImpl.INSTANCE);
+
+				// specify the schema name to use for tables, etc when none is explicitly specified
+				metadataBuilder.applyImplicitSchemaName("my_default_schema");
+
+				// specify a custom Attribute Converter
+				metadataBuilder.applyAttributeConverter(myAttributeConverter);
+
+				Metadata metadata = metadataBuilder.build();
+				//end::bootstrap-native-metadata-builder-example[]
+			}
+		}
+		catch (Exception ignore) {
+
+		}
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_native_SessionFactory_example() {
+		try {
+			{
+				//tag::bootstrap-native-SessionFactory-example[]
+				StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
+					.configure("org/hibernate/example/hibernate.cfg.xml")
+					.build();
+
+				Metadata metadata = new MetadataSources(standardRegistry)
+					.addAnnotatedClass(MyEntity.class)
+					.addAnnotatedClassName("org.hibernate.example.Customer")
+					.addResource("org/hibernate/example/Order.hbm.xml")
+					.addResource("org/hibernate/example/Product.orm.xml")
+					.getMetadataBuilder()
+					.applyImplicitNamingStrategy(ImplicitNamingStrategyJpaCompliantImpl.INSTANCE)
+					.build();
+
+				SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
+					.applyBeanManager(getBeanManager())
+					.build();
+				//end::bootstrap-native-SessionFactory-example[]
+			}
+			{
+				//tag::bootstrap-native-SessionFactoryBuilder-example[]
+				StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
+						.configure("org/hibernate/example/hibernate.cfg.xml")
+						.build();
+
+				Metadata metadata = new MetadataSources(standardRegistry)
+					.addAnnotatedClass(MyEntity.class)
+					.addAnnotatedClassName("org.hibernate.example.Customer")
+					.addResource("org/hibernate/example/Order.hbm.xml")
+					.addResource("org/hibernate/example/Product.orm.xml")
+					.getMetadataBuilder()
+					.applyImplicitNamingStrategy(ImplicitNamingStrategyJpaCompliantImpl.INSTANCE)
+					.build();
+
+				SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
+
+				// Supply a SessionFactory-level Interceptor
+				sessionFactoryBuilder.applyInterceptor(new CustomSessionFactoryInterceptor());
+
+				// Add a custom observer
+				sessionFactoryBuilder.addSessionFactoryObservers(new CustomSessionFactoryObserver());
+
+				// Apply a CDI BeanManager (for JPA event listeners)
+				sessionFactoryBuilder.applyBeanManager(getBeanManager());
+
+				SessionFactory sessionFactory = sessionFactoryBuilder.build();
+				//end::bootstrap-native-SessionFactoryBuilder-example[]
+			}
+		}
+		catch (Exception ignore) {
+
+		}
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_jpa_compliant_EntityManagerFactory_example() {
+		try {
+			//tag::bootstrap-jpa-compliant-EntityManagerFactory-example[]
+			// Create an EMF for our CRM persistence-unit.
+			EntityManagerFactory emf = Persistence.createEntityManagerFactory("CRM");
+			//end::bootstrap-jpa-compliant-EntityManagerFactory-example[]
+		} catch (Exception ignore) {}
+	}
+
+	@Test
+	public void test_bootstrap_bootstrap_native_EntityManagerFactory_example() {
+
+		try {
+			//tag::bootstrap-native-EntityManagerFactory-example[]
+			String persistenceUnitName = "CRM";
+			List entityClassNames = new ArrayList<>();
+			Properties properties = new Properties();
+
+			PersistenceUnitInfoImpl persistenceUnitInfo = new PersistenceUnitInfoImpl(
+				persistenceUnitName,
+				entityClassNames,
+				properties
+		);
+
+			Map integrationSettings = ServiceRegistryUtil.createBaseSettings();
+			integrationSettings.put(
+				AvailableSettings.INTERCEPTOR,
+				new CustomSessionFactoryInterceptor()
+		);
+
+			EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
+				new EntityManagerFactoryBuilderImpl(
+					new PersistenceUnitInfoDescriptor(persistenceUnitInfo),
+					integrationSettings
+			);
+
+			EntityManagerFactory emf = entityManagerFactoryBuilder.build();
+			//end::bootstrap-native-EntityManagerFactory-example[]
+		}
+		catch (Exception ignore) {
+		}
+	}
+
+	@Test
+	@JiraKey("HHH-17154")
+	public void build_EntityManagerFactory_with_NewTempClassLoader() {
+		new EntityManagerFactoryBuilderImpl(
+				new PersistenceUnitInfoDescriptor(
+						new PersistenceUnitInfoImpl( "", new ArrayList<>(), new Properties() ) {
+							@Override
+							public ClassLoader getNewTempClassLoader() {
+								return Thread.currentThread().getContextClassLoader();
+							}
+						}
+				),
 				ServiceRegistryUtil.createBaseSettings()
-        ).cancel();
-    }
+		).cancel();
+	}
 
-    public Object getBeanManager() {
-        return null;
-    }
-
-    @Entity
-    public static class MyEntity {
-        @Id
-        private Long id;
-    }
-
-    //tag::bootstrap-event-listener-registration-example[]
-    public class MyIntegrator implements Integrator {
-
-        @Override
-        public void integrate(
-                Metadata metadata,
-                BootstrapContext bootstrapContext,
-                SessionFactoryImplementor sessionFactory) {
-
-            // As you might expect, an EventListenerRegistry is the thing with which event
-            // listeners are registered
-            // It is a service so we look it up using the service registry
-            final EventListenerRegistry eventListenerRegistry =
-                bootstrapContext.getServiceRegistry().getService(EventListenerRegistry.class);
+	public Object getBeanManager() {
+		return null;
+	}
+
+	@Entity
+	public static class MyEntity {
+		@Id
+		private Long id;
+	}
+
+	//tag::bootstrap-event-listener-registration-example[]
+	public class MyIntegrator implements Integrator {
+
+		@Override
+		public void integrate(
+				Metadata metadata,
+				BootstrapContext bootstrapContext,
+				SessionFactoryImplementor sessionFactory) {
+
+			// As you might expect, an EventListenerRegistry is the thing with which event
+			// listeners are registered
+			// It is a service so we look it up using the service registry
+			final EventListenerRegistry eventListenerRegistry =
+				bootstrapContext.getServiceRegistry().getService(EventListenerRegistry.class);
 
-            // If you wish to have custom determination and handling of "duplicate" listeners,
-            // you would have to add an implementation of the
-            // org.hibernate.event.service.spi.DuplicationStrategy contract like this
-            eventListenerRegistry.addDuplicationStrategy(new CustomDuplicationStrategy());
+			// If you wish to have custom determination and handling of "duplicate" listeners,
+			// you would have to add an implementation of the
+			// org.hibernate.event.service.spi.DuplicationStrategy contract like this
+			eventListenerRegistry.addDuplicationStrategy(new CustomDuplicationStrategy());
 
-            // EventListenerRegistry defines 3 ways to register listeners:
+			// EventListenerRegistry defines 3 ways to register listeners:
 
-            // 1) This form overrides any existing registrations with
-            eventListenerRegistry.setListeners(EventType.AUTO_FLUSH,
-                                                DefaultAutoFlushEventListener.class);
+			// 1) This form overrides any existing registrations with
+			eventListenerRegistry.setListeners(EventType.AUTO_FLUSH,
+												DefaultAutoFlushEventListener.class);
 
-            // 2) This form adds the specified listener(s) to the beginning of the listener chain
-            eventListenerRegistry.prependListeners(EventType.PERSIST,
-                                                    DefaultPersistEventListener.class);
+			// 2) This form adds the specified listener(s) to the beginning of the listener chain
+			eventListenerRegistry.prependListeners(EventType.PERSIST,
+													DefaultPersistEventListener.class);
 
-            // 3) This form adds the specified listener(s) to the end of the listener chain
-            eventListenerRegistry.appendListeners(EventType.MERGE,
-                                                   DefaultMergeEventListener.class);
-        }
-
-        @Override
-        public void disintegrate(
-                SessionFactoryImplementor sessionFactory,
-                SessionFactoryServiceRegistry serviceRegistry) {
-
-        }
-    }
-    //end::bootstrap-event-listener-registration-example[]
-
-    public class CustomDuplicationStrategy implements DuplicationStrategy {
-
-        @Override
-        public boolean areMatch(Object listener, Object original) {
-            return false;
-        }
-
-        @Override
-        public Action getAction() {
-            return null;
-        }
-    }
-
-    public class CustomSessionFactoryInterceptor implements Interceptor {}
-
-    public class CustomSessionFactoryObserver implements SessionFactoryObserver {
-
-        @Override
-        public void sessionFactoryCreated(SessionFactory factory) {
-
-        }
-
-        @Override
-        public void sessionFactoryClosed(SessionFactory factory) {
-
-        }
-    }
-
-    //tag::bootstrap-jpa-compliant-PersistenceUnit-example[]
-    @PersistenceUnit
-    private EntityManagerFactory emf;
-    //end::bootstrap-jpa-compliant-PersistenceUnit-example[]
-
-    //tag::bootstrap-jpa-compliant-PersistenceUnit-configurable-example[]
-    @PersistenceUnit(unitName="CRM")
-    private EntityManagerFactory entityManagerFactory;
-    //end::bootstrap-jpa-compliant-PersistenceUnit-configurable-example[]
-
-    //tag::bootstrap-jpa-compliant-PersistenceContext-example[]
-    @PersistenceContext
-    private EntityManager em;
-    //end::bootstrap-jpa-compliant-PersistenceContext-example[]
-
-    //tag::bootstrap-jpa-compliant-PersistenceContext-configurable-example[]
-    @PersistenceContext(
-        unitName = "CRM",
-        properties = {
-            @PersistenceProperty(
-                name="org.hibernate.flushMode",
-                value= "MANUAL"
-           )
-        }
-   )
-    private EntityManager entityManager;
-    //end::bootstrap-jpa-compliant-PersistenceContext-configurable-example[]
-
-    //tag::bootstrap-native-PersistenceUnitInfoImpl-example[]
-    public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
-
-        private final String persistenceUnitName;
-
-        private PersistenceUnitTransactionType transactionType =
-                PersistenceUnitTransactionType.RESOURCE_LOCAL;
-
-        private final List managedClassNames;
-
-        private final Properties properties;
-
-        private DataSource jtaDataSource;
-
-        private DataSource nonJtaDataSource;
-
-        public PersistenceUnitInfoImpl(
-                String persistenceUnitName,
-                List managedClassNames,
-                Properties properties) {
-            this.persistenceUnitName = persistenceUnitName;
-            this.managedClassNames = managedClassNames;
-            this.properties = properties;
-        }
-
-        @Override
-        public String getPersistenceUnitName() {
-            return persistenceUnitName;
-        }
-
-        @Override
-        public String getPersistenceProviderClassName() {
-            return HibernatePersistenceProvider.class.getName();
-        }
-
-        @Override
-        public String getScopeAnnotationName() {
-            return null;
-        }
-
-        @Override
-        public List getQualifierAnnotationNames() {
-            return List.of();
-        }
-
-        @Override
-        public jakarta.persistence.spi.PersistenceUnitTransactionType getTransactionType() {
-            return transactionType;
-        }
-
-        @Override
-        public DataSource getJtaDataSource() {
-            return jtaDataSource;
-        }
-
-        public PersistenceUnitInfoImpl setJtaDataSource(DataSource jtaDataSource) {
-            this.jtaDataSource = jtaDataSource;
-            this.nonJtaDataSource = null;
-            transactionType = PersistenceUnitTransactionType.JTA;
-            return this;
-        }
-
-        @Override
-        public DataSource getNonJtaDataSource() {
-            return nonJtaDataSource;
-        }
-
-        public PersistenceUnitInfoImpl setNonJtaDataSource(DataSource nonJtaDataSource) {
-            this.nonJtaDataSource = nonJtaDataSource;
-            this.jtaDataSource = null;
-            transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
-            return this;
-        }
-
-        @Override
-        public List getMappingFileNames() {
-            return null;
-        }
-
-        @Override
-        public List getJarFileUrls() {
-            return Collections.emptyList();
-        }
-
-        @Override
-        public URL getPersistenceUnitRootUrl() {
-            return null;
-        }
-
-        @Override
-        public List getManagedClassNames() {
-            return managedClassNames;
-        }
-
-        @Override
-        public boolean excludeUnlistedClasses() {
-            return false;
-        }
-
-        @Override
-        public SharedCacheMode getSharedCacheMode() {
-            return SharedCacheMode.UNSPECIFIED;
-        }
-
-        @Override
-        public ValidationMode getValidationMode() {
-            return ValidationMode.AUTO;
-        }
-
-        public Properties getProperties() {
-            return properties;
-        }
-
-        @Override
-        public String getPersistenceXMLSchemaVersion() {
-            return "2.1";
-        }
-
-        @Override
-        public ClassLoader getClassLoader() {
-            return Thread.currentThread().getContextClassLoader();
-        }
-
-        @Override
-        public void addTransformer(ClassTransformer transformer) {
-
-        }
-
-        @Override
-        public ClassLoader getNewTempClassLoader() {
-            return null;
-        }
-    }
-    //end::bootstrap-native-PersistenceUnitInfoImpl-example[]
-
-    @Test
-    public void test_basic_custom_type_register_BasicType_example() {
-        try {
-            //tag::basic-custom-type-register-BasicType-example[]
-            ServiceRegistry standardRegistry =
-                    new StandardServiceRegistryBuilder().build();
-
-            MetadataSources sources = new MetadataSources( standardRegistry );
-
-            MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
-
-            metadataBuilder.applyBasicType( BitSetType.INSTANCE );
-            //end::basic-custom-type-register-BasicType-example[]
-        }
-        catch (Exception ignore) {
-
-        }
-    }
-
-    @Test
-    public void test_basic_custom_type_register_UserType_example() {
-        try {
-            //tag::basic-custom-type-register-UserType-example[]
-            ServiceRegistry standardRegistry =
-                new StandardServiceRegistryBuilder().build();
-
-            MetadataSources sources = new MetadataSources(standardRegistry);
-
-            MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
-
-            metadataBuilder.applyBasicType(new BitSetUserType(), "bitset");
-            //end::basic-custom-type-register-UserType-example[]
-        }
-        catch (Exception ignore) {
-
-        }
-    }
+			// 3) This form adds the specified listener(s) to the end of the listener chain
+			eventListenerRegistry.appendListeners(EventType.MERGE,
+												DefaultMergeEventListener.class);
+		}
+
+		@Override
+		public void disintegrate(
+				SessionFactoryImplementor sessionFactory,
+				SessionFactoryServiceRegistry serviceRegistry) {
+
+		}
+	}
+	//end::bootstrap-event-listener-registration-example[]
+
+	public class CustomDuplicationStrategy implements DuplicationStrategy {
+
+		@Override
+		public boolean areMatch(Object listener, Object original) {
+			return false;
+		}
+
+		@Override
+		public Action getAction() {
+			return null;
+		}
+	}
+
+	public class CustomSessionFactoryInterceptor implements Interceptor {}
+
+	public class CustomSessionFactoryObserver implements SessionFactoryObserver {
+
+		@Override
+		public void sessionFactoryCreated(SessionFactory factory) {
+
+		}
+
+		@Override
+		public void sessionFactoryClosed(SessionFactory factory) {
+
+		}
+	}
+
+	//tag::bootstrap-jpa-compliant-PersistenceUnit-example[]
+	@PersistenceUnit
+	private EntityManagerFactory emf;
+	//end::bootstrap-jpa-compliant-PersistenceUnit-example[]
+
+	//tag::bootstrap-jpa-compliant-PersistenceUnit-configurable-example[]
+	@PersistenceUnit(unitName="CRM")
+	private EntityManagerFactory entityManagerFactory;
+	//end::bootstrap-jpa-compliant-PersistenceUnit-configurable-example[]
+
+	//tag::bootstrap-jpa-compliant-PersistenceContext-example[]
+	@PersistenceContext
+	private EntityManager em;
+	//end::bootstrap-jpa-compliant-PersistenceContext-example[]
+
+	//tag::bootstrap-jpa-compliant-PersistenceContext-configurable-example[]
+	@PersistenceContext(
+		unitName = "CRM",
+		properties = {
+			@PersistenceProperty(
+				name="org.hibernate.flushMode",
+				value= "MANUAL"
+		)
+		}
+)
+	private EntityManager entityManager;
+	//end::bootstrap-jpa-compliant-PersistenceContext-configurable-example[]
+
+	//tag::bootstrap-native-PersistenceUnitInfoImpl-example[]
+	public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
+
+		private final String persistenceUnitName;
+
+		private PersistenceUnitTransactionType transactionType =
+				PersistenceUnitTransactionType.RESOURCE_LOCAL;
+
+		private final List managedClassNames;
+
+		private final Properties properties;
+
+		private DataSource jtaDataSource;
+
+		private DataSource nonJtaDataSource;
+
+		public PersistenceUnitInfoImpl(
+				String persistenceUnitName,
+				List managedClassNames,
+				Properties properties) {
+			this.persistenceUnitName = persistenceUnitName;
+			this.managedClassNames = managedClassNames;
+			this.properties = properties;
+		}
+
+		@Override
+		public String getPersistenceUnitName() {
+			return persistenceUnitName;
+		}
+
+		@Override
+		public String getPersistenceProviderClassName() {
+			return HibernatePersistenceProvider.class.getName();
+		}
+
+		@Override
+		public String getScopeAnnotationName() {
+			return null;
+		}
+
+		@Override
+		public List getQualifierAnnotationNames() {
+			return List.of();
+		}
+
+		@Override
+		public jakarta.persistence.spi.PersistenceUnitTransactionType getTransactionType() {
+			return transactionType;
+		}
+
+		@Override
+		public DataSource getJtaDataSource() {
+			return jtaDataSource;
+		}
+
+		public PersistenceUnitInfoImpl setJtaDataSource(DataSource jtaDataSource) {
+			this.jtaDataSource = jtaDataSource;
+			this.nonJtaDataSource = null;
+			transactionType = PersistenceUnitTransactionType.JTA;
+			return this;
+		}
+
+		@Override
+		public DataSource getNonJtaDataSource() {
+			return nonJtaDataSource;
+		}
+
+		public PersistenceUnitInfoImpl setNonJtaDataSource(DataSource nonJtaDataSource) {
+			this.nonJtaDataSource = nonJtaDataSource;
+			this.jtaDataSource = null;
+			transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
+			return this;
+		}
+
+		@Override
+		public List getMappingFileNames() {
+			return null;
+		}
+
+		@Override
+		public List getJarFileUrls() {
+			return Collections.emptyList();
+		}
+
+		@Override
+		public URL getPersistenceUnitRootUrl() {
+			return null;
+		}
+
+		@Override
+		public List getManagedClassNames() {
+			return managedClassNames;
+		}
+
+		@Override
+		public boolean excludeUnlistedClasses() {
+			return false;
+		}
+
+		@Override
+		public SharedCacheMode getSharedCacheMode() {
+			return SharedCacheMode.UNSPECIFIED;
+		}
+
+		@Override
+		public ValidationMode getValidationMode() {
+			return ValidationMode.AUTO;
+		}
+
+		public Properties getProperties() {
+			return properties;
+		}
+
+		@Override
+		public String getPersistenceXMLSchemaVersion() {
+			return "2.1";
+		}
+
+		@Override
+		public ClassLoader getClassLoader() {
+			return Thread.currentThread().getContextClassLoader();
+		}
+
+		@Override
+		public void addTransformer(ClassTransformer transformer) {
+
+		}
+
+		@Override
+		public ClassLoader getNewTempClassLoader() {
+			return null;
+		}
+	}
+	//end::bootstrap-native-PersistenceUnitInfoImpl-example[]
+
+	@Test
+	public void test_basic_custom_type_register_BasicType_example() {
+		try {
+			//tag::basic-custom-type-register-BasicType-example[]
+			ServiceRegistry standardRegistry =
+					new StandardServiceRegistryBuilder().build();
+
+			MetadataSources sources = new MetadataSources( standardRegistry );
+
+			MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
+
+			metadataBuilder.applyBasicType( BitSetType.INSTANCE );
+			//end::basic-custom-type-register-BasicType-example[]
+		}
+		catch (Exception ignore) {
+
+		}
+	}
+
+	@Test
+	public void test_basic_custom_type_register_UserType_example() {
+		try {
+			//tag::basic-custom-type-register-UserType-example[]
+			ServiceRegistry standardRegistry =
+				new StandardServiceRegistryBuilder().build();
+
+			MetadataSources sources = new MetadataSources(standardRegistry);
+
+			MetadataBuilder metadataBuilder = sources.getMetadataBuilder();
+
+			metadataBuilder.applyBasicType(new BitSetUserType(), "bitset");
+			//end::basic-custom-type-register-UserType-example[]
+		}
+		catch (Exception ignore) {
+
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AccessTest.java
index 2aff599b473f..3ae6c3ce434a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java
index bcb0fd0da8c1..b20c64b03797 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java
index 7ec932e3eb6a..54b24acf0b65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java
index a9db2ac85e4f..8239a4597330 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.AccessType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java
index cc7d667a53a3..8619da63196c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java
index 0d0c388954a0..de813b7afb6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Transient;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java
index f2fa7ba9683d..50a37660fb2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.Embeddable;
 
@@ -17,5 +12,3 @@
 public class Closet extends BaseFurniture {
 	int numberOfDoors;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java
index e4fb179b365e..f9ef17dfcfe4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.Entity;
 
@@ -18,5 +13,3 @@
 public class Foobar {
 	String foo;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java
index d2f692c49c57..2e7af71f3908 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.AccessType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java
index cfa9e058fe00..cfaeef29c497 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java
index 1f92fd1e6841..0c24d1e9c05d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.Transient;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java
index d180bd6305a9..6ca19b23bfc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.access;
 import jakarta.persistence.AccessType;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java
index b1cfb5fbe8af..dc1bb9a8ab22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 
@@ -48,11 +46,11 @@ public void tearDown() {
 		}
 	}
 
-    @Test
-    public void testInconsistentAnnotationPlacement() {
-        Configuration cfg = new Configuration();
-        cfg.addAnnotatedClass( Course1.class );
-        cfg.addAnnotatedClass( Student.class );
+	@Test
+	public void testInconsistentAnnotationPlacement() {
+		Configuration cfg = new Configuration();
+		cfg.addAnnotatedClass( Course1.class );
+		cfg.addAnnotatedClass( Student.class );
 		SessionFactory sf = null;
 		try {
 			sf = cfg.buildSessionFactory( serviceRegistry );
@@ -76,7 +74,7 @@ public void testFieldAnnotationPlacement() {
 		cfg.addAnnotatedClass( Student.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -99,7 +97,7 @@ public void testPropertyAnnotationPlacement() {
 		cfg.addAnnotatedClass( Student.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -122,7 +120,7 @@ public void testExplicitPropertyAccessAnnotationsOnProperty() throws Exception {
 		cfg.addAnnotatedClass( Student.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -165,7 +163,7 @@ public void testExplicitPropertyAccessAnnotationsWithHibernateStyleOverride() {
 		cfg.addAnnotatedClass( Student.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -193,7 +191,7 @@ public void testExplicitPropertyAccessAnnotationsWithJpaStyleOverride() {
 		cfg.addAnnotatedClass( Student.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -222,7 +220,7 @@ public void testDefaultFieldAccessIsInherited() {
 		cfg.addAnnotatedClass( Being.class );
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            final EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			final EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(classUnderTest.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -245,7 +243,7 @@ public void testDefaultPropertyAccessIsInherited() {
 
 		SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry );
 		try {
-            EntityPersister entityPersister = factory.getRuntimeMetamodels()
+			EntityPersister entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(Animal.class.getName());
 			final BasicEntityIdentifierMappingImpl identifierMapping = (BasicEntityIdentifierMappingImpl) entityPersister.getIdentifierMapping();
@@ -255,7 +253,7 @@ public void testDefaultPropertyAccessIsInherited() {
 					identifierMapping.getPropertyAccess().getGetter() instanceof GetterMethodImpl
 			);
 
-            entityPersister = factory.getRuntimeMetamodels()
+			entityPersister = factory.getRuntimeMetamodels()
 					.getMappingMetamodel()
 					.getEntityDescriptor(Horse.class.getName());
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java
index 9e5892b1ce1c..eceeb703b350 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java
index a318b9a33f2c..a251e5e391da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java
index 2aef4399a39d..41b9b7b4afcc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java
index 02713e1d97e7..ec1a34111dec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -29,5 +24,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java
index 5fa33d928c19..d48758d3336c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java
index df6eb8b6d3bf..4e02d89de6ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Transient;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java
index 5dda35dc22be..6b9647b39f62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java
index 0cda242c2671..dd30cd70fa4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java
index 01fbfa0f9fdd..e744e51af794 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.CascadeType;
@@ -54,5 +49,3 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java
index 146563850a57..8b930f69af96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java
index 59b6e3eaf534..240cbb36cbd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java
index e4b8c015a828..f9d8a4ade4de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java
index e5bdd6ec1981..6e0eb22ae754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java
index 25a2953bea28..cf039f648fc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java
index 685c7f9eef0f..e6f4e6a82783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java
index c21e20fac855..3bbbebadde57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.Access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java
index 4168f5918b27..0d83e7cd731a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java
index 045da908752f..23a6fe14f56a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java
index 2819ed747140..9335e61b48ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java
index 2c91cc531721..147b765d0789 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.Entity;
@@ -40,5 +35,3 @@ public void setLastname(String lastname) {
 		this.lastname = lastname;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java
index 272025d31d80..7f7cf5f46d5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java
index 1e04a7b5314e..17c948c13602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java
index 85ff9351b503..3a653e53ff27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java
index e7ed69503af9..a12e70fa97b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -39,5 +34,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java
index 42c86b2c738b..8d7110446b02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.Transient;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java
index d4450d3599cb..73f1ef466eaa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import java.util.List;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java
index a8b3d6f9a5f5..5683427e6307 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa;
 import jakarta.persistence.Access;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java
index bec910ddbc1d..383dbf83de97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import java.util.Set;
 import jakarta.persistence.GeneratedValue;
@@ -41,5 +36,3 @@ public void setNickNames(Set nickNames) {
 		this.nickNames = nickNames;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java
index f4bac67a78ed..3ba631b287ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Crew.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Crew.java
index fe9c0220977c..bd4b672c8f9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Crew.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Crew.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 
 
@@ -35,5 +30,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java
index 725069a433c3..a109bc4f0506 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java
index 37107aefd46b..1382f90c30de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Waiter.java 18506 2010-01-11 20:23:08Z hardy.ferentschik $
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java
index ef69c8f80c69..7e563d4a72de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java
index 2b89fb1255c8..24d8a3c1667b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -49,5 +44,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java
index d3254e24091f..4d8d3c43ff5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 import jakarta.persistence.Entity;
 
@@ -16,5 +11,3 @@
 @Entity
 public class Waiter extends Crew {
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java
index a20370785b5f..81885baabf09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml;
 
@@ -27,7 +25,6 @@
 import jakarta.persistence.AccessType;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test verifying that it is possible to configure the access type via xml configuration.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java
index 08b299cbaf83..ff958c391bd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.associationOverride;
 
@@ -145,4 +143,3 @@ public void setName(String name) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java
index 69e58e7f39df..f65ac1e672a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.associationOverride;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java
index 9d031e0de47e..2f1a410c16c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides;
 
@@ -36,7 +34,6 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java
index c2fc1808106d..7704add7223d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java
index 270a86e6b701..6779436e1947 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides;
 
@@ -29,8 +27,6 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java
index d7bc941d7a4d..0b04503bccb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java
index 62b5db2963cf..d2d66efef628 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics;
 
@@ -29,7 +27,6 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java
index ffce3cd14470..4e8f421f9ca2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
index f539fd123962..c618402b7a0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java
index d7ec9706a60d..d120781a440e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql;
 
@@ -38,7 +36,6 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/ListIndexJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/ListIndexJdbcTypeTests.java
index d230e9603b65..a79363d59194 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/ListIndexJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/ListIndexJdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java
index 2258cdddb918..d94a412e2894 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/package-info.java
index cbc3b61537e5..ada5168c9b8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/package-info.java
@@ -11,4 +11,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql;
\ No newline at end of file
+package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java
index c8983e4c817c..05d910a8b1a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.io.Serializable;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressBis.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressBis.java
index 2a600d4b3522..2da0da4b9724 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressBis.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressBis.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
 import jakarta.persistence.Embeddable;
@@ -6,6 +10,6 @@
 @Embeddable
 public class AddressBis {
 
-    @Formula("2")
-    Integer formula;
+	@Formula("2")
+	Integer formula;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java
index 0d1ce2659fcf..a66ca1d9c7d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java
index 3f3ca40893b9..d2230b59dc08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
 import jakarta.persistence.AttributeOverride;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java
index d1c250a2305f..efb201096493 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java
index eb31f5457b7c..3e2d88247a2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.io.Serializable;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java
index f516bfffb39d..9959e4ce7a6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java
index 04dc114022e4..90db4e475279 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
@@ -17,11 +15,11 @@
  */
 @Embeddable
 public class EmbeddableA {
-	
+
 	@Embedded
 	@AttributeOverrides({@AttributeOverride(name = "embedAttrB" , column = @Column(table = "TableB"))})
 	private EmbeddableB embedB;
-	
+
 	private String embedAttrA;
 
 	public EmbeddableB getEmbedB() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java
index 714c3e9cf751..ec3b6ffa3c0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
@@ -13,7 +11,7 @@
  */
 @Embeddable
 public class EmbeddableB {
-	
+
 	private String embedAttrB;
 
 	public String getEmbedAttrB() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java
index 84fc279150d1..cd757209d1a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java
index a7542e15c53c..312e530ccdd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
index 1f5893d47c37..9b7a1e96ca20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
@@ -233,8 +231,8 @@ public void testQueryWithEmbeddedWithNullUsingSubAttributes(SessionFactoryScope
 
 		scope.inTransaction( session -> {
 			Query query = session.createQuery( "from Person p " +
-																  "where ( p.bornIn.iso2 is null or p.bornIn.iso2 = :i ) and " +
-																  "( p.bornIn.name is null or p.bornIn.name = :n )"
+																"where ( p.bornIn.iso2 is null or p.bornIn.iso2 = :i ) and " +
+																"( p.bornIn.name is null or p.bornIn.name = :n )"
 			);
 			query.setParameter( "i", person.bornIn.getIso2() );
 			query.setParameter( "n", person.bornIn.getName() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java
index 9f8f829ce656..5ffb21a6b3e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
@@ -24,7 +22,7 @@ public class EntityWithNestedEmbeddables {
 	@Id
 	@GeneratedValue
 	private Integer id;
-	
+
 	@Embedded
 	private EmbeddableA embedA;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java
index 300f0caffb9e..1ee0ef8a31b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Embedded;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java
index 1ec3fadd3e4b..a61606aa61df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.text.NumberFormat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java
index c809c1dd2702..2f9a70624d05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.text.NumberFormat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java
index d24f486cdd9e..ff94d748cbc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.util.Collection;
 
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
-import jakarta.persistence.Embedded;
 
 @Embeddable
 public class InternetFavorites {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java
index 2d44fb7bd018..f1abf217ec96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java
index 9e199083675a..fe171db90220 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java
index 8dc2101b327c..5dc9a961bce9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java
index 9ea1c2208932..1ac8458da34c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java
index f90311f4fa37..a88d958d9392 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java
index 8c185760a0a4..704c73ca38b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
@@ -16,7 +14,7 @@
  * @author Brett Meyer
  */
 public class NestedEmbeddableAttributeOverrideTest extends BaseCoreFunctionalTestCase {
-	
+
 	@Test
 	@JiraKey(value="HHH-8021")
 	public void testAttributeOverride() {
@@ -26,17 +24,17 @@ public void testAttributeOverride() {
 		EmbeddableA embedA = new EmbeddableA();
 		embedA.setEmbedAttrA("A");
 		embedA.setEmbedB(embedB);
-		
+
 		EntityWithNestedEmbeddables entity = new EntityWithNestedEmbeddables();
 		entity.setEmbedA(embedA);
-		
+
 		Session s = openSession();
 		s.beginTransaction();
 		s.persist( entity );
 		s.getTransaction().commit();
 		s.close();
 	}
-	
+
 	@Override
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] { EntityWithNestedEmbeddables.class };
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java
index 0bd53bc5aaa2..a1a2abd058a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
 import jakarta.persistence.AttributeOverride;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java
index 4dc4704d57cb..7c249dbbf2ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java
index dd5c882d558e..fbe6db767585 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java
index 838306586750..a7da7e2c4df3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.io.Serializable;
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java
index c6b6548c5ab2..12325be67971 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java
index 61131dc69419..d64d37235160 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java
index 30133e1a284f..7b33ba7a5c4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.AttributeOverride;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java
index abc6b93cb232..72ae7d8e8e4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java
index 1cd06c695a56..5827513881fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import jakarta.persistence.AttributeOverride;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java
index a3dad560b616..96fe10a3919d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.embedded;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java
index 72eb89e5375d..dc51d8f5bb90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java
index b01453061e29..0266a0b112fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
@@ -14,7 +12,7 @@
 @Embeddable
 public class Address {
 	public String street;
-	public String city; 
+	public String city;
 	public String state;
 
 	public String getCity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java
index adff7c3c5130..c15827770d38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java
index 1f420430da41..bf5eb1f7ea52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java
index 06f023e27f62..0511e025ed53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
@@ -35,7 +33,7 @@ public void testElementCollection() throws Exception {
 
 		//legacy mappings
 		assertTrue( isColumnPresent( "PropertyRecord_legacyUnsortedParcels", "ASSESSMENT") );
-		assertTrue( isColumnPresent( "PropertyRecord_legacyUnsortedParcels", "SQUARE_FEET") );		
+		assertTrue( isColumnPresent( "PropertyRecord_legacyUnsortedParcels", "SQUARE_FEET") );
 	}
 
 	public boolean isColumnPresent(String tableName, String columnName) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java
index d1789ba5494e..0d59cef04a43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java
index 14c4e834eb72..10e63f2cfd78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java
index 86202502eeca..e82bfc70a893 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
@@ -58,4 +56,3 @@ public void setContactInfo(ContactInfo contactInfo) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java
index d456b61b4a3a..f292c5ef607a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java
index 30c55fc35d50..7c2fb8f76741 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java
index b698bd0e1dee..2d3090fdd6f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java
index ed287bb67ffd..3beaf7d88302 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java
index 5af4fe3c618f..2a5f84fcb7e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java
index 06847ad86a50..2d0df873028f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java
index 459ddf2e2d27..bf2efa3be860 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java
index 0a44fecbbca7..1af640ca0ec0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java
index b9253a798d26..342f696a705b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java
index 39787e50f93a..3599d908a2d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.override;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java
index 479a4f31e767..20c3c2669cd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.plural.orderby.compliance;
 
@@ -17,16 +15,12 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.ordering.ast.OrderByComplianceViolation;
 
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.transaction.TransactionUtil2;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/CacheableHbmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/CacheableHbmXmlTest.java
index 121d3fec350d..78ec6c05bf64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/CacheableHbmXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/CacheableHbmXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cacheable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java
index a26ef31a941a..c7c03138e73a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cacheable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/ChangeGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/ChangeGroup.java
index 552eeef3c1e6..50d0b307f8df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/ChangeGroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/ChangeGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cid.nonaggregated.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicBindingTests.java
index e3b50d0fbaac..be6264ba178a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cid.nonaggregated.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicUsageTests.java
index 64eefe3fd2fc..a65b89361b04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cid.nonaggregated.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java
index eb25f6ed132b..b0ae7fc97bb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cid.nonaggregated.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneUsageTests.java
index c9bdc8559ce1..c1958a9baf00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.cid.nonaggregated.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java
index 87397d7f45e6..a3a9da8366c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.simple.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.java
index fb89ed0bc3e4..011f47d9eab6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.simple.pojo;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java
index 9fb102a5c2a6..52a71598bac2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.hbm.simple.pojo;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java
index 5f85388608cd..6baa1a2e80a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.mixed;
 
@@ -11,21 +9,21 @@
 @Entity
 public class AnnotationEntity {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "annotationentity_id_seq")
-    @SequenceGenerator(
-            name = "annotationentity_id_seq",
-            sequenceName = "annotationentity_id_seq"
-    )
-    private Long _id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "annotationentity_id_seq")
+	@SequenceGenerator(
+			name = "annotationentity_id_seq",
+			sequenceName = "annotationentity_id_seq"
+	)
+	private Long _id;
 
-    /**
-     * Get the identifier.
-     *
-     * @return the id.
-     */
-    public Long getId()
-    {
-        return _id;
-    }
+	/**
+	 * Get the identifier.
+	 *
+	 * @return the id.
+	 */
+	public Long getId()
+	{
+		return _id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java
index 4eba01343656..3d344cdc0d4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java
@@ -1,29 +1,27 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.mixed;
 
 public class HBMEntity {
 
-    private long _id;
-    private AnnotationEntity _association;
+	private long _id;
+	private AnnotationEntity _association;
 
-    public long getId() {
-        return _id;
-    }
+	public long getId() {
+		return _id;
+	}
 
-    public void setId(long id) {
-        _id = id;
-    }
+	public void setId(long id) {
+		_id = id;
+	}
 
-    public AnnotationEntity getAssociation() {
-        return _association;
-    }
+	public AnnotationEntity getAssociation() {
+		return _association;
+	}
 
-    public void setAssociation(AnnotationEntity association) {
-        _association = association;
-    }
+	public void setAssociation(AnnotationEntity association) {
+		_association = association;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java
index e516e102c620..983cff48e567 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.mixed;
 
@@ -17,31 +15,31 @@
  */
 public class HBMManyToOneAnnotationMissingPrimaryKeyTest extends BaseNonConfigCoreFunctionalTestCase
 {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                AnnotationEntity.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				AnnotationEntity.class
+		};
+	}
 
-    @Override
-    protected String[] getMappings() {
-        return new String[]{
-                "HBMEntity.hbm.xml"
-        };
-    }
+	@Override
+	protected String[] getMappings() {
+		return new String[]{
+				"HBMEntity.hbm.xml"
+		};
+	}
 
-    @Override
-    protected String getBaseForMappings() {
-        return "/org/hibernate/orm/test/bootstrap/binding/mixed/";
-    }
+	@Override
+	protected String getBaseForMappings() {
+		return "/org/hibernate/orm/test/bootstrap/binding/mixed/";
+	}
 
-    /**
-     * Test to trigger the NullPointerException in the ModelBinder.
-     * @throws Exception on error.
-     */
-    @Test
-    public void hhh11502() throws Exception {
-        Assert.assertTrue(true);
-    }
+	/**
+	 * Test to trigger the NullPointerException in the ModelBinder.
+	 * @throws Exception on error.
+	 */
+	@Test
+	public void hhh11502() throws Exception {
+		Assert.assertTrue(true);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java
index c10c45b20e72..54852049bc74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java
index 47d541bf135a..ee778b34b00d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Tests for verifying mixed use of HBM and annotations
  */
-package org.hibernate.orm.test.bootstrap.binding.mixed;
\ No newline at end of file
+package org.hibernate.orm.test.bootstrap.binding.mixed;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java
index 6ff568a1f711..1da1097af067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.naming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java
index 1a023992d6ee..66180747a14c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.binding.naming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java
index 7a0e95f37d06..30efc58be18d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.jpa;
 
@@ -22,7 +20,6 @@
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.jdbc.DataSourceStub;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.jpa.PersistenceUnitInfoAdapter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
index b3946d662cc9..a5b401281c3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.jpa;
 
@@ -12,7 +10,6 @@
 import java.util.Properties;
 import javax.sql.DataSource;
 
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.DatabaseVersion;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeakDetector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeakDetector.java
index fc0904281292..eeb9b3e3566d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeakDetector.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeakDetector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
@@ -30,7 +28,7 @@ public final class ClassLoaderLeakDetector {
 	 */
 	public static void assertNotLeakingAction(String fullClassnameOfRunnableAction) {
 		Assert.assertTrue( "It seems the action might have leaked the classloader",
-						   ClassLoaderLeakDetector.verifyActionNotLeakingClassloader( fullClassnameOfRunnableAction ) );
+						ClassLoaderLeakDetector.verifyActionNotLeakingClassloader( fullClassnameOfRunnableAction ) );
 	}
 
 	static boolean verifyActionNotLeakingClassloader(String fullClassnameOfRunnableAction) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeaksUtilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeaksUtilityTest.java
index 250567dcc715..53b72223bb2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeaksUtilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderLeaksUtilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
@@ -27,5 +25,3 @@ public void testClassLoaderLeaksNegated() {
 	}
 
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java
index 0e07cd7e5bcc..a4c1faf7ce36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
@@ -45,21 +43,21 @@ public void testNullTCCL() {
 		Thread.currentThread().setContextClassLoader( null );
 
 		ClassLoaderServiceImpl csi1 = new ClassLoaderServiceImpl( null,
-																  TcclLookupPrecedence.BEFORE );
+																TcclLookupPrecedence.BEFORE );
 		Class clazz1 = csi1.classForName(
 				ClassLoaderServiceImplTest.class.getName() );
 		assertEquals( ClassLoaderServiceImplTest.class, clazz1 );
 		csi1.stop();
 
 		ClassLoaderServiceImpl csi2 = new ClassLoaderServiceImpl( null,
-																  TcclLookupPrecedence.AFTER );
+																TcclLookupPrecedence.AFTER );
 		Class clazz2 = csi2.classForName(
 				ClassLoaderServiceImplTest.class.getName() );
 		assertEquals( ClassLoaderServiceImplTest.class, clazz2 );
 		csi2.stop();
 
 		ClassLoaderServiceImpl csi3 = new ClassLoaderServiceImpl( null,
-																  TcclLookupPrecedence.NEVER );
+																TcclLookupPrecedence.NEVER );
 		Class clazz3 = csi3.classForName(
 				ClassLoaderServiceImplTest.class.getName() );
 		assertEquals( ClassLoaderServiceImplTest.class, clazz3 );
@@ -72,7 +70,7 @@ public void testLookupBefore() {
 		Thread.currentThread().setContextClassLoader( icl );
 
 		ClassLoaderServiceImpl csi = new ClassLoaderServiceImpl( null,
-																 TcclLookupPrecedence.BEFORE );
+																TcclLookupPrecedence.BEFORE );
 		Class clazz = csi.classForName(
 				ClassLoaderServiceImplTest.class.getName() );
 		assertEquals( ClassLoaderServiceImplTest.class, clazz );
@@ -86,7 +84,7 @@ public void testLookupAfterAvoided() {
 		Thread.currentThread().setContextClassLoader( icl );
 
 		ClassLoaderServiceImpl csi = new ClassLoaderServiceImpl( null,
-																 TcclLookupPrecedence.AFTER );
+																TcclLookupPrecedence.AFTER );
 		Class clazz = csi.classForName(
 				ClassLoaderServiceImplTest.class.getName() );
 		assertEquals( ClassLoaderServiceImplTest.class, clazz );
@@ -100,7 +98,7 @@ public void testLookupAfter() {
 		Thread.currentThread().setContextClassLoader( icl );
 
 		ClassLoaderServiceImpl csi = new ClassLoaderServiceImpl( null,
-																 TcclLookupPrecedence.AFTER );
+																TcclLookupPrecedence.AFTER );
 		try {
 			csi.classForName( "test.class.name" );
 			assertTrue( false );
@@ -117,7 +115,7 @@ public void testLookupAfterNotFound() {
 		Thread.currentThread().setContextClassLoader( icl );
 
 		ClassLoaderServiceImpl csi = new ClassLoaderServiceImpl( null,
-																 TcclLookupPrecedence.BEFORE );
+																TcclLookupPrecedence.BEFORE );
 		try {
 			csi.classForName( "test.class.not.found" );
 			assertTrue( false );
@@ -134,7 +132,7 @@ public void testLookupNever() {
 		Thread.currentThread().setContextClassLoader( icl );
 
 		ClassLoaderServiceImpl csi = new ClassLoaderServiceImpl( null,
-																 TcclLookupPrecedence.NEVER );
+																TcclLookupPrecedence.NEVER );
 		try {
 			csi.classForName( "test.class.name" );
 			assertTrue( false );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java
index 45143e11fb49..2ffd1e59f322 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java
index 2b915d02b521..0e8b9fab2cf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
@@ -35,7 +33,7 @@ public class HibernateClassLoaderLeaksTest {
 	public static void prepareForClassLoaderLeakTest() {
 		final String property = System.getProperty( "log4j2.disableJmx" );
 		Assert.assertEquals( "To be able to test against leaks, the system property 'log4j2.disableJmx' must be set to true",
-							 "true", property );
+							"true", property );
 
 		//Attempt to workaround the mess of DriverManager leaks by clearing it before the test;
 		//it will most certainly re-register all drivers again within the test running context,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
index 23341b0e331e..a93abeb3b425 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java
index 5304166eead9..0bc3684ffaa4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakUtilitySelfTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakUtilitySelfTest.java
index 151ce3ed3686..98f623abfa7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakUtilitySelfTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakUtilitySelfTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakingTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakingTestAction.java
index 962103792f86..248097f6cd18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakingTestAction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/LeakingTestAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java
index 10218125d596..f965abb86748 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java
index 2594f0c9ea16..9519077ddd4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/NotLeakingTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/NotLeakingTestAction.java
index 9baa861999c4..dba855350e7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/NotLeakingTestAction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/NotLeakingTestAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/PhantomReferenceLeakDetector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/PhantomReferenceLeakDetector.java
index 0567c61f69d6..619d29b12da1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/PhantomReferenceLeakDetector.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/PhantomReferenceLeakDetector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.registry.classloading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/CustomScanner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/CustomScanner.java
index 547b3d0fce7c..2eedcd3a5537 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/CustomScanner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/CustomScanner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
@@ -37,4 +35,3 @@ public ScanResult scan(
 		return delegate.scan( environment, options, parameters );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java
index 997859a548e5..4a1224d24883 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java
index 0228126fc75c..6b516aa0561e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
@@ -284,17 +282,17 @@ public void testJarVisitorFactory() throws Exception {
 
 		//setting URL to accept vfs based protocol
 		URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory() {
-										   public URLStreamHandler createURLStreamHandler(String protocol) {
-											   if("vfszip".equals(protocol) || "vfsfile".equals(protocol) )
-												   return new URLStreamHandler() {
-													   protected URLConnection openConnection(URL u)
-															   throws IOException {
-														   return null;
-													   }
-												   };
-											   return null;
-										   }
-									   });
+										public URLStreamHandler createURLStreamHandler(String protocol) {
+											if("vfszip".equals(protocol) || "vfsfile".equals(protocol) )
+												return new URLStreamHandler() {
+													protected URLConnection openConnection(URL u)
+															throws IOException {
+														return null;
+													}
+												};
+											return null;
+										}
+									});
 
 		URL jarUrl = defaultPar.toURL();
 		ArchiveDescriptor descriptor = StandardArchiveDescriptorFactory.INSTANCE.buildArchiveDescriptor( jarUrl );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java
index dd84d7dccfad..fd3a24c1f0b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java
index fbb21a367eb1..3458da486f78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
@@ -444,5 +442,3 @@ protected File buildNestedEarDir(File includeFile) {
 	}
 
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java
index 918a2168fc11..898bc8eff6c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java
index e539ed60020b..9843f28b5ee6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
index 7425e3b95cec..d57fc958abe2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.scanning;
 
@@ -37,16 +35,11 @@
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.boot.spi.XmlMappingBinderAccess;
-import org.hibernate.cfg.Environment;
-import org.hibernate.engine.config.internal.ConfigurationServiceInitiator;
-import org.hibernate.engine.config.spi.ConfigurationService;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Logger;
 import org.hibernate.testing.orm.junit.MessageKeyInspection;
 import org.hibernate.testing.orm.junit.MessageKeyWatcher;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -234,4 +227,4 @@ private void assertManagedResourcesAfterCoordinateScanWithScanner(final Scanner
 		assertEquals( expectedIsManagedResourcesEmpty, managedResources.getAnnotatedPackageNames().isEmpty() );
 		assertEquals( expectedIsManagedResourcesEmpty, managedResources.getXmlMappingBindings().isEmpty() );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java
index 7ccaff1626ef..deb8d856a4b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.bootstrap.schema;
 
 import java.io.BufferedReader;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
index 6a9ba9a8ab39..6a8b6de7d6c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.schema;
 
@@ -10,7 +8,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.tool.schema.Action;
-import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
 import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.ActionGrouping;
 
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java
index 28158ec71d88..98b744d05ef5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
-import java.util.Set;
 
 import org.hibernate.boot.spi.AbstractDelegatingMetadata;
 import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.type.ConvertedBasicType;
 
 /**
  * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java
index f8d196bd52cb..79fc61e5f1a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java
index 50da4234c38a..f8c10c3b074b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java
index 1958ebdf46aa..daaa266652f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java
index b2c529086043..175402d03b7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java
index 25b0c776a5ab..102b594d8526 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java
index fd2f56e2180d..87276733fc77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java
index b940d2acd61a..c154cd367b28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java
index 4e696d863b7c..dea573fdd5d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
 import org.hibernate.boot.MetadataBuilder;
@@ -10,13 +14,13 @@
  */
 //tag::bootstrap-jpa-compliant-MetadataBuilderContributor-example[]
 public class SqlFunctionMetadataBuilderContributor
-        implements MetadataBuilderContributor {
+		implements MetadataBuilderContributor {
 
-    @Override
-    public void contribute(MetadataBuilder metadataBuilder) {
-        metadataBuilder.applySqlFunction(
-            "instr", new StandardSQLFunction( "instr", StandardBasicTypes.INTEGER )
-        );
-    }
+	@Override
+	public void contribute(MetadataBuilder metadataBuilder) {
+		metadataBuilder.applySqlFunction(
+			"instr", new StandardSQLFunction( "instr", StandardBasicTypes.INTEGER )
+		);
+	}
 }
 //end::bootstrap-jpa-compliant-MetadataBuilderContributor-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java
index 81e61acf5c32..d4fcca06fda5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java
index d828c96951dc..bb82366dcfbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
@@ -11,10 +9,6 @@
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java
index 29e605c84030..709ef7221966 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java
index 6a3e04ac5b5b..24526aee1475 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
@@ -15,7 +13,6 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java
index f1a7452febea..3167d55d43c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyCompositeIdTest.java
index 044d56e521d6..6491ba6c0ae8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyCompositeIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyIdTest.java
index 76e8f0b1413b..413256700eec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/AbstractMutationStrategyIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import jakarta.persistence.Entity;
@@ -12,7 +16,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.orm.test.jpa.compliance.CriteriaMutationQueryTableTest;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyCompositeIdTest.java
index aeea77045f12..ab3af4f43ab5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyCompositeIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
@@ -11,4 +15,4 @@ public class DefaultMutationStrategyCompositeIdTest extends AbstractMutationStra
 	protected Class getMultiTableBulkIdStrategyClass() {
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyIdTest.java
index d3fe1940bcef..ebef627406c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/DefaultMutationStrategyIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
@@ -11,4 +15,4 @@ public class DefaultMutationStrategyIdTest extends AbstractMutationStrategyIdTes
 	protected Class getMultiTableBulkIdStrategyClass() {
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java
index dcc966fc9cac..3a108d9043ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import java.sql.Timestamp;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyCompositeIdTest.java
index 77cdf6ccb9b5..42d4c08f8ded 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyCompositeIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy;
@@ -12,4 +16,4 @@ public class InlineMutationStrategyCompositeIdTest extends AbstractMutationStrat
 	protected Class getMultiTableBulkIdStrategyClass() {
 		return InlineMutationStrategy.class;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyIdTest.java
index 7c71dd84832e..dfd100e8b4d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/InlineMutationStrategyIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy;
@@ -12,4 +16,4 @@ public class InlineMutationStrategyIdTest extends AbstractMutationStrategyIdTest
 	protected Class getMultiTableBulkIdStrategyClass() {
 		return InlineMutationStrategy.class;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
index 95ee232deeab..5a8feeef0272 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bulkid;
 
 /**
@@ -12,4 +16,4 @@ public class OracleInlineMutationStrategyIdTest extends InlineMutationStrategyId
 	protected int entityCount() {
 		return 1100;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java
index 4517797ea517..fe51be5b5270 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode;
 import java.text.ParseException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java
index bb2a2931730f..159aad9086bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java
index 686d716878da..5ef2662e73c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java
index e3c46dc3f5a7..9a3f0100f38e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java
index 9a25bd9e1ad8..083b48667e4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode;
 
@@ -43,9 +41,9 @@ public static void clearBytecodeProvider() {
 	public void testReflectionOptimization() {
 		ReflectionOptimizer optimizer = provider.getReflectionOptimizer(
 				Bean.class,
-		        BeanReflectionHelper.getGetterNames(),
-		        BeanReflectionHelper.getSetterNames(),
-		        BeanReflectionHelper.getTypes()
+				BeanReflectionHelper.getGetterNames(),
+				BeanReflectionHelper.getSetterNames(),
+				BeanReflectionHelper.getTypes()
 		);
 		assertNotNull( optimizer );
 		assertNotNull( optimizer.getInstantiationOptimizer() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java
index e50855bc3ad1..a93e9c4d9da4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassTest.java
index 9cafb157013b..749f9cb5448b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassWithDifferentGenericParameterNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassWithDifferentGenericParameterNameTest.java
index b4f050f8356a..fe21c265e536 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassWithDifferentGenericParameterNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndNonVisibleGenericMappedSuperclassWithDifferentGenericParameterNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
index 31b0045e57de..9190a6bd011d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtedingAnotherEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtedingAnotherEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
index 29f2ebad9fe7..8173774f257f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtedingAnotherEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtedingAnotherEmbeddableAndTwiceRemovedNonVisibleGenericMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtendingMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtendingMappedSuperclassTest.java
index 03dafc4b3cea..12daddce5c44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtendingMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableExtendingMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableNonVisibleGenericExtendsSerializableMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableNonVisibleGenericExtendsSerializableMappedSuperclassTest.java
index 65d0a808cf90..3778a5eb4a47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableNonVisibleGenericExtendsSerializableMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableNonVisibleGenericExtendsSerializableMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java
index f1354c4191ec..ffcbe0ff03e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java
index a56f34ea7dd9..7ca18a92f756 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java
index f6de84cf2664..47ef48b88abf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericExtendsSerializableMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericExtendsSerializableMappedSuperclass.java
index 2b029a9a886f..b113725138de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericExtendsSerializableMappedSuperclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericExtendsSerializableMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericMappedSuperclass.java
index 17cfbc0bb2db..48daa6c62d6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericMappedSuperclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/MyNonVisibleGenericMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/SimpleEntity.java
index 66c93e8a6681..ef7716c8fe56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/VersionMismatchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/VersionMismatchTests.java
index 53632bda1e1f..35972cf97850 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/VersionMismatchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/VersionMismatchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhance.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java
index 5e9a6598856b..5b3cb9bd8a63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.access;
 
 import org.hibernate.bytecode.enhance.spi.UnloadedClass;
@@ -39,156 +43,156 @@
  */
 @JiraKey("HHH-10851" )
 @DomainModel(
-        annotatedClasses = {
-                MixedAccessTest.TestEntity.class, MixedAccessTest.TestOtherEntity.class,
-        }
+		annotatedClasses = {
+				MixedAccessTest.TestEntity.class, MixedAccessTest.TestOtherEntity.class,
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 @CustomEnhancementContext(MixedAccessTest.NoDirtyCheckingContext.class)
 public class MixedAccessTest {
 
-    private static final Pattern PARAM_PATTERN = Pattern.compile( "\\{\\\"(.*)\\\"\\:\\\"(.*)\\\"\\}" );
-    private static final Function MAPPING_FUNCTION = e -> "\"" + e.getKey() + "\":\"" + e.getValue() + "\"";
-    private static final String ID = "foo", PARAM_KEY = "paramName", PARAM_VAL = "paramValue", PARAMS_AS_STR = "{\"" + PARAM_KEY + "\":\"" + PARAM_VAL + "\"}";
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity testEntity = new TestEntity( ID );
-            testEntity.setParamsAsString( PARAMS_AS_STR );
-            s.persist( testEntity );
-
-            TestOtherEntity testOtherEntity = new TestOtherEntity( ID );
-            testOtherEntity.setParamsAsString( PARAMS_AS_STR );
-            s.persist( testOtherEntity );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity testEntity = s.get( TestEntity.class, ID );
-            assertEquals( PARAMS_AS_STR, testEntity.getParamsAsString() );
-
-            TestOtherEntity testOtherEntity = s.get( TestOtherEntity.class, ID );
-            assertEquals( PARAMS_AS_STR, testOtherEntity.getParamsAsString() );
-
-            // Clean parameters
-            testEntity.setParamsAsString( "{}" );
-            testOtherEntity.setParamsAsString( "{}" );
-        } );
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity testEntity = s.get( TestEntity.class, ID );
-            assertTrue( testEntity.getParams().isEmpty() );
-
-            TestOtherEntity testOtherEntity = s.get( TestOtherEntity.class, ID );
-            assertTrue( testOtherEntity.getParams().isEmpty() );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "TEST_ENTITY" )
-    static class TestEntity {
-
-        @Id
-        String name;
-
-        @Transient
-        Map params = new LinkedHashMap<>();
-
-        TestEntity(String name) {
-            this();
-            this.name = name;
-        }
-
-        TestEntity() {
-        }
-
-        Map getParams() {
-            return Collections.unmodifiableMap( params );
-        }
-
-        void setParams(Map params) {
-            this.params.clear();
-            this.params.putAll( params );
-        }
-
-        @Column( name = "params", length = 4000 )
-        @Access( AccessType.PROPERTY )
-        String getParamsAsString() {
-            return "{" + params.entrySet().stream().map( MAPPING_FUNCTION ).collect( joining( "," ) ) + "}";
-        }
-
-        @SuppressWarnings( "unchecked" )
-        void setParamsAsString(String string) {
-            Matcher matcher = PARAM_PATTERN.matcher( string );
-
-            params.clear();
-            if ( matcher.matches() && matcher.groupCount() > 1 ) {
-                params.put( matcher.group( 1 ), matcher.group( 2 ) );
-            }
-        }
-    }
-
-    @Entity
-    @Table( name = "OTHER_ENTITY" )
-    @Access( AccessType.FIELD )
-    static class TestOtherEntity {
-
-        @Id
-        String name;
-
-        @Transient
-        Map params = new LinkedHashMap<>();
-
-        TestOtherEntity(String name) {
-            this();
-            this.name = name;
-        }
-
-        TestOtherEntity() {
-        }
-
-        Map getParams() {
-            return Collections.unmodifiableMap( params );
-        }
-
-        void setParams(Map params) {
-            this.params.clear();
-            this.params.putAll( params );
-        }
-
-        @Column( name = "params", length = 4000 )
-        @Access( AccessType.PROPERTY )
-        String getParamsAsString() {
-            return "{" + params.entrySet().stream().map( MAPPING_FUNCTION ).collect( joining( "," ) ) + "}";
-        }
-
-        @SuppressWarnings( "unchecked" )
-        void setParamsAsString(String string) {
-            Matcher matcher = PARAM_PATTERN.matcher( string );
-
-            params.clear();
-            if ( matcher.matches() && matcher.groupCount() > 1 ) {
-                params.put( matcher.group( 1 ), matcher.group( 2 ) );
-            }
-        }
-    }
-
-    // --- //
-
-    public static class NoDirtyCheckingContext extends EnhancerTestContext {
-
-        @Override
-        public boolean doDirtyCheckingInline(UnloadedClass classDescriptor) {
-            return false;
-        }
-    }
+	private static final Pattern PARAM_PATTERN = Pattern.compile( "\\{\\\"(.*)\\\"\\:\\\"(.*)\\\"\\}" );
+	private static final Function MAPPING_FUNCTION = e -> "\"" + e.getKey() + "\":\"" + e.getValue() + "\"";
+	private static final String ID = "foo", PARAM_KEY = "paramName", PARAM_VAL = "paramValue", PARAMS_AS_STR = "{\"" + PARAM_KEY + "\":\"" + PARAM_VAL + "\"}";
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity testEntity = new TestEntity( ID );
+			testEntity.setParamsAsString( PARAMS_AS_STR );
+			s.persist( testEntity );
+
+			TestOtherEntity testOtherEntity = new TestOtherEntity( ID );
+			testOtherEntity.setParamsAsString( PARAMS_AS_STR );
+			s.persist( testOtherEntity );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity testEntity = s.get( TestEntity.class, ID );
+			assertEquals( PARAMS_AS_STR, testEntity.getParamsAsString() );
+
+			TestOtherEntity testOtherEntity = s.get( TestOtherEntity.class, ID );
+			assertEquals( PARAMS_AS_STR, testOtherEntity.getParamsAsString() );
+
+			// Clean parameters
+			testEntity.setParamsAsString( "{}" );
+			testOtherEntity.setParamsAsString( "{}" );
+		} );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity testEntity = s.get( TestEntity.class, ID );
+			assertTrue( testEntity.getParams().isEmpty() );
+
+			TestOtherEntity testOtherEntity = s.get( TestOtherEntity.class, ID );
+			assertTrue( testOtherEntity.getParams().isEmpty() );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "TEST_ENTITY" )
+	static class TestEntity {
+
+		@Id
+		String name;
+
+		@Transient
+		Map params = new LinkedHashMap<>();
+
+		TestEntity(String name) {
+			this();
+			this.name = name;
+		}
+
+		TestEntity() {
+		}
+
+		Map getParams() {
+			return Collections.unmodifiableMap( params );
+		}
+
+		void setParams(Map params) {
+			this.params.clear();
+			this.params.putAll( params );
+		}
+
+		@Column( name = "params", length = 4000 )
+		@Access( AccessType.PROPERTY )
+		String getParamsAsString() {
+			return "{" + params.entrySet().stream().map( MAPPING_FUNCTION ).collect( joining( "," ) ) + "}";
+		}
+
+		@SuppressWarnings( "unchecked" )
+		void setParamsAsString(String string) {
+			Matcher matcher = PARAM_PATTERN.matcher( string );
+
+			params.clear();
+			if ( matcher.matches() && matcher.groupCount() > 1 ) {
+				params.put( matcher.group( 1 ), matcher.group( 2 ) );
+			}
+		}
+	}
+
+	@Entity
+	@Table( name = "OTHER_ENTITY" )
+	@Access( AccessType.FIELD )
+	static class TestOtherEntity {
+
+		@Id
+		String name;
+
+		@Transient
+		Map params = new LinkedHashMap<>();
+
+		TestOtherEntity(String name) {
+			this();
+			this.name = name;
+		}
+
+		TestOtherEntity() {
+		}
+
+		Map getParams() {
+			return Collections.unmodifiableMap( params );
+		}
+
+		void setParams(Map params) {
+			this.params.clear();
+			this.params.putAll( params );
+		}
+
+		@Column( name = "params", length = 4000 )
+		@Access( AccessType.PROPERTY )
+		String getParamsAsString() {
+			return "{" + params.entrySet().stream().map( MAPPING_FUNCTION ).collect( joining( "," ) ) + "}";
+		}
+
+		@SuppressWarnings( "unchecked" )
+		void setParamsAsString(String string) {
+			Matcher matcher = PARAM_PATTERN.matcher( string );
+
+			params.clear();
+			if ( matcher.matches() && matcher.groupCount() > 1 ) {
+				params.put( matcher.group( 1 ), matcher.group( 2 ) );
+			}
+		}
+	}
+
+	// --- //
+
+	public static class NoDirtyCheckingContext extends EnhancerTestContext {
+
+		@Override
+		public boolean doDirtyCheckingInline(UnloadedClass classDescriptor) {
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/PropertyAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/PropertyAccessTest.java
index f94f014a196b..80a738c4ad5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/PropertyAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/PropertyAccessTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.access;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
index 22a536f547bb..9bd4fa1ebd74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
 import org.hibernate.annotations.DynamicInsert;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java
index 1fe4b2d7059d..72419fe4055d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java
index 500135cb184f..c4c17ce4942f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
@@ -18,7 +16,6 @@
 import jakarta.persistence.ManyToMany;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -26,68 +23,68 @@
  */
 @BytecodeEnhanced
 public class ManyToManyAssociationListTest {
-    @Test
-    public void testBidirectionalExisting() {
-        Group group = new Group();
-        Group anotherGroup = new Group();
+	@Test
+	public void testBidirectionalExisting() {
+		Group group = new Group();
+		Group anotherGroup = new Group();
 
-        User user = new User();
-        anotherGroup.users.add( user );
+		User user = new User();
+		anotherGroup.users.add( user );
 
-        user.setGroups( new ArrayList<>( Collections.singleton( group ) ) );
-        user.setGroups( new ArrayList<>( Arrays.asList( group, anotherGroup ) ) );
+		user.setGroups( new ArrayList<>( Collections.singleton( group ) ) );
+		user.setGroups( new ArrayList<>( Arrays.asList( group, anotherGroup ) ) );
 
-        assertEquals( 1, group.getUsers().size() );
-        assertEquals( 1, anotherGroup.getUsers().size() );
-    }
+		assertEquals( 1, group.getUsers().size() );
+		assertEquals( 1, anotherGroup.getUsers().size() );
+	}
 
-    // -- //
+	// -- //
 
-    @Entity
-    private static class Group {
+	@Entity
+	private static class Group {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @Column
-        String name;
+		@Column
+		String name;
 
-        @ManyToMany( mappedBy = "groups" )
-        List users = new ArrayList<>();
+		@ManyToMany( mappedBy = "groups" )
+		List users = new ArrayList<>();
 
-        List getUsers() {
-            return Collections.unmodifiableList( users );
-        }
+		List getUsers() {
+			return Collections.unmodifiableList( users );
+		}
 
-        void resetUsers() {
-            // this wouldn't trigger association management: users.clear();
-            users = new ArrayList<>();
-        }
-    }
+		void resetUsers() {
+			// this wouldn't trigger association management: users.clear();
+			users = new ArrayList<>();
+		}
+	}
 
-    @Entity
-    private static class User {
+	@Entity
+	private static class User {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String password;
+		String password;
 
-        @ManyToMany
-        List groups;
+		@ManyToMany
+		List groups;
 
-        void addGroup(Group group) {
-            List groups = this.groups == null ? new ArrayList<>() : this.groups;
-            groups.add( group );
-            this.groups = groups;
-        }
+		void addGroup(Group group) {
+			List groups = this.groups == null ? new ArrayList<>() : this.groups;
+			groups.add( group );
+			this.groups = groups;
+		}
 
-        List getGroups() {
-            return Collections.unmodifiableList( groups );
-        }
+		List getGroups() {
+			return Collections.unmodifiableList( groups );
+		}
 
-        void setGroups(List groups) {
-            this.groups = groups;
-        }
-    }
+		void setGroups(List groups) {
+			this.groups = groups;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java
index 428deb7fc987..d9cf2d534b83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -26,95 +23,95 @@
 @BytecodeEnhanced
 public class ManyToManyAssociationTest {
 
-    @Test
-    public void test() {
-        Group group = new Group();
-        Group anotherGroup = new Group();
+	@Test
+	public void test() {
+		Group group = new Group();
+		Group anotherGroup = new Group();
 
-        User user = new User();
-        User anotherUser = new User();
+		User user = new User();
+		User anotherUser = new User();
 
-        user.addGroup( group );
-        user.addGroup( anotherGroup );
-        anotherUser.addGroup( group );
+		user.addGroup( group );
+		user.addGroup( anotherGroup );
+		anotherUser.addGroup( group );
 
-        assertEquals( 2, group.getUsers().size() );
-        assertEquals( 1, anotherGroup.getUsers().size() );
+		assertEquals( 2, group.getUsers().size() );
+		assertEquals( 1, anotherGroup.getUsers().size() );
 
-        group.resetUsers();
+		group.resetUsers();
 
-        assertEquals( 1, user.getGroups().size() );
-        assertEquals( 0, anotherUser.getGroups().size() );
+		assertEquals( 1, user.getGroups().size() );
+		assertEquals( 0, anotherUser.getGroups().size() );
 
-        // Test remove
-        user.addGroup( group );
-        anotherUser.addGroup( group );
+		// Test remove
+		user.addGroup( group );
+		anotherUser.addGroup( group );
 
-        assertEquals( 2, group.getUsers().size() );
-        assertEquals( 1, anotherGroup.getUsers().size() );
+		assertEquals( 2, group.getUsers().size() );
+		assertEquals( 1, anotherGroup.getUsers().size() );
 
-        Set groups = new HashSet<>( user.getGroups() );
-        groups.remove( group );
-        user.setGroups( groups );
+		Set groups = new HashSet<>( user.getGroups() );
+		groups.remove( group );
+		user.setGroups( groups );
 
-        assertEquals( 1, group.getUsers().size() );
-        assertEquals( 1, anotherGroup.getUsers().size() );
+		assertEquals( 1, group.getUsers().size() );
+		assertEquals( 1, anotherGroup.getUsers().size() );
 
-        groups.remove( anotherGroup );
-        user.setGroups( groups );
+		groups.remove( anotherGroup );
+		user.setGroups( groups );
 
-        assertEquals( 1, group.getUsers().size() );
-        // This happens (and is expected) because there was no snapshot taken before remove
-        assertEquals( 1, anotherGroup.getUsers().size() );
-    }
+		assertEquals( 1, group.getUsers().size() );
+		// This happens (and is expected) because there was no snapshot taken before remove
+		assertEquals( 1, anotherGroup.getUsers().size() );
+	}
 
-    // -- //
+	// -- //
 
-    @Entity
-    private static class Group {
+	@Entity
+	private static class Group {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @Column
-        String name;
+		@Column
+		String name;
 
-        @ManyToMany( mappedBy = "groups" )
-        Set users = new HashSet<>();
+		@ManyToMany( mappedBy = "groups" )
+		Set users = new HashSet<>();
 
-        Set getUsers() {
-            return Collections.unmodifiableSet( users );
-        }
+		Set getUsers() {
+			return Collections.unmodifiableSet( users );
+		}
 
-        void resetUsers() {
-            // this wouldn't trigger association management: users.clear();
-            users = new HashSet<>();
-        }
-    }
+		void resetUsers() {
+			// this wouldn't trigger association management: users.clear();
+			users = new HashSet<>();
+		}
+	}
 
-    @Entity
-    private static class User {
+	@Entity
+	private static class User {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String password;
+		String password;
 
-        @ManyToMany
-        Set groups;
+		@ManyToMany
+		Set groups;
 
-        void addGroup(Group group) {
-            Set groups = this.groups == null ? new HashSet<>() : this.groups;
-            groups.add( group );
-            this.groups = groups;
-        }
+		void addGroup(Group group) {
+			Set groups = this.groups == null ? new HashSet<>() : this.groups;
+			groups.add( group );
+			this.groups = groups;
+		}
 
-        Set getGroups() {
-            return Collections.unmodifiableSet( groups );
-        }
+		Set getGroups() {
+			return Collections.unmodifiableSet( groups );
+		}
 
-        void setGroups(Set groups) {
-            this.groups = groups;
-        }
-    }
+		void setGroups(Set groups) {
+			this.groups = groups;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java
index 1d558531a846..4a72885a0af0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
@@ -30,99 +28,99 @@
 @BytecodeEnhanced
 public class OneToManyAssociationTest {
 
-    @Test
-    public void test() {
-        Customer customer = new Customer();
-        assertTrue( customer.getInventories().isEmpty() );
+	@Test
+	public void test() {
+		Customer customer = new Customer();
+		assertTrue( customer.getInventories().isEmpty() );
 
-        CustomerInventory customerInventory = new CustomerInventory();
-        customerInventory.setCustomer( customer );
+		CustomerInventory customerInventory = new CustomerInventory();
+		customerInventory.setCustomer( customer );
 
-        assertEquals( 1, customer.getInventories().size() );
-        assertTrue( customer.getInventories().contains( customerInventory ) );
+		assertEquals( 1, customer.getInventories().size() );
+		assertTrue( customer.getInventories().contains( customerInventory ) );
 
-        Customer anotherCustomer = new Customer();
-        assertTrue( anotherCustomer.getInventories().isEmpty() );
-        customerInventory.setCustomer( anotherCustomer );
+		Customer anotherCustomer = new Customer();
+		assertTrue( anotherCustomer.getInventories().isEmpty() );
+		customerInventory.setCustomer( anotherCustomer );
 
-        assertTrue( customer.getInventories().isEmpty() );
-        assertEquals( 1, anotherCustomer.getInventories().size() );
-        assertSame( customerInventory, anotherCustomer.getInventories().get( 0 ) );
+		assertTrue( customer.getInventories().isEmpty() );
+		assertEquals( 1, anotherCustomer.getInventories().size() );
+		assertSame( customerInventory, anotherCustomer.getInventories().get( 0 ) );
 
-        customer.addInventory( customerInventory );
+		customer.addInventory( customerInventory );
 
-        assertSame( customer, customerInventory.getCustomer() );
-        assertTrue( anotherCustomer.getInventories().isEmpty() );
-        assertEquals( 1, customer.getInventories().size() );
+		assertSame( customer, customerInventory.getCustomer() );
+		assertTrue( anotherCustomer.getInventories().isEmpty() );
+		assertEquals( 1, customer.getInventories().size() );
 
-        customer.addInventory( new CustomerInventory() );
-        assertEquals( 2, customer.getInventories().size() );
+		customer.addInventory( new CustomerInventory() );
+		assertEquals( 2, customer.getInventories().size() );
 
-        // Test remove
-        customer.removeInventory( customerInventory );
-        assertEquals( 1, customer.getInventories().size() );
+		// Test remove
+		customer.removeInventory( customerInventory );
+		assertEquals( 1, customer.getInventories().size() );
 
-        // This happens (and is expected) because there was no snapshot taken before remove
-        assertNotNull( customerInventory.getCustomer() );
-    }
+		// This happens (and is expected) because there was no snapshot taken before remove
+		assertNotNull( customerInventory.getCustomer() );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    private static class Customer {
+	@Entity
+	private static class Customer {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String name;
+		String name;
 
-        // HHH-13446 - Type not validated in bi-directional association mapping
-        @OneToMany(cascade = CascadeType.ALL, mappedBy = "custId", fetch = FetchType.EAGER)
-        List inventoryIdList = new ArrayList<>();
+		// HHH-13446 - Type not validated in bi-directional association mapping
+		@OneToMany(cascade = CascadeType.ALL, mappedBy = "custId", fetch = FetchType.EAGER)
+		List inventoryIdList = new ArrayList<>();
 
-        @OneToMany( mappedBy = "customer", cascade = CascadeType.ALL, fetch = FetchType.EAGER )
-        List customerInventories = new ArrayList<>();
+		@OneToMany( mappedBy = "customer", cascade = CascadeType.ALL, fetch = FetchType.EAGER )
+		List customerInventories = new ArrayList<>();
 
-        void addInventory(CustomerInventory inventory) {
-            List list = customerInventories;
-            list.add( inventory );
-            customerInventories = list;
-        }
+		void addInventory(CustomerInventory inventory) {
+			List list = customerInventories;
+			list.add( inventory );
+			customerInventories = list;
+		}
 
-        List getInventories() {
-            return Collections.unmodifiableList( customerInventories );
-        }
+		List getInventories() {
+			return Collections.unmodifiableList( customerInventories );
+		}
 
-        void removeInventory(CustomerInventory inventory) {
-            customerInventories.remove( inventory );
-        }
-    }
+		void removeInventory(CustomerInventory inventory) {
+			customerInventories.remove( inventory );
+		}
+	}
 
-    @Entity
-    private static class CustomerInventory {
+	@Entity
+	private static class CustomerInventory {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @Id
-        Long custId;
+		@Id
+		Long custId;
 
-        @ManyToOne( cascade = CascadeType.MERGE )
-        Customer customer;
+		@ManyToOne( cascade = CascadeType.MERGE )
+		Customer customer;
 
-        @ManyToOne( cascade = CascadeType.MERGE )
-        String vehicle;
+		@ManyToOne( cascade = CascadeType.MERGE )
+		String vehicle;
 
-        Customer getCustomer() {
-            return customer;
-        }
+		Customer getCustomer() {
+			return customer;
+		}
 
-        void setCustomer(Customer customer) {
-            this.customer = customer;
-        }
+		void setCustomer(Customer customer) {
+			this.customer = customer;
+		}
 
-        void setVehicle(String vehicle) {
-            this.vehicle = vehicle;
-        }
-    }
+		void setVehicle(String vehicle) {
+			this.vehicle = vehicle;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest.java
index a3de48568d47..9a9dd11d2dac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
@@ -27,7 +25,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -182,4 +179,4 @@ public Order getOrder() {
 			return order;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest2.java
index 8200054105f5..95ef6da43e3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyLazyAndEagerTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
@@ -182,4 +180,4 @@ public User getTargetUser() {
 		}
 
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOnEnhancedEntityLoadedAsReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOnEnhancedEntityLoadedAsReferenceTest.java
index c93b54a3618f..641778fbecf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOnEnhancedEntityLoadedAsReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOnEnhancedEntityLoadedAsReferenceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java
index 4cd35d5e8c4c..f69602dfff1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.association;
 
@@ -25,94 +23,94 @@
 @BytecodeEnhanced
 public class OneToOneAssociationTest {
 
-    @Test
-    public void test() {
-        User user = new User();
-        user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
+	@Test
+	public void test() {
+		User user = new User();
+		user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
 
-        Customer customer = new Customer();
-        customer.setUser( user );
+		Customer customer = new Customer();
+		customer.setUser( user );
 
-        assertEquals( customer, user.getCustomer() );
+		assertEquals( customer, user.getCustomer() );
 
-        // check dirty tracking is set automatically with bi-directional association management
-        EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
+		// check dirty tracking is set automatically with bi-directional association management
+		EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
 
-        User anotherUser = new User();
-        anotherUser.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
+		User anotherUser = new User();
+		anotherUser.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
 
-        customer.setUser( anotherUser );
+		customer.setUser( anotherUser );
 
-        assertNull( user.getCustomer() );
-        assertEquals( customer, anotherUser.getCustomer() );
+		assertNull( user.getCustomer() );
+		assertEquals( customer, anotherUser.getCustomer() );
 
-        user.setCustomer( new Customer() );
+		user.setCustomer( new Customer() );
 
-        assertEquals( user, user.getCustomer().getUser() );
-    }
+		assertEquals( user, user.getCustomer().getUser() );
+	}
 
-    @Test
-    public void testSetNull() {
-        User user = new User();
-        user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
+	@Test
+	public void testSetNull() {
+		User user = new User();
+		user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
 
-        Customer customer = new Customer();
-        customer.setUser( user );
+		Customer customer = new Customer();
+		customer.setUser( user );
 
-        assertEquals( customer, user.getCustomer() );
+		assertEquals( customer, user.getCustomer() );
 
-        // check dirty tracking is set automatically with bi-directional association management
-        EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
+		// check dirty tracking is set automatically with bi-directional association management
+		EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
 
-        user.setCustomer( null );
+		user.setCustomer( null );
 
-        assertNull( user.getCustomer() );
-        assertNull( customer.getUser() );
-    }
+		assertNull( user.getCustomer() );
+		assertNull( customer.getUser() );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    private static class Customer {
+	@Entity
+	private static class Customer {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @OneToOne
-        User user;
+		@OneToOne
+		User user;
 
-        User getUser() {
-            return user;
-        }
+		User getUser() {
+			return user;
+		}
 
-        void setUser(User newUser) {
-            user = newUser;
-        }
-    }
+		void setUser(User newUser) {
+			user = newUser;
+		}
+	}
 
-    @Entity
-    private static class User {
+	@Entity
+	private static class User {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String login;
+		String login;
 
-        String password;
+		String password;
 
-        @OneToOne( mappedBy = "user" )
-        Customer customer;
+		@OneToOne( mappedBy = "user" )
+		Customer customer;
 
-        void setLogin(String login) {
-            this.login = login;
-        }
+		void setLogin(String login) {
+			this.login = login;
+		}
 
-        Customer getCustomer() {
-            return customer;
-        }
+		Customer getCustomer() {
+			return customer;
+		}
 
-        void setCustomer(Customer customer) {
-            this.customer = customer;
-        }
-    }
+		void setCustomer(Customer customer) {
+			this.customer = customer;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java
index ad4dffb35243..93baf29d6697 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.bag;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java
index 4d5cf481afbe..33f7119b5173 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.bag;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java
index b2a20a03a33a..1e676f0714f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
@@ -37,146 +35,146 @@
 @BytecodeEnhanced
 public class BasicEnhancementTest {
 
-    @Test
-    public void basicManagedTest() {
-        SimpleEntity entity = new SimpleEntity();
+	@Test
+	public void basicManagedTest() {
+		SimpleEntity entity = new SimpleEntity();
 
-        // Call the new ManagedEntity methods
-        assertTyping( ManagedEntity.class, entity );
-        ManagedEntity managedEntity = (ManagedEntity) entity;
-        assertSame( entity, managedEntity.$$_hibernate_getEntityInstance() );
+		// Call the new ManagedEntity methods
+		assertTyping( ManagedEntity.class, entity );
+		ManagedEntity managedEntity = (ManagedEntity) entity;
+		assertSame( entity, managedEntity.$$_hibernate_getEntityInstance() );
 
-        assertNull( managedEntity.$$_hibernate_getEntityEntry() );
-        managedEntity.$$_hibernate_setEntityEntry( EnhancerTestUtils.makeEntityEntry() );
-        assertNotNull( managedEntity.$$_hibernate_getEntityEntry() );
-        managedEntity.$$_hibernate_setEntityEntry( null );
-        assertNull( managedEntity.$$_hibernate_getEntityEntry() );
+		assertNull( managedEntity.$$_hibernate_getEntityEntry() );
+		managedEntity.$$_hibernate_setEntityEntry( EnhancerTestUtils.makeEntityEntry() );
+		assertNotNull( managedEntity.$$_hibernate_getEntityEntry() );
+		managedEntity.$$_hibernate_setEntityEntry( null );
+		assertNull( managedEntity.$$_hibernate_getEntityEntry() );
 
-        managedEntity.$$_hibernate_setNextManagedEntity( managedEntity );
-        managedEntity.$$_hibernate_setPreviousManagedEntity( managedEntity );
-        assertSame( managedEntity, managedEntity.$$_hibernate_getNextManagedEntity() );
-        assertSame( managedEntity, managedEntity.$$_hibernate_getPreviousManagedEntity() );
-    }
+		managedEntity.$$_hibernate_setNextManagedEntity( managedEntity );
+		managedEntity.$$_hibernate_setPreviousManagedEntity( managedEntity );
+		assertSame( managedEntity, managedEntity.$$_hibernate_getNextManagedEntity() );
+		assertSame( managedEntity, managedEntity.$$_hibernate_getPreviousManagedEntity() );
+	}
 
-    @Test
-    @Jira("HHH-13439")
-    public void enhancementInfoTest() {
-        EnhancementInfo info = SimpleEntity.class.getAnnotation( EnhancementInfo.class );
-        assertNotNull( info, "EnhancementInfo was not applied" );
+	@Test
+	@Jira("HHH-13439")
+	public void enhancementInfoTest() {
+		EnhancementInfo info = SimpleEntity.class.getAnnotation( EnhancementInfo.class );
+		assertNotNull( info, "EnhancementInfo was not applied" );
 
-        assertEquals( Version.getVersionString(), info.version() );
-    }
+		assertEquals( Version.getVersionString(), info.version() );
+	}
 
-    @Test
-    public void basicInterceptableTest() {
-        SimpleEntity entity = new SimpleEntity();
+	@Test
+	public void basicInterceptableTest() {
+		SimpleEntity entity = new SimpleEntity();
 
-        assertTyping( PersistentAttributeInterceptable.class, entity );
-        PersistentAttributeInterceptable interceptableEntity = (PersistentAttributeInterceptable) entity;
+		assertTyping( PersistentAttributeInterceptable.class, entity );
+		PersistentAttributeInterceptable interceptableEntity = (PersistentAttributeInterceptable) entity;
 
-        assertNull( interceptableEntity.$$_hibernate_getInterceptor() );
-        interceptableEntity.$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
-        assertNotNull( interceptableEntity.$$_hibernate_getInterceptor() );
+		assertNull( interceptableEntity.$$_hibernate_getInterceptor() );
+		interceptableEntity.$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
+		assertNotNull( interceptableEntity.$$_hibernate_getInterceptor() );
 
-        assertNull( EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
-        entity.setAnObject( new Object() );
+		assertNull( EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
+		entity.setAnObject( new Object() );
 
-        assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
-        assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, entity.getAnObject() );
+		assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
+		assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, entity.getAnObject() );
 
-        entity.setAnObject( null );
-        assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
-    }
+		entity.setAnObject( null );
+		assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" ) );
+	}
 
-    @Test
-    public void basicExtendedEnhancementTest() {
-        // test uses ObjectAttributeMarkerInterceptor to ensure that field access is routed through enhanced methods
+	@Test
+	public void basicExtendedEnhancementTest() {
+		// test uses ObjectAttributeMarkerInterceptor to ensure that field access is routed through enhanced methods
 
-        SimpleEntity entity = new SimpleEntity();
-        ( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
+		SimpleEntity entity = new SimpleEntity();
+		( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
 
-        Object decoy = new Object();
-        entity.anUnspecifiedObject = decoy;
+		Object decoy = new Object();
+		entity.anUnspecifiedObject = decoy;
 
-        Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
-        assertNotSame( decoy, gotByReflection );
-        assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
+		Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
+		assertNotSame( decoy, gotByReflection );
+		assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
 
-        Object entityObject = entity.anUnspecifiedObject;
+		Object entityObject = entity.anUnspecifiedObject;
 
-        assertNotSame( decoy, entityObject );
-        assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, entityObject );
+		assertNotSame( decoy, entityObject );
+		assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, entityObject );
 
-        // do some more calls on the various types, without the interceptor
-        ( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( null );
+		// do some more calls on the various types, without the interceptor
+		( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( null );
 
-        entity.id = 1234567890L;
-        assertEquals( 1234567890L, (long) entity.getId() );
+		entity.id = 1234567890L;
+		assertEquals( 1234567890L, (long) entity.getId() );
 
-        entity.name = "Entity Name";
-        assertSame( "Entity Name", entity.name );
+		entity.name = "Entity Name";
+		assertSame( "Entity Name", entity.name );
 
-        entity.active = true;
-        assertTrue( entity.getActive() );
+		entity.active = true;
+		assertTrue( entity.getActive() );
 
-        entity.someStrings = Arrays.asList( "A", "B", "C", "D" );
-        assertArrayEquals( new String[]{"A", "B", "C", "D"}, entity.someStrings.toArray() );
-    }
+		entity.someStrings = Arrays.asList( "A", "B", "C", "D" );
+		assertArrayEquals( new String[]{"A", "B", "C", "D"}, entity.someStrings.toArray() );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    private static class SimpleEntity {
+	@Entity
+	private static class SimpleEntity {
 
-        Object anUnspecifiedObject;
+		Object anUnspecifiedObject;
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String name;
+		String name;
 
-        Boolean active;
+		Boolean active;
 
-        List someStrings;
+		List someStrings;
 
-        Long getId() {
-            return id;
-        }
+		Long getId() {
+			return id;
+		}
 
-        void setId(Long id) {
-            this.id = id;
-        }
+		void setId(Long id) {
+			this.id = id;
+		}
 
-        String getName() {
-            return name;
-        }
+		String getName() {
+			return name;
+		}
 
-        void setName(String name) {
-            this.name = name;
-        }
+		void setName(String name) {
+			this.name = name;
+		}
 
-        public Boolean getActive() {
-            return active;
-        }
+		public Boolean getActive() {
+			return active;
+		}
 
-        public void setActive(Boolean active) {
-            this.active = active;
-        }
+		public void setActive(Boolean active) {
+			this.active = active;
+		}
 
-        Object getAnObject() {
-            return anUnspecifiedObject;
-        }
+		Object getAnObject() {
+			return anUnspecifiedObject;
+		}
 
-        void setAnObject(Object providedObject) {
-            this.anUnspecifiedObject = providedObject;
-        }
+		void setAnObject(Object providedObject) {
+			this.anUnspecifiedObject = providedObject;
+		}
 
-        List getSomeStrings() {
-            return Collections.unmodifiableList( someStrings );
-        }
+		List getSomeStrings() {
+			return Collections.unmodifiableList( someStrings );
+		}
 
-        void setSomeStrings(List someStrings) {
-            this.someStrings = someStrings;
-        }
-    }
+		void setSomeStrings(List someStrings) {
+			this.someStrings = someStrings;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java
index cb05208536cf..fc41ec098be1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
@@ -28,112 +26,112 @@
  * @author Luis Barreiro
  */
 @DomainModel(
-        annotatedClasses = {
-                BasicSessionTest.MyEntity.class,
-        }
+		annotatedClasses = {
+				BasicSessionTest.MyEntity.class,
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class BasicSessionTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new MyEntity( 1L ) );
-            s.persist( new MyEntity( 2L ) );
-        } );
-
-        MyEntity[] entities = new MyEntity[2];
-
-        scope.inTransaction( s -> {
-            entities[0] = s.get( MyEntity.class, 1L );
-            entities[1] = s.get( MyEntity.class, 2L );
-
-            assertNotNull( entities[0].$$_hibernate_getEntityInstance() );
-            assertSame( entities[0], entities[0].$$_hibernate_getEntityInstance() );
-            assertNotNull( entities[0].$$_hibernate_getEntityEntry() );
-            assertNull( entities[0].$$_hibernate_getPreviousManagedEntity() );
-            assertNotNull( entities[0].$$_hibernate_getNextManagedEntity() );
-
-            assertNotNull( entities[1].$$_hibernate_getEntityInstance() );
-            assertSame( entities[1], entities[1].$$_hibernate_getEntityInstance() );
-            assertNotNull( entities[1].$$_hibernate_getEntityEntry() );
-            assertNotNull( entities[1].$$_hibernate_getPreviousManagedEntity() );
-            assertNull( entities[1].$$_hibernate_getNextManagedEntity() );
-
-            s.createQuery( "delete MyEntity" ).executeUpdate();
-        } );
-
-        assertNull( entities[0].$$_hibernate_getEntityEntry() );
-        assertNull( entities[1].$$_hibernate_getEntityEntry() );
-    }
-
-    // --- //
-
-    @Entity( name = "MyEntity" )
-    @Table( name = "MY_ENTITY" )
-    static class MyEntity implements ManagedEntity {
-
-        @Id
-        Long id;
-
-        @Transient
-        private transient EntityEntry entityEntry;
-        @Transient
-        private transient ManagedEntity previous;
-        @Transient
-        private transient ManagedEntity next;
-
-        MyEntity() {
-        }
-
-        MyEntity(Long id) {
-            this.id = id;
-        }
-
-        @Override
-        public Object $$_hibernate_getEntityInstance() {
-            return this;
-        }
-
-        @Override
-        public EntityEntry $$_hibernate_getEntityEntry() {
-            return entityEntry;
-        }
-
-        @Override
-        public void $$_hibernate_setEntityEntry(EntityEntry entityEntry) {
-            this.entityEntry = entityEntry;
-        }
-
-        @Override
-        public ManagedEntity $$_hibernate_getNextManagedEntity() {
-            return next;
-        }
-
-        @Override
-        public void $$_hibernate_setNextManagedEntity(ManagedEntity next) {
-            this.next = next;
-        }
-
-        @Override
-        public ManagedEntity $$_hibernate_getPreviousManagedEntity() {
-            return previous;
-        }
-
-        @Override
-        public void $$_hibernate_setPreviousManagedEntity(ManagedEntity previous) {
-            this.previous = previous;
-        }
-
-        @Override
-        public void $$_hibernate_setUseTracker(boolean useTracker) {
-
-        }
-
-        @Override
-        public boolean $$_hibernate_useTracker() {
-            return false;
-        }
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new MyEntity( 1L ) );
+			s.persist( new MyEntity( 2L ) );
+		} );
+
+		MyEntity[] entities = new MyEntity[2];
+
+		scope.inTransaction( s -> {
+			entities[0] = s.get( MyEntity.class, 1L );
+			entities[1] = s.get( MyEntity.class, 2L );
+
+			assertNotNull( entities[0].$$_hibernate_getEntityInstance() );
+			assertSame( entities[0], entities[0].$$_hibernate_getEntityInstance() );
+			assertNotNull( entities[0].$$_hibernate_getEntityEntry() );
+			assertNull( entities[0].$$_hibernate_getPreviousManagedEntity() );
+			assertNotNull( entities[0].$$_hibernate_getNextManagedEntity() );
+
+			assertNotNull( entities[1].$$_hibernate_getEntityInstance() );
+			assertSame( entities[1], entities[1].$$_hibernate_getEntityInstance() );
+			assertNotNull( entities[1].$$_hibernate_getEntityEntry() );
+			assertNotNull( entities[1].$$_hibernate_getPreviousManagedEntity() );
+			assertNull( entities[1].$$_hibernate_getNextManagedEntity() );
+
+			s.createQuery( "delete MyEntity" ).executeUpdate();
+		} );
+
+		assertNull( entities[0].$$_hibernate_getEntityEntry() );
+		assertNull( entities[1].$$_hibernate_getEntityEntry() );
+	}
+
+	// --- //
+
+	@Entity( name = "MyEntity" )
+	@Table( name = "MY_ENTITY" )
+	static class MyEntity implements ManagedEntity {
+
+		@Id
+		Long id;
+
+		@Transient
+		private transient EntityEntry entityEntry;
+		@Transient
+		private transient ManagedEntity previous;
+		@Transient
+		private transient ManagedEntity next;
+
+		MyEntity() {
+		}
+
+		MyEntity(Long id) {
+			this.id = id;
+		}
+
+		@Override
+		public Object $$_hibernate_getEntityInstance() {
+			return this;
+		}
+
+		@Override
+		public EntityEntry $$_hibernate_getEntityEntry() {
+			return entityEntry;
+		}
+
+		@Override
+		public void $$_hibernate_setEntityEntry(EntityEntry entityEntry) {
+			this.entityEntry = entityEntry;
+		}
+
+		@Override
+		public ManagedEntity $$_hibernate_getNextManagedEntity() {
+			return next;
+		}
+
+		@Override
+		public void $$_hibernate_setNextManagedEntity(ManagedEntity next) {
+			this.next = next;
+		}
+
+		@Override
+		public ManagedEntity $$_hibernate_getPreviousManagedEntity() {
+			return previous;
+		}
+
+		@Override
+		public void $$_hibernate_setPreviousManagedEntity(ManagedEntity previous) {
+			this.previous = previous;
+		}
+
+		@Override
+		public void $$_hibernate_setUseTracker(boolean useTracker) {
+
+		}
+
+		@Override
+		public boolean $$_hibernate_useTracker() {
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java
index aa977c1d0b01..06a7adfb7c61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
@@ -27,54 +25,54 @@
  */
 @JiraKey( "HHH-9529" )
 @DomainModel(
-        annotatedClasses = {
-              CrossEnhancementTest.Parent.class, CrossEnhancementTest.Child.class, CrossEnhancementTest.ChildKey.class
-        }
+		annotatedClasses = {
+			CrossEnhancementTest.Parent.class, CrossEnhancementTest.Child.class, CrossEnhancementTest.ChildKey.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class CrossEnhancementTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
+	@Test
+	public void test(SessionFactoryScope scope) {
 		//        sessionFactory().close();
 		//        buildSessionFactory();
 		scope.getSessionFactory().close();
-        // TODO: I do not get this test ^ and not sure how to update it ...
+		// TODO: I do not get this test ^ and not sure how to update it ...
 	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-        @Id
-        String id;
-    }
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+		@Id
+		String id;
+	}
 
-    @Embeddable
-    static class ChildKey implements Serializable {
-        String parent;
-        String type;
-    }
+	@Embeddable
+	static class ChildKey implements Serializable {
+		String parent;
+		String type;
+	}
 
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-        @EmbeddedId
-        ChildKey id;
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+		@EmbeddedId
+		ChildKey id;
 
-        @MapsId( "parent" )
-        @ManyToOne
-        Parent parent;
+		@MapsId( "parent" )
+		@ManyToOne
+		Parent parent;
 
-        public String getfieldOnChildKeyParent() {
-            // Note that there are two GETFIELD ops here, one on the field 'id' that should be enhanced and another
-            // on the field 'parent' that may be or not (depending if 'extended enhancement' is enabled)
+		public String getfieldOnChildKeyParent() {
+			// Note that there are two GETFIELD ops here, one on the field 'id' that should be enhanced and another
+			// on the field 'parent' that may be or not (depending if 'extended enhancement' is enabled)
 
-            // Either way, the field 'parent' on ChildKey should not be confused with the field 'parent' on Child
+			// Either way, the field 'parent' on ChildKey should not be confused with the field 'parent' on Child
 
-            return id.parent;
-        }
-    }
+			return id.parent;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java
index f68fceda7193..17a156b55641 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
@@ -27,58 +25,58 @@
 @BytecodeEnhanced
 public class ExtendedAssociationManagementTest {
 
-    @Test
-    public void test() {
-        User user = new User();
-        user.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
+	@Test
+	public void test() {
+		User user = new User();
+		user.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
 
-        Customer customer = new Customer();
-        customer.user = user;
+		Customer customer = new Customer();
+		customer.user = user;
 
-        assertEquals( customer, getFieldByReflection( user, "customer" ) );
+		assertEquals( customer, getFieldByReflection( user, "customer" ) );
 
-        // check dirty tracking is set automatically with bi-directional association management
-        EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
+		// check dirty tracking is set automatically with bi-directional association management
+		EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
 
-        User anotherUser = new User();
-        anotherUser.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
+		User anotherUser = new User();
+		anotherUser.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
 
-        customer.user = anotherUser;
+		customer.user = anotherUser;
 
-        assertNull( user.customer );
-        assertEquals( customer, getFieldByReflection( anotherUser, "customer" ) );
+		assertNull( user.customer );
+		assertEquals( customer, getFieldByReflection( anotherUser, "customer" ) );
 
-        user.customer = new Customer();
-        assertEquals( user, user.customer.user );
-    }
+		user.customer = new Customer();
+		assertEquals( user, user.customer.user );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    private static class Customer {
+	@Entity
+	private static class Customer {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String firstName;
+		String firstName;
 
-        String lastName;
+		String lastName;
 
-        @OneToOne( fetch = FetchType.LAZY )
-        User user;
-    }
+		@OneToOne( fetch = FetchType.LAZY )
+		User user;
+	}
 
-    @Entity
-    private static class User {
+	@Entity
+	private static class User {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String login;
+		String login;
 
-        String password;
+		String password;
 
-        @OneToOne( mappedBy = "user", fetch = FetchType.LAZY )
-        Customer customer;
-    }
+		@OneToOne( mappedBy = "user", fetch = FetchType.LAZY )
+		Customer customer;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedEnhancementNonStandardAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedEnhancementNonStandardAccessTest.java
index 2d3b5966960c..9d8e72f7e700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedEnhancementNonStandardAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedEnhancementNonStandardAccessTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java
index 1d3b5bf8f0ae..48b20f1cff0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java
index 53ac0df23eec..7c462c8abce7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java
index b0e04f9e7b1e..fd4b65d99759 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
@@ -30,130 +34,130 @@
 @CustomEnhancementContext( {EnhancerTestContext.class, InheritedTest.EagerEnhancementContext.class} )
 public class InheritedTest {
 
-    @Test
-    public void test() {
-        Employee charles = new Employee( "Charles", "Engineer" );
-        charles.setOca( 1002 );
+	@Test
+	public void test() {
+		Employee charles = new Employee( "Charles", "Engineer" );
+		charles.setOca( 1002 );
 
-        // Check that both types of class attributes are being dirty tracked
-        checkDirtyTracking( charles, "title", "oca" );
-        clearDirtyTracking( charles );
+		// Check that both types of class attributes are being dirty tracked
+		checkDirtyTracking( charles, "title", "oca" );
+		clearDirtyTracking( charles );
 
-        // Let's give charles a promotion, this time using method references
-        charles.setOca( 99 );
-        charles.setTitle( "Manager" );
+		// Let's give charles a promotion, this time using method references
+		charles.setOca( 99 );
+		charles.setTitle( "Manager" );
 
-        checkDirtyTracking( charles, "title", "oca" );
+		checkDirtyTracking( charles, "title", "oca" );
 
-        Contractor bob = new Contractor( "Bob", 100 );
-        bob.setOca( 1003 );
+		Contractor bob = new Contractor( "Bob", 100 );
+		bob.setOca( 1003 );
 
-        // Check that both types of class attributes are being dirty tracked
-        checkDirtyTracking( bob, "rate", "oca" );
-        clearDirtyTracking( bob );
+		// Check that both types of class attributes are being dirty tracked
+		checkDirtyTracking( bob, "rate", "oca" );
+		clearDirtyTracking( bob );
 
-        // Let's give bob a rate increase, this time using method references
-        bob.setOca( 88 );
-        bob.setRate( 200 );
+		// Let's give bob a rate increase, this time using method references
+		bob.setOca( 88 );
+		bob.setRate( 200 );
 
-        checkDirtyTracking( bob, "rate", "oca" );
-    }
+		checkDirtyTracking( bob, "rate", "oca" );
+	}
 
-    // Adapted from BasicEnhancementTest#basicExtendedEnhancementTest
-    @Test
-    @JiraKey("HHH-14006")
-    public void extendedEnhancementTest() {
-        // This test only works if lazy loading bytecode enhancement is enabled,
-        // otherwise extended bytecode enhancement does not do anything we can check.
-        assumeTrue( PersistentAttributeInterceptable.class.isAssignableFrom( Employee.class ) );
+	// Adapted from BasicEnhancementTest#basicExtendedEnhancementTest
+	@Test
+	@JiraKey("HHH-14006")
+	public void extendedEnhancementTest() {
+		// This test only works if lazy loading bytecode enhancement is enabled,
+		// otherwise extended bytecode enhancement does not do anything we can check.
+		assumeTrue( PersistentAttributeInterceptable.class.isAssignableFrom( Employee.class ) );
 
-        Employee entity = new Employee();
-        ( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
+		Employee entity = new Employee();
+		( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
 
-        Object decoy = new Object();
-        // This accesses "anUnspecifiedObject" on a variable of type Employee,
-        // but "anUnspecifiedObject" is defined the superclass Person.
-        // Such "virtual" access used to break extended bytecode enhancement.
-        entity.anUnspecifiedObject = decoy;
+		Object decoy = new Object();
+		// This accesses "anUnspecifiedObject" on a variable of type Employee,
+		// but "anUnspecifiedObject" is defined the superclass Person.
+		// Such "virtual" access used to break extended bytecode enhancement.
+		entity.anUnspecifiedObject = decoy;
 
-        Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
-        assertNotSame( decoy, gotByReflection );
-        assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
+		Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
+		assertNotSame( decoy, gotByReflection );
+		assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
 
-        Object gotByEnhancedDirectAccess = entity.anUnspecifiedObject;
-        assertNotSame( decoy, gotByEnhancedDirectAccess );
-        assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, gotByEnhancedDirectAccess );
-    }
+		Object gotByEnhancedDirectAccess = entity.anUnspecifiedObject;
+		assertNotSame( decoy, gotByEnhancedDirectAccess );
+		assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, gotByEnhancedDirectAccess );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    private static abstract class Person {
+	@Entity
+	private static abstract class Person {
 
-        Object anUnspecifiedObject;
+		Object anUnspecifiedObject;
 
-        @Id
-        String name;
+		@Id
+		String name;
 
-        @Version
-        long oca;
+		@Version
+		long oca;
 
-        Person() {
-        }
+		Person() {
+		}
 
-        Person(String name) {
-            this();
-            this.name = name;
-        }
+		Person(String name) {
+			this();
+			this.name = name;
+		}
 
-        void setOca(long l) {
-            this.oca = l;
-        }
-    }
+		void setOca(long l) {
+			this.oca = l;
+		}
+	}
 
-    @Entity
-    private static class Employee extends Person {
+	@Entity
+	private static class Employee extends Person {
 
-        String title;
+		String title;
 
-        Employee() {
-        }
+		Employee() {
+		}
 
-        Employee(String name, String title) {
-            super( name );
-            this.title = title;
-        }
+		Employee(String name, String title) {
+			super( name );
+			this.title = title;
+		}
 
-        void setTitle(String title) {
-            this.title = title;
-        }
-    }
+		void setTitle(String title) {
+			this.title = title;
+		}
+	}
 
-    @Entity
-    private static class Contractor extends Person {
+	@Entity
+	private static class Contractor extends Person {
 
-        Integer rate;
+		Integer rate;
 
-        Contractor() {
-        }
+		Contractor() {
+		}
 
-        Contractor(String name, Integer rate) {
-            super( name );
-            this.rate = rate;
-        }
+		Contractor(String name, Integer rate) {
+			super( name );
+			this.rate = rate;
+		}
 
-        void setRate(Integer rate) {
-            this.rate = rate;
-        }
-    }
+		void setRate(Integer rate) {
+			this.rate = rate;
+		}
+	}
 
-    // --- //
+	// --- //
 
-    public static class EagerEnhancementContext extends DefaultEnhancementContext {
-        @Override
-        public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
-            // HHH-10981 - Without lazy loading, the generation of getters and setters has a different code path
-            return false;
-        }
-    }
+	public static class EagerEnhancementContext extends DefaultEnhancementContext {
+		@Override
+		public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
+			// HHH-10981 - Without lazy loading, the generation of getters and setters has a different code path
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java
index 61cc41b9ce86..687a0e90ae1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
@@ -30,98 +34,98 @@
 @CustomEnhancementContext( {EnhancerTestContext.class, MappedSuperclassTest.EagerEnhancementContext.class} )
 public class MappedSuperclassTest {
 
-    @Test
-    public void test() {
-        Employee charles = new Employee( "Charles", "Engineer" );
-        charles.setOca( 1002 );
+	@Test
+	public void test() {
+		Employee charles = new Employee( "Charles", "Engineer" );
+		charles.setOca( 1002 );
 
-        // Check that both types of class attributes are being dirty tracked
-        checkDirtyTracking( charles, "title", "oca" );
-        clearDirtyTracking( charles );
+		// Check that both types of class attributes are being dirty tracked
+		checkDirtyTracking( charles, "title", "oca" );
+		clearDirtyTracking( charles );
 
-        // Let's give charles a promotion, this time using method references
-        charles.setOca( 99 );
-        charles.setTitle( "Manager" );
+		// Let's give charles a promotion, this time using method references
+		charles.setOca( 99 );
+		charles.setTitle( "Manager" );
 
-        checkDirtyTracking( charles, "title", "oca" );
-    }
+		checkDirtyTracking( charles, "title", "oca" );
+	}
 
-    // Adapted from BasicEnhancementTest#basicExtendedEnhancementTest
-    @Test
-    @JiraKey("HHH-14006")
-    public void extendedEnhancementTest() {
-        // This test only works if lazy loading bytecode enhancement is enabled,
-        // otherwise extended bytecode enhancement does not do anything we can check.
-        assumeTrue( PersistentAttributeInterceptable.class.isAssignableFrom( Employee.class ) );
+	// Adapted from BasicEnhancementTest#basicExtendedEnhancementTest
+	@Test
+	@JiraKey("HHH-14006")
+	public void extendedEnhancementTest() {
+		// This test only works if lazy loading bytecode enhancement is enabled,
+		// otherwise extended bytecode enhancement does not do anything we can check.
+		assumeTrue( PersistentAttributeInterceptable.class.isAssignableFrom( Employee.class ) );
 
-        Employee entity = new Employee();
-        ( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
+		Employee entity = new Employee();
+		( (PersistentAttributeInterceptable) entity ).$$_hibernate_setInterceptor( new ObjectAttributeMarkerInterceptor() );
 
-        Object decoy = new Object();
-        // This accesses "name" on a variable of type Employee,
-        // but "anUnspecifiedObject" is defined the superclass Person.
-        // Such "virtual" access used to break extended bytecode enhancement.
-        entity.anUnspecifiedObject = decoy;
+		Object decoy = new Object();
+		// This accesses "name" on a variable of type Employee,
+		// but "anUnspecifiedObject" is defined the superclass Person.
+		// Such "virtual" access used to break extended bytecode enhancement.
+		entity.anUnspecifiedObject = decoy;
 
-        Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
-        assertNotSame( decoy, gotByReflection );
-        assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
+		Object gotByReflection = EnhancerTestUtils.getFieldByReflection( entity, "anUnspecifiedObject" );
+		assertNotSame( decoy, gotByReflection );
+		assertSame( ObjectAttributeMarkerInterceptor.WRITE_MARKER, gotByReflection );
 
-        Object gotByEnhancedDirectAccess = entity.anUnspecifiedObject;
-        assertNotSame( decoy, gotByEnhancedDirectAccess );
-        assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, gotByEnhancedDirectAccess );
-    }
+		Object gotByEnhancedDirectAccess = entity.anUnspecifiedObject;
+		assertNotSame( decoy, gotByEnhancedDirectAccess );
+		assertSame( ObjectAttributeMarkerInterceptor.READ_MARKER, gotByEnhancedDirectAccess );
+	}
 
-    // --- //
+	// --- //
 
-    @MappedSuperclass
-    private static class Person {
+	@MappedSuperclass
+	private static class Person {
 
-        Object anUnspecifiedObject;
+		Object anUnspecifiedObject;
 
-        @Id
-        String name;
+		@Id
+		String name;
 
-        @Version
-        Long oca;
+		@Version
+		Long oca;
 
-        Person(String name) {
-            this.name = name;
-        }
+		Person(String name) {
+			this.name = name;
+		}
 
-        Person() {
-        }
+		Person() {
+		}
 
-        void setOca(long l) {
-            this.oca = l;
-        }
-    }
+		void setOca(long l) {
+			this.oca = l;
+		}
+	}
 
-    @Entity
-    private static class Employee extends Person {
+	@Entity
+	private static class Employee extends Person {
 
-        String title;
+		String title;
 
-        Employee(String name, String title) {
-            super( name );
-            this.title = title;
-        }
+		Employee(String name, String title) {
+			super( name );
+			this.title = title;
+		}
 
-        Employee() {
-        }
+		Employee() {
+		}
 
-        void setTitle(String title) {
-            this.title = title;
-        }
-    }
+		void setTitle(String title) {
+			this.title = title;
+		}
+	}
 
-    // --- //
+	// --- //
 
-    public static class EagerEnhancementContext extends DefaultEnhancementContext {
-        @Override
-        public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
-            // HHH-10981 - Without lazy loading, the generation of getters and setters has a different code path
-            return false;
-        }
-    }
+	public static class EagerEnhancementContext extends DefaultEnhancementContext {
+		@Override
+		public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
+			// HHH-10981 - Without lazy loading, the generation of getters and setters has a different code path
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java
index 5904baf94ec2..fe5cf7aec980 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/OverriddenFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/OverriddenFieldTest.java
index 57b8d969bde8..913924be9670 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/OverriddenFieldTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/OverriddenFieldTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ReloadAssociatedEntitiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ReloadAssociatedEntitiesTest.java
index 35acb17bfded..a93d7d2135a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ReloadAssociatedEntitiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ReloadAssociatedEntitiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyTest.java
index 63304f8f593b..8dea011a93f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyTest.java
@@ -1,176 +1,180 @@
-package org.hibernate.orm.test.bytecode.enhancement.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@JiraKey("HHH-16890")
-@DomainModel(
-		annotatedClasses = {
-				BatchEntityOneToManyTest.Order.class, BatchEntityOneToManyTest.Product.class
-		}
-)
-@ServiceRegistry(
-		settings = {
-				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
-		}
-)
-@SessionFactory
-@BytecodeEnhanced
-public class BatchEntityOneToManyTest {
-
-	@BeforeEach
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-
-		order.addProduct( cheese1 );
-		order.addProduct( cheese2 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-		} );
-	}
-
-	@AfterEach
-	public void tearDown(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery( "delete from Order" ).executeUpdate();
-					session.createMutationQuery( "delete from Product" ).executeUpdate();
-				}
-		);
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Order o = s.get( Order.class, 1 );
-
-			List products = o.getProducts();
-			assertEquals( 2, products.size() );
-		} );
-	}
-
-
-	@Test
-	public void testGetProduct(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-			Product product = s.getReference( Product.class, 3l );
-
-			s.getReference( Product.class, 1l );
-
-			s.get( Product.class, 2l );
-			assertTrue( Hibernate.isInitialized( product ) );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Product.class );
-			Root root = cr.from( Product.class );
-			CriteriaQuery query = cr.select( root );
-
-			List products = s.createQuery( query ).getResultList();
-
-			assertEquals( 3, products.size() );
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@OneToMany(fetch = FetchType.EAGER)
-		@Fetch(FetchMode.SELECT)
-		List products = new ArrayList<>();
-
-		public List getProducts() {
-			return products;
-		}
-
-		public void addProduct(Product product) {
-			this.products.add( product );
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		public Long getId() {
-			return id;
-		}
-
-		public String getName() {
-			return name;
-		}
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@JiraKey("HHH-16890")
+@DomainModel(
+		annotatedClasses = {
+				BatchEntityOneToManyTest.Order.class, BatchEntityOneToManyTest.Product.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
+		}
+)
+@SessionFactory
+@BytecodeEnhanced
+public class BatchEntityOneToManyTest {
+
+	@BeforeEach
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+
+		order.addProduct( cheese1 );
+		order.addProduct( cheese2 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+		} );
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Order" ).executeUpdate();
+					session.createMutationQuery( "delete from Product" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Order o = s.get( Order.class, 1 );
+
+			List products = o.getProducts();
+			assertEquals( 2, products.size() );
+		} );
+	}
+
+
+	@Test
+	public void testGetProduct(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+			Product product = s.getReference( Product.class, 3l );
+
+			s.getReference( Product.class, 1l );
+
+			s.get( Product.class, 2l );
+			assertTrue( Hibernate.isInitialized( product ) );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Product.class );
+			Root root = cr.from( Product.class );
+			CriteriaQuery query = cr.select( root );
+
+			List products = s.createQuery( query ).getResultList();
+
+			assertEquals( 3, products.size() );
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@OneToMany(fetch = FetchType.EAGER)
+		@Fetch(FetchMode.SELECT)
+		List products = new ArrayList<>();
+
+		public List getProducts() {
+			return products;
+		}
+
+		public void addProduct(Product product) {
+			this.products.add( product );
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyWithDisabledProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyWithDisabledProxyTest.java
index 8ffdeefd6460..a35f54121d20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyWithDisabledProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityOneToManyWithDisabledProxyTest.java
@@ -1,176 +1,180 @@
-package org.hibernate.orm.test.bytecode.enhancement.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@JiraKey("HHH-16890")
-@DomainModel(
-		annotatedClasses = {
-				BatchEntityOneToManyWithDisabledProxyTest.Order.class, BatchEntityOneToManyWithDisabledProxyTest.Product.class
-		}
-)
-@ServiceRegistry(
-		settings = {
-				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
-		}
-)
-@SessionFactory
-@BytecodeEnhanced
-public class BatchEntityOneToManyWithDisabledProxyTest {
-
-	@BeforeEach
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-
-		order.addProduct( cheese1 );
-		order.addProduct( cheese2 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-		} );
-	}
-
-	@AfterEach
-	public void tearDown(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery( "delete from Order" ).executeUpdate();
-					session.createMutationQuery( "delete from Product" ).executeUpdate();
-				}
-		);
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Order o = s.get( Order.class, 1 );
-
-			List products = o.getProducts();
-			assertEquals( 2, products.size() );
-		} );
-	}
-
-
-	@Test
-	public void testGetProduct(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-			Product product = s.getReference( Product.class, 3l );
-
-			s.getReference( Product.class, 1l );
-
-			s.get( Product.class, 2l );
-			assertTrue( Hibernate.isInitialized( product ) );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Product.class );
-			Root root = cr.from( Product.class );
-			CriteriaQuery query = cr.select( root );
-
-			List products = s.createQuery( query ).getResultList();
-
-			assertEquals( 3, products.size() );
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@OneToMany(fetch = FetchType.EAGER)
-		@Fetch(FetchMode.SELECT)
-		List products = new ArrayList<>();
-
-		public List getProducts() {
-			return products;
-		}
-
-		public void addProduct(Product product) {
-			this.products.add( product );
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		public Long getId() {
-			return id;
-		}
-
-		public String getName() {
-			return name;
-		}
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@JiraKey("HHH-16890")
+@DomainModel(
+		annotatedClasses = {
+				BatchEntityOneToManyWithDisabledProxyTest.Order.class, BatchEntityOneToManyWithDisabledProxyTest.Product.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
+		}
+)
+@SessionFactory
+@BytecodeEnhanced
+public class BatchEntityOneToManyWithDisabledProxyTest {
+
+	@BeforeEach
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+
+		order.addProduct( cheese1 );
+		order.addProduct( cheese2 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+		} );
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Order" ).executeUpdate();
+					session.createMutationQuery( "delete from Product" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Order o = s.get( Order.class, 1 );
+
+			List products = o.getProducts();
+			assertEquals( 2, products.size() );
+		} );
+	}
+
+
+	@Test
+	public void testGetProduct(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+			Product product = s.getReference( Product.class, 3l );
+
+			s.getReference( Product.class, 1l );
+
+			s.get( Product.class, 2l );
+			assertTrue( Hibernate.isInitialized( product ) );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Product.class );
+			Root root = cr.from( Product.class );
+			CriteriaQuery query = cr.select( root );
+
+			List products = s.createQuery( query ).getResultList();
+
+			assertEquals( 3, products.size() );
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@OneToMany(fetch = FetchType.EAGER)
+		@Fetch(FetchMode.SELECT)
+		List products = new ArrayList<>();
+
+		public List getProducts() {
+			return products;
+		}
+
+		public void addProduct(Product product) {
+			this.products.add( product );
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchTest.java
index c5583e18e89f..48effc44c418 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchTest.java
@@ -1,201 +1,205 @@
-package org.hibernate.orm.test.bytecode.enhancement.batch;
-
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@JiraKey("HHH-16890")
-@DomainModel(
-		annotatedClasses = {
-				BatchEntityWithSelectFetchTest.Order.class,
-				BatchEntityWithSelectFetchTest.Product.class
-		}
-)
-@ServiceRegistry(
-		settings = {
-				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
-		}
-)
-@SessionFactory
-@BytecodeEnhanced
-public class BatchEntityWithSelectFetchTest {
-
-	@BeforeEach
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-		Order order2 = new Order( 2l, "Hibernate 2" );
-
-		order.setProduct( cheese2 );
-		order2.setProduct( cheese1 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-			s.persist( order2 );
-		} );
-	}
-
-	@AfterEach
-	public void tearDown(SessionFactoryScope scope){
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery( "delete from Order" ).executeUpdate();
-					session.createMutationQuery( "delete from Product" ).executeUpdate();
-				}
-		);
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product1 = s.getReference( Product.class, 1l );
-			Product product2 = s.getReference( Product.class, 2l );
-
-			Order o = s.get( Order.class, 1 );
-			assertTrue( Hibernate.isInitialized( product1 ) );
-			assertTrue( Hibernate.isInitialized( product2 ) );
-
-		} );
-	}
-
-	@Test
-	public void testGetOrder2(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product = s.getReference( Product.class, 2l );
-
-			Order o = s.get( Order.class, 1 );
-			assertTrue( Hibernate.isInitialized( product ) );
-			assertTrue( Hibernate.isInitialized( o.getProduct() ) );
-
-		} );
-	}
-
-	@Test
-	public void testGetProduct(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product3 = s.getReference( Product.class, 3l );
-			assertFalse( Hibernate.isInitialized( product3 ) );
-
-			Product product1 = s.get( Product.class, 1l );
-
-			assertThat( product1 ).isNotNull();
-			assertTrue( Hibernate.isInitialized( product3 ) );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product1 = s.getReference( Product.class, 1l );
-			Product product2 = s.getReference( Product.class, 2l );
-			Product product3 = s.getReference( Product.class, 3l );
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Order.class );
-			Root root = cr.from( Order.class );
-			CriteriaQuery query = cr.select( root );
-
-			List orders = s.createQuery( query ).getResultList();
-
-			assertEquals( 2, orders.size() );
-
-			assertTrue( Hibernate.isInitialized( product1 ) );
-			assertTrue( Hibernate.isInitialized( product2 ) );
-			assertTrue( Hibernate.isInitialized( product3 ) );
-
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@ManyToOne(fetch = FetchType.EAGER)
-		@Fetch(FetchMode.SELECT)
-		Product product;
-
-		public Product getProduct() {
-			return product;
-		}
-
-		public void setProduct(Product product) {
-			this.product = product;
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.batch;
+
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@JiraKey("HHH-16890")
+@DomainModel(
+		annotatedClasses = {
+				BatchEntityWithSelectFetchTest.Order.class,
+				BatchEntityWithSelectFetchTest.Product.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
+		}
+)
+@SessionFactory
+@BytecodeEnhanced
+public class BatchEntityWithSelectFetchTest {
+
+	@BeforeEach
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+		Order order2 = new Order( 2l, "Hibernate 2" );
+
+		order.setProduct( cheese2 );
+		order2.setProduct( cheese1 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+			s.persist( order2 );
+		} );
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope){
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Order" ).executeUpdate();
+					session.createMutationQuery( "delete from Product" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product1 = s.getReference( Product.class, 1l );
+			Product product2 = s.getReference( Product.class, 2l );
+
+			Order o = s.get( Order.class, 1 );
+			assertTrue( Hibernate.isInitialized( product1 ) );
+			assertTrue( Hibernate.isInitialized( product2 ) );
+
+		} );
+	}
+
+	@Test
+	public void testGetOrder2(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product = s.getReference( Product.class, 2l );
+
+			Order o = s.get( Order.class, 1 );
+			assertTrue( Hibernate.isInitialized( product ) );
+			assertTrue( Hibernate.isInitialized( o.getProduct() ) );
+
+		} );
+	}
+
+	@Test
+	public void testGetProduct(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product3 = s.getReference( Product.class, 3l );
+			assertFalse( Hibernate.isInitialized( product3 ) );
+
+			Product product1 = s.get( Product.class, 1l );
+
+			assertThat( product1 ).isNotNull();
+			assertTrue( Hibernate.isInitialized( product3 ) );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product1 = s.getReference( Product.class, 1l );
+			Product product2 = s.getReference( Product.class, 2l );
+			Product product3 = s.getReference( Product.class, 3l );
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Order.class );
+			Root root = cr.from( Order.class );
+			CriteriaQuery query = cr.select( root );
+
+			List orders = s.createQuery( query ).getResultList();
+
+			assertEquals( 2, orders.size() );
+
+			assertTrue( Hibernate.isInitialized( product1 ) );
+			assertTrue( Hibernate.isInitialized( product2 ) );
+			assertTrue( Hibernate.isInitialized( product3 ) );
+
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@ManyToOne(fetch = FetchType.EAGER)
+		@Fetch(FetchMode.SELECT)
+		Product product;
+
+		public Product getProduct() {
+			return product;
+		}
+
+		public void setProduct(Product product) {
+			this.product = product;
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchWithDisableProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchWithDisableProxyTest.java
index d796f6ceef97..67019277a6d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchWithDisableProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/BatchEntityWithSelectFetchWithDisableProxyTest.java
@@ -1,201 +1,205 @@
-package org.hibernate.orm.test.bytecode.enhancement.batch;
-
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Cacheable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@JiraKey("HHH-16890")
-@DomainModel(
-		annotatedClasses = {
-				BatchEntityWithSelectFetchWithDisableProxyTest.Order.class,
-				BatchEntityWithSelectFetchWithDisableProxyTest.Product.class
-		}
-)
-@ServiceRegistry(
-		settings = {
-				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
-		}
-)
-@SessionFactory
-@BytecodeEnhanced
-public class BatchEntityWithSelectFetchWithDisableProxyTest {
-
-	@BeforeEach
-	public void setupData(SessionFactoryScope scope) {
-		Product cheese1 = new Product( 1l, "Cheese 1" );
-		Product cheese2 = new Product( 2l, "Cheese 2" );
-		Product cheese3 = new Product( 3l, "Cheese 3" );
-
-		Order order = new Order( 1l, "Hibernate" );
-		Order order2 = new Order( 2l, "Hibernate 2" );
-
-		order.setProduct( cheese2 );
-		order2.setProduct( cheese1 );
-
-		scope.inTransaction( s -> {
-			s.persist( cheese1 );
-			s.persist( cheese2 );
-			s.persist( cheese3 );
-			s.persist( order );
-			s.persist( order2 );
-		} );
-	}
-
-	@AfterEach
-	public void tearDown(SessionFactoryScope scope){
-		scope.inTransaction(
-				session -> {
-					session.createMutationQuery( "delete from Order" ).executeUpdate();
-					session.createMutationQuery( "delete from Product" ).executeUpdate();
-				}
-		);
-	}
-
-	@Test
-	public void testGetOrder(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product1 = s.getReference( Product.class, 1l );
-			Product product2 = s.getReference( Product.class, 2l );
-
-			Order o = s.get( Order.class, 1 );
-			assertTrue( Hibernate.isInitialized( product1 ) );
-			assertTrue( Hibernate.isInitialized( product2 ) );
-
-		} );
-	}
-
-	@Test
-	public void testGetOrder2(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product = s.getReference( Product.class, 2l );
-
-			Order o = s.get( Order.class, 1 );
-			assertTrue( Hibernate.isInitialized( product ) );
-			assertTrue( Hibernate.isInitialized( o.getProduct() ) );
-
-		} );
-	}
-
-	@Test
-	public void testGetProduct(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product3 = s.getReference( Product.class, 3l );
-			assertFalse( Hibernate.isInitialized( product3 ) );
-
-			Product product1 = s.get( Product.class, 1l );
-
-			assertThat( product1 ).isNotNull();
-			assertTrue( Hibernate.isInitialized( product3 ) );
-		} );
-	}
-
-	@Test
-	public void testCriteriaQuery(SessionFactoryScope scope) {
-		scope.inSession( s -> {
-			s.getSessionFactory().getCache().evictAllRegions();
-
-			Product product1 = s.getReference( Product.class, 1l );
-			Product product2 = s.getReference( Product.class, 2l );
-			Product product3 = s.getReference( Product.class, 3l );
-
-			CriteriaBuilder cb = s.getCriteriaBuilder();
-			CriteriaQuery cr = cb.createQuery( Order.class );
-			Root root = cr.from( Order.class );
-			CriteriaQuery query = cr.select( root );
-
-			List orders = s.createQuery( query ).getResultList();
-
-			assertEquals( 2, orders.size() );
-
-			assertTrue( Hibernate.isInitialized( product1 ) );
-			assertTrue( Hibernate.isInitialized( product2 ) );
-			assertTrue( Hibernate.isInitialized( product3 ) );
-
-		} );
-	}
-
-	@Entity(name = "Order")
-	@Table(name = "ORDER_TABLE")
-	public static class Order {
-		@Id
-		Long id;
-
-		String name;
-
-		public Order() {
-		}
-
-		public Order(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		@ManyToOne(fetch = FetchType.EAGER)
-		@Fetch(FetchMode.SELECT)
-		Product product;
-
-		public Product getProduct() {
-			return product;
-		}
-
-		public void setProduct(Product product) {
-			this.product = product;
-		}
-	}
-
-	@Entity(name = "Product")
-	@BatchSize(size = 512)
-	@Cacheable
-	public static class Product {
-		@Id
-		Long id;
-
-		String name;
-
-
-		public Product() {
-		}
-
-		public Product(Long id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.batch;
+
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@JiraKey("HHH-16890")
+@DomainModel(
+		annotatedClasses = {
+				BatchEntityWithSelectFetchWithDisableProxyTest.Order.class,
+				BatchEntityWithSelectFetchWithDisableProxyTest.Product.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
+		}
+)
+@SessionFactory
+@BytecodeEnhanced
+public class BatchEntityWithSelectFetchWithDisableProxyTest {
+
+	@BeforeEach
+	public void setupData(SessionFactoryScope scope) {
+		Product cheese1 = new Product( 1l, "Cheese 1" );
+		Product cheese2 = new Product( 2l, "Cheese 2" );
+		Product cheese3 = new Product( 3l, "Cheese 3" );
+
+		Order order = new Order( 1l, "Hibernate" );
+		Order order2 = new Order( 2l, "Hibernate 2" );
+
+		order.setProduct( cheese2 );
+		order2.setProduct( cheese1 );
+
+		scope.inTransaction( s -> {
+			s.persist( cheese1 );
+			s.persist( cheese2 );
+			s.persist( cheese3 );
+			s.persist( order );
+			s.persist( order2 );
+		} );
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope){
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Order" ).executeUpdate();
+					session.createMutationQuery( "delete from Product" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testGetOrder(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product1 = s.getReference( Product.class, 1l );
+			Product product2 = s.getReference( Product.class, 2l );
+
+			Order o = s.get( Order.class, 1 );
+			assertTrue( Hibernate.isInitialized( product1 ) );
+			assertTrue( Hibernate.isInitialized( product2 ) );
+
+		} );
+	}
+
+	@Test
+	public void testGetOrder2(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product = s.getReference( Product.class, 2l );
+
+			Order o = s.get( Order.class, 1 );
+			assertTrue( Hibernate.isInitialized( product ) );
+			assertTrue( Hibernate.isInitialized( o.getProduct() ) );
+
+		} );
+	}
+
+	@Test
+	public void testGetProduct(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product3 = s.getReference( Product.class, 3l );
+			assertFalse( Hibernate.isInitialized( product3 ) );
+
+			Product product1 = s.get( Product.class, 1l );
+
+			assertThat( product1 ).isNotNull();
+			assertTrue( Hibernate.isInitialized( product3 ) );
+		} );
+	}
+
+	@Test
+	public void testCriteriaQuery(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			s.getSessionFactory().getCache().evictAllRegions();
+
+			Product product1 = s.getReference( Product.class, 1l );
+			Product product2 = s.getReference( Product.class, 2l );
+			Product product3 = s.getReference( Product.class, 3l );
+
+			CriteriaBuilder cb = s.getCriteriaBuilder();
+			CriteriaQuery cr = cb.createQuery( Order.class );
+			Root root = cr.from( Order.class );
+			CriteriaQuery query = cr.select( root );
+
+			List orders = s.createQuery( query ).getResultList();
+
+			assertEquals( 2, orders.size() );
+
+			assertTrue( Hibernate.isInitialized( product1 ) );
+			assertTrue( Hibernate.isInitialized( product2 ) );
+			assertTrue( Hibernate.isInitialized( product3 ) );
+
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "ORDER_TABLE")
+	public static class Order {
+		@Id
+		Long id;
+
+		String name;
+
+		public Order() {
+		}
+
+		public Order(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@ManyToOne(fetch = FetchType.EAGER)
+		@Fetch(FetchMode.SELECT)
+		Product product;
+
+		public Product getProduct() {
+			return product;
+		}
+
+		public void setProduct(Product product) {
+			this.product = product;
+		}
+	}
+
+	@Entity(name = "Product")
+	@BatchSize(size = 512)
+	@Cacheable
+	public static class Product {
+		@Id
+		Long id;
+
+		String name;
+
+
+		public Product() {
+		}
+
+		public Product(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/AbstractManyToOneNoProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/AbstractManyToOneNoProxyTest.java
index 545e3a9469a9..4f4917b78d49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/AbstractManyToOneNoProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/AbstractManyToOneNoProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cache;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneNoProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneNoProxyTest.java
index 3a2b604bb345..6571ab51a6d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneNoProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneNoProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cache;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTest.java
index ba6a5b52e2d6..972761fe2bdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cache;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTestReusedColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTestReusedColumn.java
index a08f11ba97bc..71ddb9908fbf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTestReusedColumn.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTestReusedColumn.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cache;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PostLoadLazyListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PostLoadLazyListenerTest.java
index 981e9b7b17a5..5b5002465050 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PostLoadLazyListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PostLoadLazyListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.callbacks;
 
@@ -40,9 +38,9 @@ public class PostLoadLazyListenerTest {
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-						   session.createQuery( "delete from Tag" ).executeUpdate();
-						   session.createQuery( "delete from Person" ).executeUpdate();
-					   }
+						session.createQuery( "delete from Tag" ).executeUpdate();
+						session.createQuery( "delete from Person" ).executeUpdate();
+					}
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PreUpdateBytecodeEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PreUpdateBytecodeEnhancementTest.java
index b2b76531b4f9..1ad994ef8b1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PreUpdateBytecodeEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/callbacks/PreUpdateBytecodeEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java
index 2584191722ac..a71d8c8847cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
@@ -41,213 +39,213 @@
  */
 @JiraKey( "HHH-10252" )
 @DomainModel(
-        annotatedClasses = {
-               CascadeDeleteCollectionTest.Parent.class, CascadeDeleteCollectionTest.Child.class
-        }
+		annotatedClasses = {
+			CascadeDeleteCollectionTest.Parent.class, CascadeDeleteCollectionTest.Child.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class CascadeDeleteCollectionTest {
-    private Parent originalParent;
-
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        // Create a Parent with one Child
-        originalParent = scope.fromTransaction( s -> {
-                    Parent p = new Parent();
-                    p.setName( "PARENT" );
-                    p.setLazy( "LAZY" );
-                    p.makeChild();
-                    s.persist( p );
-                    return p;
-                }
-        );
-    }
-
-    @Test
-    public void testManagedWithUninitializedAssociation(SessionFactoryScope scope) {
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
-                    .setParameter( "name", "PARENT" )
-                    .uniqueResult();
-            checkInterceptor( scope, loadedParent, false );
-            assertFalse( Hibernate.isInitialized( loadedParent.getChildren() ) );
-            s.remove( loadedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testManagedWithInitializedAssociation(SessionFactoryScope scope) {
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
-                    .setParameter( "name", "PARENT" )
-                    .uniqueResult();
-            checkInterceptor( scope, loadedParent, false );
-            loadedParent.getChildren().size();
-            assertTrue( Hibernate.isInitialized( loadedParent.getChildren() ) );
-            s.remove( loadedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedWithUninitializedAssociation(SessionFactoryScope scope) {
-        final Parent detachedParent = scope.fromTransaction( s -> {
-            return s.get( Parent.class, originalParent.getId() );
-        } );
-
-        assertFalse( Hibernate.isInitialized( detachedParent.getChildren() ) );
-
-        checkInterceptor( scope, detachedParent, false );
-
-        // Delete the detached Parent with uninitialized children
-        scope.inTransaction( s -> {
-             s.remove( detachedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedWithInitializedAssociation(SessionFactoryScope scope) {
-        final Parent detachedParent = scope.fromTransaction( s -> {
-             Parent parent = s.get( Parent.class, originalParent.getId() );
-             // initialize collection before detaching
-             parent.getChildren().size();
-             return parent;
-        } );
-
-        assertTrue( Hibernate.isInitialized( detachedParent.getChildren() ) );
-
-        checkInterceptor( scope, detachedParent, false );
-
-        // Delete the detached Parent with initialized children
-        scope.inTransaction( s -> {
-            s.remove( detachedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedOriginal(SessionFactoryScope scope) {
-
-        // originalParent#children should be initialized
-        assertTrue( Hibernate.isPropertyInitialized( originalParent, "children" ) );
-
-        checkInterceptor( scope, originalParent, true );
-
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            s.remove( originalParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    private void checkInterceptor(SessionFactoryScope scope, Parent parent, boolean isNullExpected) {
-        final BytecodeEnhancementMetadata bytecodeEnhancementMetadata = scope.getSessionFactory().getRuntimeMetamodels()
-                .getMappingMetamodel()
-                .getEntityDescriptor( Parent.class )
-                .getBytecodeEnhancementMetadata();
-        if ( isNullExpected ) {
-            // if a null Interceptor is expected, then there shouldn't be any uninitialized attributes
-            assertFalse( bytecodeEnhancementMetadata.hasUnFetchedAttributes( parent ) );
-            assertNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
-        }
-        else {
-            assertNotNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
-        }
-    }
-
-    // --- //
-
-    @Entity( name = "Parent" )
-    @Table( name = "PARENT" )
-    public static class Parent {
-
-        Long id;
-
-        String name;
-
-        List children = new ArrayList<>();
-
-        String lazy;
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        @OneToMany( mappedBy = "parent", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}, fetch = FetchType.LAZY )
-        List getChildren() {
-            return children;
-        }
-
-        void setChildren(List children) {
-            this.children = children;
-        }
-
-        String getName() {
-            return name;
-        }
-
-        void setName(String name) {
-            this.name = name;
-        }
-
-        @Basic( fetch = FetchType.LAZY )
-        String getLazy() {
-            return lazy;
-        }
-
-        void setLazy(String lazy) {
-            this.lazy = lazy;
-        }
-
-        void makeChild() {
-            Child c = new Child();
-            c.setParent( this );
-            children.add( c );
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @ManyToOne( optional = false )
-        @JoinColumn( name = "parent_id" )
-        Parent parent;
-
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        Parent getParent() {
-            return parent;
-        }
-
-        void setParent(Parent parent) {
-            this.parent = parent;
-        }
-    }
+	private Parent originalParent;
+
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		// Create a Parent with one Child
+		originalParent = scope.fromTransaction( s -> {
+					Parent p = new Parent();
+					p.setName( "PARENT" );
+					p.setLazy( "LAZY" );
+					p.makeChild();
+					s.persist( p );
+					return p;
+				}
+		);
+	}
+
+	@Test
+	public void testManagedWithUninitializedAssociation(SessionFactoryScope scope) {
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
+					.setParameter( "name", "PARENT" )
+					.uniqueResult();
+			checkInterceptor( scope, loadedParent, false );
+			assertFalse( Hibernate.isInitialized( loadedParent.getChildren() ) );
+			s.remove( loadedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testManagedWithInitializedAssociation(SessionFactoryScope scope) {
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
+					.setParameter( "name", "PARENT" )
+					.uniqueResult();
+			checkInterceptor( scope, loadedParent, false );
+			loadedParent.getChildren().size();
+			assertTrue( Hibernate.isInitialized( loadedParent.getChildren() ) );
+			s.remove( loadedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedWithUninitializedAssociation(SessionFactoryScope scope) {
+		final Parent detachedParent = scope.fromTransaction( s -> {
+			return s.get( Parent.class, originalParent.getId() );
+		} );
+
+		assertFalse( Hibernate.isInitialized( detachedParent.getChildren() ) );
+
+		checkInterceptor( scope, detachedParent, false );
+
+		// Delete the detached Parent with uninitialized children
+		scope.inTransaction( s -> {
+			s.remove( detachedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedWithInitializedAssociation(SessionFactoryScope scope) {
+		final Parent detachedParent = scope.fromTransaction( s -> {
+			Parent parent = s.get( Parent.class, originalParent.getId() );
+			// initialize collection before detaching
+			parent.getChildren().size();
+			return parent;
+		} );
+
+		assertTrue( Hibernate.isInitialized( detachedParent.getChildren() ) );
+
+		checkInterceptor( scope, detachedParent, false );
+
+		// Delete the detached Parent with initialized children
+		scope.inTransaction( s -> {
+			s.remove( detachedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedOriginal(SessionFactoryScope scope) {
+
+		// originalParent#children should be initialized
+		assertTrue( Hibernate.isPropertyInitialized( originalParent, "children" ) );
+
+		checkInterceptor( scope, originalParent, true );
+
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			s.remove( originalParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	private void checkInterceptor(SessionFactoryScope scope, Parent parent, boolean isNullExpected) {
+		final BytecodeEnhancementMetadata bytecodeEnhancementMetadata = scope.getSessionFactory().getRuntimeMetamodels()
+				.getMappingMetamodel()
+				.getEntityDescriptor( Parent.class )
+				.getBytecodeEnhancementMetadata();
+		if ( isNullExpected ) {
+			// if a null Interceptor is expected, then there shouldn't be any uninitialized attributes
+			assertFalse( bytecodeEnhancementMetadata.hasUnFetchedAttributes( parent ) );
+			assertNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
+		}
+		else {
+			assertNotNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
+		}
+	}
+
+	// --- //
+
+	@Entity( name = "Parent" )
+	@Table( name = "PARENT" )
+	public static class Parent {
+
+		Long id;
+
+		String name;
+
+		List children = new ArrayList<>();
+
+		String lazy;
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		@OneToMany( mappedBy = "parent", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}, fetch = FetchType.LAZY )
+		List getChildren() {
+			return children;
+		}
+
+		void setChildren(List children) {
+			this.children = children;
+		}
+
+		String getName() {
+			return name;
+		}
+
+		void setName(String name) {
+			this.name = name;
+		}
+
+		@Basic( fetch = FetchType.LAZY )
+		String getLazy() {
+			return lazy;
+		}
+
+		void setLazy(String lazy) {
+			this.lazy = lazy;
+		}
+
+		void makeChild() {
+			Child c = new Child();
+			c.setParent( this );
+			children.add( c );
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@ManyToOne( optional = false )
+		@JoinColumn( name = "parent_id" )
+		Parent parent;
+
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		Parent getParent() {
+			return parent;
+		}
+
+		void setParent(Parent parent) {
+			this.parent = parent;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java
index da447930c0c2..145775700ae9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
@@ -48,218 +46,218 @@
  */
 @JiraKey( "HHH-10252" )
 @DomainModel(
-        annotatedClasses = {
-               CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.Parent.class, CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.Child.class
-        }
+		annotatedClasses = {
+			CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.Parent.class, CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.Child.class
+		}
 )
 @SessionFactory(
-        // We want to test with this setting set to false explicitly,
-        // because another test already takes care of the default.
-        applyCollectionsInDefaultFetchGroup = false
+		// We want to test with this setting set to false explicitly,
+		// because another test already takes care of the default.
+		applyCollectionsInDefaultFetchGroup = false
 )
 @BytecodeEnhanced
 public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest {
-    private Parent originalParent;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        // Create a Parent with one Child
-        originalParent = scope.fromTransaction( s -> {
-                    Parent p = new Parent();
-                    p.setName( "PARENT" );
-                    p.setLazy( "LAZY" );
-                    p.makeChild();
-                    s.persist( p );
-                    return p;
-                }
-        );
-    }
-
-    @Test
-    public void testManagedWithUninitializedAssociation(SessionFactoryScope scope) {
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
-                    .setParameter( "name", "PARENT" )
-                    .uniqueResult();
-            checkInterceptor( scope, loadedParent, false );
-            assertFalse( Hibernate.isPropertyInitialized( loadedParent, "children" ) );
-            s.remove( loadedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testManagedWithInitializedAssociation(SessionFactoryScope scope) {
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
-                    .setParameter( "name", "PARENT" )
-                    .uniqueResult();
-            checkInterceptor( scope, loadedParent, false );
-            loadedParent.getChildren();
-            assertTrue( Hibernate.isPropertyInitialized( loadedParent, "children" ) );
-            s.remove( loadedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedWithUninitializedAssociation(SessionFactoryScope scope) {
-        final Parent detachedParent = scope.fromTransaction( s -> {
-            return s.get( Parent.class, originalParent.getId() );
-        } );
-
-        assertFalse( Hibernate.isPropertyInitialized( detachedParent, "children" ) );
-
-        checkInterceptor( scope, detachedParent, false );
-
-        // Delete the detached Parent with uninitialized children
-        scope.inTransaction( s -> {
-             s.remove( detachedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedWithInitializedAssociation(SessionFactoryScope scope) {
-        final Parent detachedParent = scope.fromTransaction( s -> {
-             Parent parent = s.get( Parent.class, originalParent.getId() );
-             assertFalse( Hibernate.isPropertyInitialized( parent, "children" ) );
-
-             // initialize collection before detaching
-             parent.getChildren();
-             return parent;
-        } );
-
-        assertTrue( Hibernate.isPropertyInitialized( detachedParent, "children" ) );
-
-        checkInterceptor( scope, detachedParent, false );
-
-        // Delete the detached Parent with initialized children
-        scope.inTransaction( s -> {
-            s.remove( detachedParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    @Test
-    @JiraKey("HHH-13129")
-    public void testDetachedOriginal(SessionFactoryScope scope) {
-
-        // originalParent#children should be initialized
-        assertTrue( Hibernate.isPropertyInitialized( originalParent, "children" ) );
-
-        checkInterceptor( scope, originalParent, true );
-
-        // Delete the Parent
-        scope.inTransaction( s -> {
-            s.remove( originalParent );
-        } );
-        // If the lazy relation is not fetch on cascade there is a constraint violation on commit
-    }
-
-    private void checkInterceptor(SessionFactoryScope scope, Parent parent, boolean isNullExpected) {
-        final BytecodeEnhancementMetadata bytecodeEnhancementMetadata = scope.getSessionFactory().getRuntimeMetamodels()
-                .getMappingMetamodel()
-                .getEntityDescriptor( Parent.class )
-                .getBytecodeEnhancementMetadata();
-        if ( isNullExpected ) {
-            // if a null Interceptor is expected, then there shouldn't be any uninitialized attributes
-            assertFalse( bytecodeEnhancementMetadata.hasUnFetchedAttributes( parent ) );
-            assertNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
-        }
-        else {
-            assertNotNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
-        }
-    }
-
-    // --- //
-
-    @Entity( name = "Parent" )
-    @Table( name = "PARENT" )
-    public static class Parent {
-
-        Long id;
-
-        String name;
-
-        List children = new ArrayList<>();
-
-        String lazy;
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        @OneToMany( mappedBy = "parent", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}, fetch = FetchType.LAZY )
-        List getChildren() {
-            return Collections.unmodifiableList( children );
-        }
-
-        void setChildren(List children) {
-            this.children = children;
-        }
-
-        String getName() {
-            return name;
-        }
-
-        void setName(String name) {
-            this.name = name;
-        }
-
-        @Basic( fetch = FetchType.LAZY )
-        String getLazy() {
-            return lazy;
-        }
-
-        void setLazy(String lazy) {
-            this.lazy = lazy;
-        }
-
-        void makeChild() {
-            Child c = new Child();
-            c.setParent( this );
-            children.add( c );
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @ManyToOne( optional = false )
-        @JoinColumn( name = "parent_id" )
-        Parent parent;
-
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        Parent getParent() {
-            return parent;
-        }
-
-        void setParent(Parent parent) {
-            this.parent = parent;
-        }
-    }
+	private Parent originalParent;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		// Create a Parent with one Child
+		originalParent = scope.fromTransaction( s -> {
+					Parent p = new Parent();
+					p.setName( "PARENT" );
+					p.setLazy( "LAZY" );
+					p.makeChild();
+					s.persist( p );
+					return p;
+				}
+		);
+	}
+
+	@Test
+	public void testManagedWithUninitializedAssociation(SessionFactoryScope scope) {
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
+					.setParameter( "name", "PARENT" )
+					.uniqueResult();
+			checkInterceptor( scope, loadedParent, false );
+			assertFalse( Hibernate.isPropertyInitialized( loadedParent, "children" ) );
+			s.remove( loadedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testManagedWithInitializedAssociation(SessionFactoryScope scope) {
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
+					.setParameter( "name", "PARENT" )
+					.uniqueResult();
+			checkInterceptor( scope, loadedParent, false );
+			loadedParent.getChildren();
+			assertTrue( Hibernate.isPropertyInitialized( loadedParent, "children" ) );
+			s.remove( loadedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedWithUninitializedAssociation(SessionFactoryScope scope) {
+		final Parent detachedParent = scope.fromTransaction( s -> {
+			return s.get( Parent.class, originalParent.getId() );
+		} );
+
+		assertFalse( Hibernate.isPropertyInitialized( detachedParent, "children" ) );
+
+		checkInterceptor( scope, detachedParent, false );
+
+		// Delete the detached Parent with uninitialized children
+		scope.inTransaction( s -> {
+			s.remove( detachedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedWithInitializedAssociation(SessionFactoryScope scope) {
+		final Parent detachedParent = scope.fromTransaction( s -> {
+			Parent parent = s.get( Parent.class, originalParent.getId() );
+			assertFalse( Hibernate.isPropertyInitialized( parent, "children" ) );
+
+			// initialize collection before detaching
+			parent.getChildren();
+			return parent;
+		} );
+
+		assertTrue( Hibernate.isPropertyInitialized( detachedParent, "children" ) );
+
+		checkInterceptor( scope, detachedParent, false );
+
+		// Delete the detached Parent with initialized children
+		scope.inTransaction( s -> {
+			s.remove( detachedParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	@Test
+	@JiraKey("HHH-13129")
+	public void testDetachedOriginal(SessionFactoryScope scope) {
+
+		// originalParent#children should be initialized
+		assertTrue( Hibernate.isPropertyInitialized( originalParent, "children" ) );
+
+		checkInterceptor( scope, originalParent, true );
+
+		// Delete the Parent
+		scope.inTransaction( s -> {
+			s.remove( originalParent );
+		} );
+		// If the lazy relation is not fetch on cascade there is a constraint violation on commit
+	}
+
+	private void checkInterceptor(SessionFactoryScope scope, Parent parent, boolean isNullExpected) {
+		final BytecodeEnhancementMetadata bytecodeEnhancementMetadata = scope.getSessionFactory().getRuntimeMetamodels()
+				.getMappingMetamodel()
+				.getEntityDescriptor( Parent.class )
+				.getBytecodeEnhancementMetadata();
+		if ( isNullExpected ) {
+			// if a null Interceptor is expected, then there shouldn't be any uninitialized attributes
+			assertFalse( bytecodeEnhancementMetadata.hasUnFetchedAttributes( parent ) );
+			assertNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
+		}
+		else {
+			assertNotNull( bytecodeEnhancementMetadata.extractInterceptor( parent ) );
+		}
+	}
+
+	// --- //
+
+	@Entity( name = "Parent" )
+	@Table( name = "PARENT" )
+	public static class Parent {
+
+		Long id;
+
+		String name;
+
+		List children = new ArrayList<>();
+
+		String lazy;
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		@OneToMany( mappedBy = "parent", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}, fetch = FetchType.LAZY )
+		List getChildren() {
+			return Collections.unmodifiableList( children );
+		}
+
+		void setChildren(List children) {
+			this.children = children;
+		}
+
+		String getName() {
+			return name;
+		}
+
+		void setName(String name) {
+			this.name = name;
+		}
+
+		@Basic( fetch = FetchType.LAZY )
+		String getLazy() {
+			return lazy;
+		}
+
+		void setLazy(String lazy) {
+			this.lazy = lazy;
+		}
+
+		void makeChild() {
+			Child c = new Child();
+			c.setParent( this );
+			children.add( c );
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@ManyToOne( optional = false )
+		@JoinColumn( name = "parent_id" )
+		Parent parent;
+
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		Parent getParent() {
+			return parent;
+		}
+
+		void setParent(Parent parent) {
+			this.parent = parent;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java
index 368ffb36f07e..39c2ef8fa60d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDetachedTest.java
index 4f7c1ddd6a50..6ab0abd2da9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDetachedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDetachedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
@@ -32,85 +30,85 @@
  */
 @JiraKey( "HHH-10254" )
 @DomainModel(
-        annotatedClasses = {
-             CascadeDetachedTest.Author.class, CascadeDetachedTest.Book.class
-        }
+		annotatedClasses = {
+			CascadeDetachedTest.Author.class, CascadeDetachedTest.Book.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class CascadeDetachedTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Book book = new Book( "978-1118063330", "Operating System Concepts 9th Edition" );
-        book.addAuthor( new Author( "Abraham", "Silberschatz", new char[] { 'a', 'b' } ) );
-        book.addAuthor( new Author( "Peter", "Galvin", new char[] { 'c', 'd' }  ) );
-        book.addAuthor( new Author( "Greg", "Gagne", new char[] { 'e', 'f' }  ) );
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Book book = new Book( "978-1118063330", "Operating System Concepts 9th Edition" );
+		book.addAuthor( new Author( "Abraham", "Silberschatz", new char[] { 'a', 'b' } ) );
+		book.addAuthor( new Author( "Peter", "Galvin", new char[] { 'c', 'd' }  ) );
+		book.addAuthor( new Author( "Greg", "Gagne", new char[] { 'e', 'f' }  ) );
 
-        scope.inTransaction( em -> {
-                    em.persist( book );
-        } );
+		scope.inTransaction( em -> {
+					em.persist( book );
+		} );
 
-        scope.inTransaction( em -> {
-            em.merge( book );
-        } );
-    }
+		scope.inTransaction( em -> {
+			em.merge( book );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "BOOK" )
-    public static class Book {
+	@Entity
+	@Table( name = "BOOK" )
+	public static class Book {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        String isbn;
-        String title;
+		String isbn;
+		String title;
 
-        @OneToMany( cascade = CascadeType.ALL, mappedBy = "book" )
-        List authors = new ArrayList<>();
+		@OneToMany( cascade = CascadeType.ALL, mappedBy = "book" )
+		List authors = new ArrayList<>();
 
-        public Book() {
-        }
+		public Book() {
+		}
 
-        public Book(String isbn, String title) {
-            this.isbn = isbn;
-            this.title = title;
-        }
+		public Book(String isbn, String title) {
+			this.isbn = isbn;
+			this.title = title;
+		}
 
-        public void addAuthor(Author author) {
-            authors.add( author );
-            author.book = this;
-        }
-    }
+		public void addAuthor(Author author) {
+			authors.add( author );
+			author.book = this;
+		}
+	}
 
-    @Entity
-    @Table( name = "AUTHOR" )
-    public static class Author {
+	@Entity
+	@Table( name = "AUTHOR" )
+	public static class Author {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        String firstName;
-        String lastName;
+		String firstName;
+		String lastName;
 
-        @ManyToOne( fetch = FetchType.LAZY )
-        @JoinColumn
-        Book book;
+		@ManyToOne( fetch = FetchType.LAZY )
+		@JoinColumn
+		Book book;
 
-        @Basic( fetch = FetchType.LAZY )
-        char[] charArrayCode;
+		@Basic( fetch = FetchType.LAZY )
+		char[] charArrayCode;
 
-        public Author() {
-        }
+		public Author() {
+		}
 
-        public Author(String firstName, String lastName, char[] charArrayCode) {
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.charArrayCode = charArrayCode;
-        }
-    }
+		public Author(String firstName, String lastName, char[] charArrayCode) {
+			this.firstName = firstName;
+			this.lastName = lastName;
+			this.charArrayCode = charArrayCode;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java
index 7f62eab8db0e..2cb10ec2465a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
 import java.util.HashSet;
@@ -298,5 +302,3 @@ public void setDescription(String description) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java
index 306a1f2bbb6d..07160ac03990 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
 import java.util.HashSet;
@@ -311,5 +315,3 @@ public void setDescription(String description) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java
index 41856e574a77..1406dd8d5e61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade;
 
@@ -10,7 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,89 +30,89 @@
  */
 @JiraKey( "HHH-10252" )
 @DomainModel(
-        annotatedClasses = {
-            CascadeWithFkConstraintTest.Garage.class, CascadeWithFkConstraintTest.Car.class
-        }
+		annotatedClasses = {
+			CascadeWithFkConstraintTest.Garage.class, CascadeWithFkConstraintTest.Car.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class CascadeWithFkConstraintTest  {
 
-    private String garageId, car1Id, car2Id;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        // Create garage, add 2 cars to garage
-        scope.inTransaction( em -> {
-
-            Garage garage = new Garage();
-            Car car1 = new Car();
-            Car car2 = new Car();
-            garage.insert( car1 );
-            garage.insert( car2 );
-
-            em.persist( garage );
-            em.persist( car1 );
-            em.persist( car2 );
-
-            garageId = garage.id;
-            car1Id = car1.id;
-            car2Id = car2.id;
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        // Remove garage
-        scope.inTransaction( em -> {
-            Garage toRemoveGarage = em.find( Garage.class, garageId );
-            em.remove( toRemoveGarage );
-        } );
-
-        // Check if there is no garage but cars are still present
-        scope.inTransaction( em -> {
-            Garage foundGarage = em.find( Garage.class, garageId );
-            assertNull( foundGarage );
-
-            Car foundCar1 = em.find( Car.class, car1Id );
-            assertEquals( car1Id, foundCar1.id );
-
-            Car foundCar2 = em.find( Car.class, car2Id );
-            assertEquals( car2Id, foundCar2.id );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "GARAGE" )
-    static class Garage {
-
-        @Id
-        String id;
-
-        @OneToMany
-        @JoinColumn( name = "GARAGE_ID" )
-        Set cars = new HashSet<>();
-
-        Garage() {
-            id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
-        }
-
-        void insert(Car aCar) {
-            cars.add( aCar );
-        }
-    }
-
-    @Entity
-    @Table( name = "CAR" )
-    public static class Car {
-
-        @Id
-        String id;
-
-        Car() {
-            id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
-        }
-    }
+	private String garageId, car1Id, car2Id;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		// Create garage, add 2 cars to garage
+		scope.inTransaction( em -> {
+
+			Garage garage = new Garage();
+			Car car1 = new Car();
+			Car car2 = new Car();
+			garage.insert( car1 );
+			garage.insert( car2 );
+
+			em.persist( garage );
+			em.persist( car1 );
+			em.persist( car2 );
+
+			garageId = garage.id;
+			car1Id = car1.id;
+			car2Id = car2.id;
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		// Remove garage
+		scope.inTransaction( em -> {
+			Garage toRemoveGarage = em.find( Garage.class, garageId );
+			em.remove( toRemoveGarage );
+		} );
+
+		// Check if there is no garage but cars are still present
+		scope.inTransaction( em -> {
+			Garage foundGarage = em.find( Garage.class, garageId );
+			assertNull( foundGarage );
+
+			Car foundCar1 = em.find( Car.class, car1Id );
+			assertEquals( car1Id, foundCar1.id );
+
+			Car foundCar2 = em.find( Car.class, car2Id );
+			assertEquals( car2Id, foundCar2.id );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "GARAGE" )
+	static class Garage {
+
+		@Id
+		String id;
+
+		@OneToMany
+		@JoinColumn( name = "GARAGE_ID" )
+		Set cars = new HashSet<>();
+
+		Garage() {
+			id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
+		}
+
+		void insert(Car aCar) {
+			cars.add( aCar );
+		}
+	}
+
+	@Entity
+	@Table( name = "CAR" )
+	public static class Car {
+
+		@Id
+		String id;
+
+		Car() {
+			id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java
index 74b3b760ec91..47fd92aa76d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
index e5702a61035d..36a0336643e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
index fb27f3568d66..89189b09438e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
@@ -15,9 +13,7 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.Test;
 
 /**
  * @author Gail Badner
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
index c924c0268797..be2fe3a5101e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
index 69dcf20bf0ce..a113d5ce5ed0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
index 61fcf34dc961..26c5c98ed602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
@@ -15,9 +13,7 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.Test;
 
 /**
  * @author Gail Badner
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
index b9d5cb8e437a..7dec3904ee18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/flush/ElementCollectionFlushAfterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/flush/ElementCollectionFlushAfterQueryTest.java
index 99e4731edf1e..728f0aa1a89a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/flush/ElementCollectionFlushAfterQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/flush/ElementCollectionFlushAfterQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.collectionelement.flush;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
index 80dd33641c20..33812c8d4d47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateCollectionsInDefaultGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
index dabec704abfb..ce7bf9d75c48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/collectionelement/recreate/BytecodeEnhancementElementCollectionRecreateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.collectionelement.recreate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java
index 792ac41db911..ceb67f22b0dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.deletetransient;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java
index 6dbacb41f6c1..95005714397e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.detached;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -21,41 +25,41 @@
  */
 @JiraKey( "HHH-11426" )
 @DomainModel(
-        annotatedClasses = {
-               DetachedGetIdentifierTest.SimpleEntity.class
-        }
+		annotatedClasses = {
+			DetachedGetIdentifierTest.SimpleEntity.class
+		}
 )
 @org.hibernate.testing.orm.junit.SessionFactory
 @BytecodeEnhanced
 public class DetachedGetIdentifierTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        SimpleEntity[] entities = new SimpleEntity[2];
-        entities[0] = new SimpleEntity();
-        entities[0].name = "test";
+	@Test
+	public void test(SessionFactoryScope scope) {
+		SimpleEntity[] entities = new SimpleEntity[2];
+		entities[0] = new SimpleEntity();
+		entities[0].name = "test";
 
-        scope.inTransaction( em -> {
-            entities[1] = em.merge( entities[0] );
-            assertNotNull( em.getEntityManagerFactory().getPersistenceUnitUtil().getIdentifier( entities[1] ) );
-        } );
+		scope.inTransaction( em -> {
+			entities[1] = em.merge( entities[0] );
+			assertNotNull( em.getEntityManagerFactory().getPersistenceUnitUtil().getIdentifier( entities[1] ) );
+		} );
 
-        // Call as detached entity
-        try ( SessionFactory sessionFactory = scope.getSessionFactory() ) {
-            assertNotNull( sessionFactory.getPersistenceUnitUtil().getIdentifier( entities[1] ) );
-        }
-    }
+		// Call as detached entity
+		try ( SessionFactory sessionFactory = scope.getSessionFactory() ) {
+			assertNotNull( sessionFactory.getPersistenceUnitUtil().getIdentifier( entities[1] ) );
+		}
+	}
 
-    // --- //
+	// --- //
 
-    @Entity(name = "SimpleEntity")
-    @Table( name = "SIMPLE_ENTITY" )
-    static class SimpleEntity {
+	@Entity(name = "SimpleEntity")
+	@Table( name = "SIMPLE_ENTITY" )
+	static class SimpleEntity {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        String name;
-    }
+		String name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java
index 559202fb4f23..8adce5d898bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupFalseTest.java
index 1253fc97167c..f6b9813c00e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -46,58 +44,58 @@
  */
 @JiraKey( "HHH-14348" )
 @DomainModel(
-        annotatedClasses = {
-                DirtyTrackingCollectionInDefaultFetchGroupFalseTest.StringsEntity.class
-        }
+		annotatedClasses = {
+				DirtyTrackingCollectionInDefaultFetchGroupFalseTest.StringsEntity.class
+		}
 )
 @SessionFactory(
-        // We want to test with this setting set to false explicitly,
-        // because another test already takes care of the default.
-        applyCollectionsInDefaultFetchGroup = false
+		// We want to test with this setting set to false explicitly,
+		// because another test already takes care of the default.
+		applyCollectionsInDefaultFetchGroup = false
 )
 @BytecodeEnhanced
 public class DirtyTrackingCollectionInDefaultFetchGroupFalseTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            entityManager.flush();
-            BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
-                    .$$_hibernate_getInterceptor();
-            assertTrue( interceptor.hasAnyUninitializedAttributes() );
-            assertFalse( interceptor.isAttributeLoaded( "someStrings" ) );
-            assertFalse( interceptor.isAttributeLoaded( "someStringEntities" ) );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			entityManager.flush();
+			BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
+					.$$_hibernate_getInterceptor();
+			assertTrue( interceptor.hasAnyUninitializedAttributes() );
+			assertFalse( interceptor.isAttributeLoaded( "someStrings" ) );
+			assertFalse( interceptor.isAttributeLoaded( "someStringEntities" ) );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table(name = "STRINGS_ENTITY")
-    static class StringsEntity {
+	@Entity
+	@Table(name = "STRINGS_ENTITY")
+	static class StringsEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @ElementCollection
-        @CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
-        List someStrings;
+		@ElementCollection
+		@CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
+		List someStrings;
 
-        @ManyToOne(fetch = FetchType.LAZY)
-        StringsEntity parent;
+		@ManyToOne(fetch = FetchType.LAZY)
+		StringsEntity parent;
 
-        @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-        Set someStringEntities;
-    }
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+		Set someStringEntities;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java
index b4aae20c1d55..ed8181f78e21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -41,61 +39,61 @@
  */
 @JiraKey( "HHH-14348" )
 @DomainModel(
-        annotatedClasses = {
-                DirtyTrackingCollectionInDefaultFetchGroupTest.StringsEntity.class
-        }
+		annotatedClasses = {
+				DirtyTrackingCollectionInDefaultFetchGroupTest.StringsEntity.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class DirtyTrackingCollectionInDefaultFetchGroupTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            entityManager.flush();
-            BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
-                    .$$_hibernate_getInterceptor();
-            // the attributes are initialized with a PersistentCollection that is not initialized
-            assertFalse( interceptor.hasAnyUninitializedAttributes() );
-
-            assertTrue( interceptor.isAttributeLoaded( "someStrings" ) );
-            assertTrue( interceptor.isAttributeLoaded( "someStringEntities" ) );
-
-            assertFalse( Hibernate.isInitialized( entity.someStrings ) );
-            assertFalse( Hibernate.isInitialized( entity.someStringEntities ) );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "STRINGS_ENTITY" )
-    static class StringsEntity {
-
-        @Id
-        Long id;
-
-        @ElementCollection
-        @CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
-        List someStrings;
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        StringsEntity parent;
-
-        @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-        Set someStringEntities;
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			entityManager.flush();
+			BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
+					.$$_hibernate_getInterceptor();
+			// the attributes are initialized with a PersistentCollection that is not initialized
+			assertFalse( interceptor.hasAnyUninitializedAttributes() );
+
+			assertTrue( interceptor.isAttributeLoaded( "someStrings" ) );
+			assertTrue( interceptor.isAttributeLoaded( "someStringEntities" ) );
+
+			assertFalse( Hibernate.isInitialized( entity.someStrings ) );
+			assertFalse( Hibernate.isInitialized( entity.someStringEntities ) );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "STRINGS_ENTITY" )
+	static class StringsEntity {
+
+		@Id
+		Long id;
+
+		@ElementCollection
+		@CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
+		List someStrings;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		StringsEntity parent;
+
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+		Set someStringEntities;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionNotInDefaultFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionNotInDefaultFetchGroupTest.java
index 438922dff604..3af345b30b7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionNotInDefaultFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionNotInDefaultFetchGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -41,57 +39,57 @@
  */
 @JiraKey( "HHH-14348" )
 @DomainModel(
-        annotatedClasses = {
-               DirtyTrackingCollectionNotInDefaultFetchGroupTest.StringsEntity.class
-        }
+		annotatedClasses = {
+			DirtyTrackingCollectionNotInDefaultFetchGroupTest.StringsEntity.class
+		}
 )
 @SessionFactory(
-        applyCollectionsInDefaultFetchGroup = false
+		applyCollectionsInDefaultFetchGroup = false
 )
 @BytecodeEnhanced
 public class DirtyTrackingCollectionNotInDefaultFetchGroupTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        assertFalse( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		assertFalse( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            entityManager.flush();
-            BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
-                    .$$_hibernate_getInterceptor();
-            assertTrue( interceptor.hasAnyUninitializedAttributes() );
-            assertFalse( interceptor.isAttributeLoaded( "someStrings" ) );
-            assertFalse( interceptor.isAttributeLoaded( "someStringEntities" ) );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			entityManager.flush();
+			BytecodeLazyAttributeInterceptor interceptor = (BytecodeLazyAttributeInterceptor) ( (PersistentAttributeInterceptable) entity )
+					.$$_hibernate_getInterceptor();
+			assertTrue( interceptor.hasAnyUninitializedAttributes() );
+			assertFalse( interceptor.isAttributeLoaded( "someStrings" ) );
+			assertFalse( interceptor.isAttributeLoaded( "someStringEntities" ) );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "STRINGS_ENTITY" )
-    static class StringsEntity {
+	@Entity
+	@Table( name = "STRINGS_ENTITY" )
+	static class StringsEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @ElementCollection
-        @CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
-        List someStrings;
+		@ElementCollection
+		@CollectionTable(name = "STRINGS_ENTITY_SOME", joinColumns = @JoinColumn(name = "SOME_ID"))
+		List someStrings;
 
-        @ManyToOne(fetch = FetchType.LAZY)
-        StringsEntity parent;
+		@ManyToOne(fetch = FetchType.LAZY)
+		StringsEntity parent;
 
-        @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-        Set someStringEntities;
-    }
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+		Set someStringEntities;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
index 39084aa9cddf..f5bd942fe3bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -29,59 +27,59 @@
  */
 @JiraKey( "HHH-11293" )
 @DomainModel(
-        annotatedClasses = {
-                DirtyTrackingCollectionTest.StringsEntity.class
-        }
+		annotatedClasses = {
+				DirtyTrackingCollectionTest.StringsEntity.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class DirtyTrackingCollectionTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            entity.someStrings.clear();
-        } );
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			entity.someStrings.clear();
+		} );
 
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            assertEquals( 0, entity.someStrings.size() );
-            entity.someStrings.add( "d" );
-        } );
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			assertEquals( 0, entity.someStrings.size() );
+			entity.someStrings.add( "d" );
+		} );
 
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            assertEquals( 1, entity.someStrings.size() );
-            entity.someStrings = new ArrayList<>();
-        } );
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			assertEquals( 1, entity.someStrings.size() );
+			entity.someStrings = new ArrayList<>();
+		} );
 
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
-            assertEquals( 0, entity.someStrings.size() );
-        } );
-    }
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.find( StringsEntity.class, 1L );
+			assertEquals( 0, entity.someStrings.size() );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "STRINGS_ENTITY" )
-    static class StringsEntity {
+	@Entity
+	@Table( name = "STRINGS_ENTITY" )
+	static class StringsEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @ElementCollection
-        List someStrings;
-    }
+		@ElementCollection
+		List someStrings;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateAndInheritanceTest.java
index 086db2b1f242..5b924ecd4839 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateAndInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateAndInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateTest.java
index 62cd598d968d..83228822d6d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingDynamicUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java
index 496356e08a5f..61717bd399e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -21,54 +19,54 @@
 @BytecodeEnhanced
 public class DirtyTrackingEmbeddableTest {
 
-    @Test
-    public void test() {
-        SimpleEntity entity = new SimpleEntity();
-        Address1 address1 = new Address1();
-        entity.address1 = address1;
-        Address2 address2 = new Address2();
-        entity.address2 = address2;
-        EnhancerTestUtils.clearDirtyTracking( entity );
+	@Test
+	public void test() {
+		SimpleEntity entity = new SimpleEntity();
+		Address1 address1 = new Address1();
+		entity.address1 = address1;
+		Address2 address2 = new Address2();
+		entity.address2 = address2;
+		EnhancerTestUtils.clearDirtyTracking( entity );
 
-        // testing composite object
-        address1.city = "Arendal";
-        address2.city = "Arendal";
-        EnhancerTestUtils.checkDirtyTracking( entity, "address1", "address2" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-    }
+		// testing composite object
+		address1.city = "Arendal";
+		address2.city = "Arendal";
+		EnhancerTestUtils.checkDirtyTracking( entity, "address1", "address2" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+	}
 
-    // --- //
+	// --- //
 
-    @Embeddable
-    private static class Address1 {
-        String street1;
-        String street2;
-        String city;
-        String state;
-        String zip;
-        String phone;
-    }
+	@Embeddable
+	private static class Address1 {
+		String street1;
+		String street2;
+		String city;
+		String state;
+		String zip;
+		String phone;
+	}
 
-    private static class Address2 {
-        String street1;
-        String street2;
-        String city;
-        String state;
-        String zip;
-        String phone;
-    }
+	private static class Address2 {
+		String street1;
+		String street2;
+		String city;
+		String state;
+		String zip;
+		String phone;
+	}
 
-    @Entity
-    private static class SimpleEntity {
+	@Entity
+	private static class SimpleEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String name;
+		String name;
 
-        Address1 address1;
-        @Embedded
-        Address2 address2;
+		Address1 address1;
+		@Embedded
+		Address2 address2;
 
-    }
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceTest.java
index 0ea34950598f..021580bb4c9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceWithGenericsTest.java
index b8f93d9d9fdc..9ed231e03eef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingInheritanceWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java
index c4e6173a965d..fb12d6f9ebab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -26,43 +24,43 @@
  */
 @JiraKey( "HHH-12051" )
 @DomainModel(
-        annotatedClasses = {
-               DirtyTrackingNonUpdateableTest.Thing.class
-        }
+		annotatedClasses = {
+			DirtyTrackingNonUpdateableTest.Thing.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class DirtyTrackingNonUpdateableTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            Thing thing = new Thing();
-            entityManager.persist( thing );
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Thing thing = new Thing();
+			entityManager.persist( thing );
 
-            entityManager
-            .createQuery( "update thing set special = :s, version = version + 1" )
-            .setParameter( "s", "new" )
-            .executeUpdate();
+			entityManager
+			.createQuery( "update thing set special = :s, version = version + 1" )
+			.setParameter( "s", "new" )
+			.executeUpdate();
 
-            thing.special = "If I'm flush to the DB you get an OptimisticLockException";
-        } );
-    }
+			thing.special = "If I'm flush to the DB you get an OptimisticLockException";
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity( name = "thing" )
-    @Table( name = "THING_ENTITY" )
-    public class Thing {
+	@Entity( name = "thing" )
+	@Table( name = "THING_ENTITY" )
+	public class Thing {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		long id;
 
-        @Version
-        long version;
+		@Version
+		long version;
 
-        @Column( updatable = false )
-        String special;
-    }
+		@Column( updatable = false )
+		String special;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java
index a9d1720825e4..48d82d721a32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java
index 68a0cb694788..957d15914398 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java
index 20a761a4ae6c..335329d06f01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
@@ -26,134 +24,134 @@
 @BytecodeEnhanced
 public class DirtyTrackingTest {
 
-    @Test
-    public void test() {
-        SimpleEntity entity = new SimpleEntity();
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        // Basic single field
-        Long number = entity.getSomeNumber();
-        EnhancerTestUtils.checkDirtyTracking( entity );
-        entity.setSomeNumber( number + 1L );
-        EnhancerTestUtils.checkDirtyTracking( entity, "someNumber" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-        entity.setSomeNumber( entity.getSomeNumber() );
-        EnhancerTestUtils.checkDirtyTracking( entity );
-
-        // Basic multi-field (Id properties are not flagged as dirty)
-        entity.id = 2L;
-        entity.active = !entity.active;
-        entity.someNumber = 193L;
-        EnhancerTestUtils.checkDirtyTracking( entity, "active", "someNumber" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        // Setting the same value should not make it dirty
-        entity.someNumber = 193L;
-        EnhancerTestUtils.checkDirtyTracking( entity );
-
-        // Collection
-        List stringList = new ArrayList<>();
-        stringList.add( "FooBar" );
-        entity.someStrings = stringList;
-        EnhancerTestUtils.checkDirtyTracking( entity, "someStrings" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        stringList.add( "BarFoo" );
-        EnhancerTestUtils.checkDirtyTracking( entity, "someStrings" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        // Association, 1: creating the association will mark it dirty
-        Set associatedSet = new HashSet<>();
-        OtherEntity o = new OtherEntity();
-        o.id = 1l;
-        o.name = "other";
-        associatedSet.add( o );
-        entity.someAssociation = associatedSet;
-        EnhancerTestUtils.checkDirtyTracking( entity, "someAssociation" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        // Association, 2: modifying a related entity should not
-        o.name = "newName";
-        EnhancerTestUtils.checkDirtyTracking( entity );
-        EnhancerTestUtils.checkDirtyTracking( o, "name" );
-
-        // testing composite object
-        Address address = new Address();
-        entity.address = address;
-        address.city = "Arendal";
-        EnhancerTestUtils.checkDirtyTracking( entity, "address" );
-        EnhancerTestUtils.clearDirtyTracking( entity );
-
-        // make sure that new composite instances are cleared
-        Address address2 = new Address();
-        entity.address = address2;
-        address.street1 = "Heggedalveien";
-        EnhancerTestUtils.checkDirtyTracking( entity, "address" );
-
-        Country country = new Country();
-        address2.country = country;
-        country.name = "Norway";
-        EnhancerTestUtils.checkDirtyTracking( entity, "address", "address.country" );
-
-        address.country = null;
-        entity.address = null;
-    }
-
-    // --- //
-
-    @Embeddable
-    private static class Address {
-        @Embedded
-        Country country;
-        String street1;
-        String street2;
-        String city;
-        String state;
-        String zip;
-        String phone;
-    }
-
-    @Embeddable
-    private static class Country {
-        String name;
-    }
-
-    @Entity
-    private static class SimpleEntity {
-
-        @Id
-        Long id;
-
-        String name;
-
-        Boolean active = Boolean.FALSE;
-
-        Long someNumber = 0L;
-
-        List someStrings;
-
-        @OneToMany
-        Set someAssociation;
-
-        @Embedded
-        Address address;
-
-        @Embedded
-        Address address2;
-
-        public Long getSomeNumber() {
-            return someNumber;
-        }
-
-        public void setSomeNumber(Long someNumber) {
-            this.someNumber = someNumber;
-        }
-    }
-
-    @Entity
-    private static class OtherEntity {
-        @Id
-        Long id;
-        String name;
-    }
+	@Test
+	public void test() {
+		SimpleEntity entity = new SimpleEntity();
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		// Basic single field
+		Long number = entity.getSomeNumber();
+		EnhancerTestUtils.checkDirtyTracking( entity );
+		entity.setSomeNumber( number + 1L );
+		EnhancerTestUtils.checkDirtyTracking( entity, "someNumber" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+		entity.setSomeNumber( entity.getSomeNumber() );
+		EnhancerTestUtils.checkDirtyTracking( entity );
+
+		// Basic multi-field (Id properties are not flagged as dirty)
+		entity.id = 2L;
+		entity.active = !entity.active;
+		entity.someNumber = 193L;
+		EnhancerTestUtils.checkDirtyTracking( entity, "active", "someNumber" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		// Setting the same value should not make it dirty
+		entity.someNumber = 193L;
+		EnhancerTestUtils.checkDirtyTracking( entity );
+
+		// Collection
+		List stringList = new ArrayList<>();
+		stringList.add( "FooBar" );
+		entity.someStrings = stringList;
+		EnhancerTestUtils.checkDirtyTracking( entity, "someStrings" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		stringList.add( "BarFoo" );
+		EnhancerTestUtils.checkDirtyTracking( entity, "someStrings" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		// Association, 1: creating the association will mark it dirty
+		Set associatedSet = new HashSet<>();
+		OtherEntity o = new OtherEntity();
+		o.id = 1l;
+		o.name = "other";
+		associatedSet.add( o );
+		entity.someAssociation = associatedSet;
+		EnhancerTestUtils.checkDirtyTracking( entity, "someAssociation" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		// Association, 2: modifying a related entity should not
+		o.name = "newName";
+		EnhancerTestUtils.checkDirtyTracking( entity );
+		EnhancerTestUtils.checkDirtyTracking( o, "name" );
+
+		// testing composite object
+		Address address = new Address();
+		entity.address = address;
+		address.city = "Arendal";
+		EnhancerTestUtils.checkDirtyTracking( entity, "address" );
+		EnhancerTestUtils.clearDirtyTracking( entity );
+
+		// make sure that new composite instances are cleared
+		Address address2 = new Address();
+		entity.address = address2;
+		address.street1 = "Heggedalveien";
+		EnhancerTestUtils.checkDirtyTracking( entity, "address" );
+
+		Country country = new Country();
+		address2.country = country;
+		country.name = "Norway";
+		EnhancerTestUtils.checkDirtyTracking( entity, "address", "address.country" );
+
+		address.country = null;
+		entity.address = null;
+	}
+
+	// --- //
+
+	@Embeddable
+	private static class Address {
+		@Embedded
+		Country country;
+		String street1;
+		String street2;
+		String city;
+		String state;
+		String zip;
+		String phone;
+	}
+
+	@Embeddable
+	private static class Country {
+		String name;
+	}
+
+	@Entity
+	private static class SimpleEntity {
+
+		@Id
+		Long id;
+
+		String name;
+
+		Boolean active = Boolean.FALSE;
+
+		Long someNumber = 0L;
+
+		List someStrings;
+
+		@OneToMany
+		Set someAssociation;
+
+		@Embedded
+		Address address;
+
+		@Embedded
+		Address address2;
+
+		public Long getSomeNumber() {
+			return someNumber;
+		}
+
+		public void setSomeNumber(Long someNumber) {
+			this.someNumber = someNumber;
+		}
+	}
+
+	@Entity
+	private static class OtherEntity {
+		@Id
+		Long id;
+		String name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
index 3c563873e1a9..2b48efd777c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java
index 78a10339667c..6357c5c6aab7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.eviction;
 
@@ -31,74 +29,74 @@
  * @author Gail Badner
  */
 @DomainModel(
-        annotatedClasses = {
-               EvictionTest.Parent.class
-        }
+		annotatedClasses = {
+			EvictionTest.Parent.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class EvictionTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        // Create a Parent
-        scope.inTransaction( s -> {
-            Parent p = new Parent();
-            p.name = "PARENT";
-            s.persist( p );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-
-            // Delete the Parent
-            Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
-                    .setParameter( "name", "PARENT" )
-                    .uniqueResult();
-            assertTyping( ManagedEntity.class, loadedParent );
-            ManagedEntity managedParent = (ManagedEntity) loadedParent;
-
-            // before eviction
-            assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
-            assertNotNull( managedParent.$$_hibernate_getEntityEntry() );
-            assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
-            assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
-
-            assertTrue( s.contains( managedParent ) );
-            s.evict( managedParent );
-
-            // after eviction
-            assertFalse( s.contains( managedParent ) );
-            assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
-            assertNull( managedParent.$$_hibernate_getEntityEntry() );
-            assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
-            assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
-
-            // evict again
-            s.evict( managedParent );
-
-            assertFalse( s.contains( managedParent ) );
-            assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
-            assertNull( managedParent.$$_hibernate_getEntityEntry() );
-            assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
-            assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
-
-            s.remove( managedParent );
-        } );
-    }
-
-    // --- //
-
-    @Entity( name = "Parent" )
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        String name;
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		// Create a Parent
+		scope.inTransaction( s -> {
+			Parent p = new Parent();
+			p.name = "PARENT";
+			s.persist( p );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+
+			// Delete the Parent
+			Parent loadedParent = (Parent) s.createQuery( "SELECT p FROM Parent p WHERE name=:name" )
+					.setParameter( "name", "PARENT" )
+					.uniqueResult();
+			assertTyping( ManagedEntity.class, loadedParent );
+			ManagedEntity managedParent = (ManagedEntity) loadedParent;
+
+			// before eviction
+			assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
+			assertNotNull( managedParent.$$_hibernate_getEntityEntry() );
+			assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
+			assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
+
+			assertTrue( s.contains( managedParent ) );
+			s.evict( managedParent );
+
+			// after eviction
+			assertFalse( s.contains( managedParent ) );
+			assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
+			assertNull( managedParent.$$_hibernate_getEntityEntry() );
+			assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
+			assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
+
+			// evict again
+			s.evict( managedParent );
+
+			assertFalse( s.contains( managedParent ) );
+			assertNotNull( managedParent.$$_hibernate_getEntityInstance() );
+			assertNull( managedParent.$$_hibernate_getEntityEntry() );
+			assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() );
+			assertNull( managedParent.$$_hibernate_getNextManagedEntity() );
+
+			s.remove( managedParent );
+		} );
+	}
+
+	// --- //
+
+	@Entity( name = "Parent" )
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		String name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/flush/CollectionFlushAfterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/flush/CollectionFlushAfterQueryTest.java
index bffeb7c81a62..414267a3171a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/flush/CollectionFlushAfterQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/flush/CollectionFlushAfterQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.flush;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java
index c15c7c6d5f68..f973716a0951 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.join;
 
@@ -39,211 +37,210 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey( "HHH-3949" )
 @DomainModel(
-        annotatedClasses = {
-             HHH3949Test.Person.class, HHH3949Test.Vehicle.class
-        }
+		annotatedClasses = {
+			HHH3949Test.Person.class, HHH3949Test.Vehicle.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-                // see HHH-3949 for further details ^^^^^
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+				// see HHH-3949 for further details ^^^^^
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class HHH3949Test {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-
-            // it is important that the data associations remain as follows:
-            //		* Johnny <-> Volkswagen Golf
-            //		* Ricky <-> Subaru Impreza
-            //		* Rosy -> none
-            //		* none <- Renault Truck
-            //
-            // see #shouldHaveVehicle and #shouldHaveDriver
-
-            Person person1 = new Person( "Johnny" );
-            Person person2 = new Person( "Ricky" );
-            Person person3 = new Person( "Rosy" );
-            s.persist( person1 );
-            s.persist( person2 );
-            s.persist( person3 );
-
-            Vehicle vehicle1 = new Vehicle( "Volkswagen Golf" );
-            vehicle1.setDriver( person1 );
-            s.persist( vehicle1 );
-
-            Vehicle vehicle2 = new Vehicle( "Subaru Impreza" );
-            vehicle2.setDriver( person2 );
-            person2.setVehicle( vehicle2 );
-            s.persist( vehicle2 );
-
-            Vehicle vehicle3 = new Vehicle( "Renault Truck" );
-            s.persist( vehicle3 );
-        } );
-    }
-
-    @Test
-    public void test1(SessionFactoryScope scope) {
-        performQueryAndVerifyPersonResults( scope, "from Person p left join fetch p.vehicle" );
-    }
-
-    @Test
-    public void test2(SessionFactoryScope scope) {
-        performQueryAndVerifyVehicleResults( scope, "from Vehicle v left join fetch v.driver" );
-    }
-
-    @Test
-    @SuppressWarnings( "unchecked" )
-    public void test3(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-            CriteriaQuery criteria = criteriaBuilder.createQuery( Person.class );
-            criteria.from( Person.class ).fetch( "vehicle", JoinType.LEFT );
-            List persons = s.createQuery( criteria ).list();
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+
+			// it is important that the data associations remain as follows:
+			//		* Johnny <-> Volkswagen Golf
+			//		* Ricky <-> Subaru Impreza
+			//		* Rosy -> none
+			//		* none <- Renault Truck
+			//
+			// see #shouldHaveVehicle and #shouldHaveDriver
+
+			Person person1 = new Person( "Johnny" );
+			Person person2 = new Person( "Ricky" );
+			Person person3 = new Person( "Rosy" );
+			s.persist( person1 );
+			s.persist( person2 );
+			s.persist( person3 );
+
+			Vehicle vehicle1 = new Vehicle( "Volkswagen Golf" );
+			vehicle1.setDriver( person1 );
+			s.persist( vehicle1 );
+
+			Vehicle vehicle2 = new Vehicle( "Subaru Impreza" );
+			vehicle2.setDriver( person2 );
+			person2.setVehicle( vehicle2 );
+			s.persist( vehicle2 );
+
+			Vehicle vehicle3 = new Vehicle( "Renault Truck" );
+			s.persist( vehicle3 );
+		} );
+	}
+
+	@Test
+	public void test1(SessionFactoryScope scope) {
+		performQueryAndVerifyPersonResults( scope, "from Person p left join fetch p.vehicle" );
+	}
+
+	@Test
+	public void test2(SessionFactoryScope scope) {
+		performQueryAndVerifyVehicleResults( scope, "from Vehicle v left join fetch v.driver" );
+	}
+
+	@Test
+	@SuppressWarnings( "unchecked" )
+	public void test3(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
+			CriteriaQuery criteria = criteriaBuilder.createQuery( Person.class );
+			criteria.from( Person.class ).fetch( "vehicle", JoinType.LEFT );
+			List persons = s.createQuery( criteria ).list();
 //            List persons = (List) s.createCriteria( Person.class ).setFetchMode( "vehicle", FetchMode.JOIN ).list();
-            for ( Person person : persons ) {
-                if ( shouldHaveVehicle( person ) ) {
-                    assertNotNull( person.getVehicle() );
-                    assertNotNull( person.getVehicle().getDriver() );
-                }
-            }
-        } );
-    }
-
-    @Test
-    @SuppressWarnings( "unchecked" )
-    public void test4(SessionFactoryScope scope) {
-        List vehicles;
-
-        try ( Session s = scope.getSessionFactory().openSession() ) {
-            CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-            CriteriaQuery criteria = criteriaBuilder.createQuery( Vehicle.class );
-            criteria.from( Vehicle.class ).fetch( "driver", JoinType.LEFT );
-            vehicles = s.createQuery( criteria ).list();
+			for ( Person person : persons ) {
+				if ( shouldHaveVehicle( person ) ) {
+					assertNotNull( person.getVehicle() );
+					assertNotNull( person.getVehicle().getDriver() );
+				}
+			}
+		} );
+	}
+
+	@Test
+	@SuppressWarnings( "unchecked" )
+	public void test4(SessionFactoryScope scope) {
+		List vehicles;
+
+		try ( Session s = scope.getSessionFactory().openSession() ) {
+			CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
+			CriteriaQuery criteria = criteriaBuilder.createQuery( Vehicle.class );
+			criteria.from( Vehicle.class ).fetch( "driver", JoinType.LEFT );
+			vehicles = s.createQuery( criteria ).list();
 //            vehicles = (List) s.createCriteria( Vehicle.class ).setFetchMode( "driver", FetchMode.JOIN ).list();
-        }
-
-        for ( Vehicle vehicle : vehicles ) {
-            if ( shouldHaveDriver( vehicle ) ) {
-                assertNotNull( vehicle.getDriver() );
-                assertNotNull( vehicle.getDriver().getVehicle() );
-            }
-        }
-    }
-
-    // --- //
-
-    @SuppressWarnings( "unchecked" )
-    private void performQueryAndVerifyPersonResults(SessionFactoryScope scope, String query) {
-        List persons;
-        try ( Session s = scope.getSessionFactory().openSession() ) {
-            persons = (List) s.createQuery( query ).list();
-        }
-        for ( Person person : persons ) {
-            assertTrue( isInitialized( person ) );
-            if ( shouldHaveVehicle( person ) ) {
-                // We used a "join fetch", so the vehicle must be initialized
-                // before we even call the getter
-                // (which could trigger lazy initialization if the join fetch didn't work).
-                assertTrue( isPropertyInitialized( person, "vehicle" ) );
-
-                assertNotNull( person.getVehicle() );
-                assertTrue( isInitialized( person.getVehicle() ) );
-                assertNotNull( person.getVehicle().getDriver() );
-            }
-        }
-    }
-
-    @SuppressWarnings( "unchecked" )
-    private void performQueryAndVerifyVehicleResults(SessionFactoryScope scope, String query) {
-        List vehicles;
-        try ( Session s = scope.getSessionFactory().openSession() ) {
-            vehicles = (List) s.createQuery( query ).list();
-        }
-        for ( Vehicle vehicle : vehicles ) {
-            if ( shouldHaveDriver( vehicle ) ) {
-                // We used a "join fetch", so the drover must be initialized
-                // before we even call the getter
-                // (which could trigger lazy initialization if the join fetch didn't work).
-                assertTrue( isPropertyInitialized( vehicle, "driver" ) );
-
-                assertNotNull( vehicle.getDriver() );
-                assertNotNull( vehicle.getDriver().getVehicle() );
-            }
-        }
-    }
-
-    private boolean shouldHaveVehicle(Person person) {
-        return "Johnny".equals( person.name ) || "Ricky".equals( person.name );
-    }
-
-    private boolean shouldHaveDriver(Vehicle vehicle) {
-        return "Volkswagen Golf".equals( vehicle.name ) || "Subaru Impreza".equals( vehicle.name );
-    }
-
-    // --- //
-
-    @Entity( name = "Person" )
-    @Table( name = "PERSON" )
-    static class Person {
-
-        @Id
-        @GeneratedValue
-        Long id;
-
-        String name;
-
-        @OneToOne( optional = true, mappedBy = "driver", fetch = FetchType.LAZY )
-        Vehicle vehicle;
-
-        Person() {
-        }
-
-        Person(String name) {
-            this.name = name;
-        }
-
-        Vehicle getVehicle() {
-            return vehicle;
-        }
-
-        void setVehicle(Vehicle vehicle) {
-            this.vehicle = vehicle;
-        }
-    }
-
-    @Entity( name = "Vehicle" )
-    @Table( name = "VEHICLE" )
-    static class Vehicle {
-
-        @Id
-        @GeneratedValue
-        Long id;
-
-        String name;
-
-        @OneToOne( optional = true, fetch = FetchType.LAZY )
-        Person driver;
-
-        Vehicle() {
-        }
-
-        Vehicle(String name) {
-            this.name = name;
-        }
-
-        Person getDriver() {
-            return driver;
-        }
-
-        void setDriver(Person driver) {
-            this.driver = driver;
-        }
-    }
+		}
+
+		for ( Vehicle vehicle : vehicles ) {
+			if ( shouldHaveDriver( vehicle ) ) {
+				assertNotNull( vehicle.getDriver() );
+				assertNotNull( vehicle.getDriver().getVehicle() );
+			}
+		}
+	}
+
+	// --- //
+
+	@SuppressWarnings( "unchecked" )
+	private void performQueryAndVerifyPersonResults(SessionFactoryScope scope, String query) {
+		List persons;
+		try ( Session s = scope.getSessionFactory().openSession() ) {
+			persons = (List) s.createQuery( query ).list();
+		}
+		for ( Person person : persons ) {
+			assertTrue( isInitialized( person ) );
+			if ( shouldHaveVehicle( person ) ) {
+				// We used a "join fetch", so the vehicle must be initialized
+				// before we even call the getter
+				// (which could trigger lazy initialization if the join fetch didn't work).
+				assertTrue( isPropertyInitialized( person, "vehicle" ) );
+
+				assertNotNull( person.getVehicle() );
+				assertTrue( isInitialized( person.getVehicle() ) );
+				assertNotNull( person.getVehicle().getDriver() );
+			}
+		}
+	}
+
+	@SuppressWarnings( "unchecked" )
+	private void performQueryAndVerifyVehicleResults(SessionFactoryScope scope, String query) {
+		List vehicles;
+		try ( Session s = scope.getSessionFactory().openSession() ) {
+			vehicles = (List) s.createQuery( query ).list();
+		}
+		for ( Vehicle vehicle : vehicles ) {
+			if ( shouldHaveDriver( vehicle ) ) {
+				// We used a "join fetch", so the drover must be initialized
+				// before we even call the getter
+				// (which could trigger lazy initialization if the join fetch didn't work).
+				assertTrue( isPropertyInitialized( vehicle, "driver" ) );
+
+				assertNotNull( vehicle.getDriver() );
+				assertNotNull( vehicle.getDriver().getVehicle() );
+			}
+		}
+	}
+
+	private boolean shouldHaveVehicle(Person person) {
+		return "Johnny".equals( person.name ) || "Ricky".equals( person.name );
+	}
+
+	private boolean shouldHaveDriver(Vehicle vehicle) {
+		return "Volkswagen Golf".equals( vehicle.name ) || "Subaru Impreza".equals( vehicle.name );
+	}
+
+	// --- //
+
+	@Entity( name = "Person" )
+	@Table( name = "PERSON" )
+	static class Person {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String name;
+
+		@OneToOne( optional = true, mappedBy = "driver", fetch = FetchType.LAZY )
+		Vehicle vehicle;
+
+		Person() {
+		}
+
+		Person(String name) {
+			this.name = name;
+		}
+
+		Vehicle getVehicle() {
+			return vehicle;
+		}
+
+		void setVehicle(Vehicle vehicle) {
+			this.vehicle = vehicle;
+		}
+	}
+
+	@Entity( name = "Vehicle" )
+	@Table( name = "VEHICLE" )
+	static class Vehicle {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String name;
+
+		@OneToOne( optional = true, fetch = FetchType.LAZY )
+		Person driver;
+
+		Vehicle() {
+		}
+
+		Vehicle(String name) {
+			this.name = name;
+		}
+
+		Person getDriver() {
+			return driver;
+		}
+
+		void setDriver(Person driver) {
+			this.driver = driver;
+		}
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java
index 7d21a58daa05..5305c7d32019 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationAndDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationAndDynamicUpdateTest.java
index de3451ef0c17..bb87234f053d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationAndDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationAndDynamicUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationTest.java
index 7c56dcef3fb3..712a33952618 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ConstructorInitializationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java
index ffebe26cdc4c..69a8d216a5dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708;
 
@@ -30,66 +28,66 @@
 
 @JiraKey( "HHH-10708" )
 @DomainModel(
-        annotatedClasses = {
-               UnexpectedDeleteTest1.Foo.class, UnexpectedDeleteTest1.Bar.class
-        }
+		annotatedClasses = {
+			UnexpectedDeleteTest1.Foo.class, UnexpectedDeleteTest1.Bar.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class UnexpectedDeleteTest1 {
 
-    private long fooId;
+	private long fooId;
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Bar bar1 = new Bar();
-            Bar bar2 = new Bar();
-            Foo foo = new Foo();
-            s.persist( bar1 );
-            s.persist( bar2 );
-            s.persist( foo );
-            bar1.foo = foo;
-            bar2.foo = foo;
-            fooId = foo.id;
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Bar bar1 = new Bar();
+			Bar bar2 = new Bar();
+			Foo foo = new Foo();
+			s.persist( bar1 );
+			s.persist( bar2 );
+			s.persist( foo );
+			bar1.foo = foo;
+			bar2.foo = foo;
+			fooId = foo.id;
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Foo foo = s.get( Foo.class, fooId );
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Foo foo = s.get( Foo.class, fooId );
 
-            // accessing the collection results in an exception
-            foo.bars.size();
-        } );
-    }
+			// accessing the collection results in an exception
+			foo.bars.size();
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity(name = "Bar")
-    @Table( name = "BAR" )
-    static class Bar {
+	@Entity(name = "Bar")
+	@Table( name = "BAR" )
+	static class Bar {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @ManyToOne
-        @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
-        Foo foo;
-    }
+		@ManyToOne
+		@Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
+		Foo foo;
+	}
 
-    @Entity(name = "Foo")
-    @Table( name = "FOO" )
-    static class Foo {
+	@Entity(name = "Foo")
+	@Table( name = "FOO" )
+	static class Foo {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @OneToMany( orphanRemoval = true, mappedBy = "foo", targetEntity = Bar.class )
-        @Cascade( CascadeType.ALL )
-        Set bars = new HashSet<>();
-    }
+		@OneToMany( orphanRemoval = true, mappedBy = "foo", targetEntity = Bar.class )
+		@Cascade( CascadeType.ALL )
+		Set bars = new HashSet<>();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java
index 22c79b922db5..2bfcff5dcd67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708;
 
@@ -30,69 +28,69 @@
 
 @JiraKey( "HHH-10708" )
 @DomainModel(
-        annotatedClasses = {
-               UnexpectedDeleteTest2.Foo.class, UnexpectedDeleteTest2.Bar.class
-        }
+		annotatedClasses = {
+			UnexpectedDeleteTest2.Foo.class, UnexpectedDeleteTest2.Bar.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.ALLOW_REFRESH_DETACHED_ENTITY, value = "true"))
 public class UnexpectedDeleteTest2 {
 
-    private Bar myBar;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Bar bar = new Bar();
-            Foo foo1 = new Foo();
-            Foo foo2 = new Foo();
-            s.persist( bar );
-            s.persist( foo1 );
-            s.persist( foo2 );
-
-            bar.foos.add( foo1 );
-            bar.foos.add( foo2 );
-
-            myBar = bar;
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.refresh( myBar );
-            assertFalse( myBar.foos.isEmpty() );
-
-            // The issue is that currently, for some unknown reason, foos are deleted on flush
-        } );
-
-        scope.inTransaction( s -> {
-            Bar bar = s.get( Bar.class, myBar.id );
-            assertFalse( bar.foos.isEmpty() );
-        } );
-    }
-
-    // --- //
-
-    @Entity(name = "Bar")
-    @Table( name = "BAR" )
-    static class Bar {
-
-        @Id
-        @GeneratedValue
-        Long id;
-
-        @ManyToMany( fetch = FetchType.LAZY, targetEntity = Foo.class )
-        Set foos = new HashSet<>();
-    }
-
-    @Entity(name = "Foo")
-    @Table( name = "FOO" )
-    static class Foo {
-
-        @Id
-        @GeneratedValue
-        Long id;
-    }
+	private Bar myBar;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Bar bar = new Bar();
+			Foo foo1 = new Foo();
+			Foo foo2 = new Foo();
+			s.persist( bar );
+			s.persist( foo1 );
+			s.persist( foo2 );
+
+			bar.foos.add( foo1 );
+			bar.foos.add( foo2 );
+
+			myBar = bar;
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.refresh( myBar );
+			assertFalse( myBar.foos.isEmpty() );
+
+			// The issue is that currently, for some unknown reason, foos are deleted on flush
+		} );
+
+		scope.inTransaction( s -> {
+			Bar bar = s.get( Bar.class, myBar.id );
+			assertFalse( bar.foos.isEmpty() );
+		} );
+	}
+
+	// --- //
+
+	@Entity(name = "Bar")
+	@Table( name = "BAR" )
+	static class Bar {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@ManyToMany( fetch = FetchType.LAZY, targetEntity = Foo.class )
+		Set foos = new HashSet<>();
+	}
+
+	@Entity(name = "Foo")
+	@Table( name = "FOO" )
+	static class Foo {
+
+		@Id
+		@GeneratedValue
+		Long id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
index bcee75a8c37e..96cf7102fea2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708;
 
@@ -29,107 +27,107 @@
 
 @JiraKey("HHH-10708")
 @DomainModel(
-        annotatedClasses = {
-                UnexpectedDeleteTest3.Parent.class, UnexpectedDeleteTest3.Child.class
-        }
+		annotatedClasses = {
+				UnexpectedDeleteTest3.Parent.class, UnexpectedDeleteTest3.Child.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class UnexpectedDeleteTest3 {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Child child = new Child();
-            child.setId( 2L );
-            s.persist( child );
-
-            Parent parent = new Parent();
-            parent.setId( 1L );
-            parent.setNames( Collections.singleton( "name" ) );
-            parent.addChild( child );
-
-            s.persist( parent );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent parent = s.get( Parent.class, 1L );
-           
-            Child child = new Child();
-            child.setId( 1L );
-            s.persist( child );
-            parent.addChild( child );
-
-            // We need to leave at least one attribute unfetchd
-            //parent.getNames().size();
-            s.persist( parent );
-        } );
-
-        scope.inTransaction( s -> {
-            Parent application = s.get( Parent.class, 1L );
-            assertEquals( 2, application.getChildren().size(), "Loaded Children collection has unexpected size" );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        Long id;
-
-        @Id
-        @Column( name = "id", unique = true, nullable = false )
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-    }
-
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        Long id;
-        Set names;
-        Set children;
-
-        @Id
-        @Column( name = "id", unique = true, nullable = false )
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        @ElementCollection
-        Set getNames() {
-            return Collections.unmodifiableSet( names );
-        }
-
-        void setNames(Set secrets) {
-            this.names = secrets;
-        }
-
-        @ManyToMany( fetch = FetchType.LAZY, targetEntity = Child.class )
-        Set getChildren() {
-            return Collections.unmodifiableSet( children );
-        }
-
-        void addChild(Child child) {
-            if (children == null) {
-                children = new HashSet<>();
-            }
-            children.add( child );
-        }
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Child child = new Child();
+			child.setId( 2L );
+			s.persist( child );
+
+			Parent parent = new Parent();
+			parent.setId( 1L );
+			parent.setNames( Collections.singleton( "name" ) );
+			parent.addChild( child );
+
+			s.persist( parent );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent parent = s.get( Parent.class, 1L );
+
+			Child child = new Child();
+			child.setId( 1L );
+			s.persist( child );
+			parent.addChild( child );
+
+			// We need to leave at least one attribute unfetchd
+			//parent.getNames().size();
+			s.persist( parent );
+		} );
+
+		scope.inTransaction( s -> {
+			Parent application = s.get( Parent.class, 1L );
+			assertEquals( 2, application.getChildren().size(), "Loaded Children collection has unexpected size" );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		Long id;
+
+		@Id
+		@Column( name = "id", unique = true, nullable = false )
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+	}
+
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		Long id;
+		Set names;
+		Set children;
+
+		@Id
+		@Column( name = "id", unique = true, nullable = false )
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		@ElementCollection
+		Set getNames() {
+			return Collections.unmodifiableSet( names );
+		}
+
+		void setNames(Set secrets) {
+			this.names = secrets;
+		}
+
+		@ManyToMany( fetch = FetchType.LAZY, targetEntity = Child.class )
+		Set getChildren() {
+			return Collections.unmodifiableSet( children );
+		}
+
+		void addChild(Child child) {
+			if (children == null) {
+				children = new HashSet<>();
+			}
+			children.add( child );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java
index 1b7e99626329..e607d294f98b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationAndDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationAndDynamicUpdateTest.java
index ccc3bd180e5d..66e028464a9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationAndDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationAndDynamicUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import java.util.List;
@@ -41,157 +45,157 @@ public class JpaConstructorInitializationAndDynamicUpdateTest {
 	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 Person person = new Person( 1l, "Henry" );
-					 LoginAccount loginAccount = new LoginAccount();
-					 loginAccount.setOwner( person );
-					 person.setLoginAccount( loginAccount );
-					 em.persist( person );
-				 }
+					Person person = new Person( 1l, "Henry" );
+					LoginAccount loginAccount = new LoginAccount();
+					loginAccount.setOwner( person );
+					person.setLoginAccount( loginAccount );
+					em.persist( person );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.createQuery( "delete from Person" ).executeUpdate();
-					 em.createQuery( "delete from LoginAccount" ).executeUpdate();
-					 em.createQuery( "delete from AccountPreferences" ).executeUpdate();
-				 }
+					em.createQuery( "delete from Person" ).executeUpdate();
+					em.createQuery( "delete from LoginAccount" ).executeUpdate();
+					em.createQuery( "delete from AccountPreferences" ).executeUpdate();
+				}
 		);
 	}
 
 	@Test
 	public void findTest(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.find( Person.class, 1L );
-					 person.setFirstName( "Liza" );
-				 }
+					em.clear();
+					Person person = em.find( Person.class, 1L );
+					person.setFirstName( "Liza" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void getReferenceTest(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.getReference( Person.class, 1L );
-					 person.setFirstName( "Liza" );
-				 }
+					em.clear();
+					Person person = em.getReference( Person.class, 1L );
+					person.setFirstName( "Liza" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void findTest2(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.find( Person.class, 1L );
-					 person.setFirstName( "Liza" );
+					em.clear();
+					Person person = em.find( Person.class, 1L );
+					person.setFirstName( "Liza" );
 
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 loginAccount.setName( "abc" );
-				 }
+					LoginAccount loginAccount = person.getLoginAccount();
+					loginAccount.setName( "abc" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 Person person = em.find( Person.class, 1L );
-					 assertThat( person.getFirstName() ).isEqualTo( "Liza" );
-
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 assertThat( loginAccount ).isNotNull();
-					 assertThat( loginAccount.getName() ).isEqualTo( "abc" );
-
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					Person person = em.find( Person.class, 1L );
+					assertThat( person.getFirstName() ).isEqualTo( "Liza" );
+
+					LoginAccount loginAccount = person.getLoginAccount();
+					assertThat( loginAccount ).isNotNull();
+					assertThat( loginAccount.getName() ).isEqualTo( "abc" );
+
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void getReferenceTest2(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.getReference( Person.class, 1L );
-					 person.setFirstName( "Liza" );
+					em.clear();
+					Person person = em.getReference( Person.class, 1L );
+					person.setFirstName( "Liza" );
 
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 loginAccount.setName( "abc" );
-				 }
+					LoginAccount loginAccount = person.getLoginAccount();
+					loginAccount.setName( "abc" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 Person person = em.find( Person.class, 1L );
-					 assertThat( person.getFirstName() ).isEqualTo( "Liza" );
-
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 assertThat( loginAccount ).isNotNull();
-					 assertThat( loginAccount.getName() ).isEqualTo( "abc" );
-
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					Person person = em.find( Person.class, 1L );
+					assertThat( person.getFirstName() ).isEqualTo( "Liza" );
+
+					LoginAccount loginAccount = person.getLoginAccount();
+					assertThat( loginAccount ).isNotNull();
+					assertThat( loginAccount.getName() ).isEqualTo( "abc" );
+
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationTest.java
index b3b0187a971b..323d73006791 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/JpaConstructorInitializationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import java.util.List;
@@ -40,157 +44,157 @@ public class JpaConstructorInitializationTest {
 	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 Person person = new Person( 1l, "Henry" );
-					 LoginAccount loginAccount = new LoginAccount();
-					 loginAccount.setOwner( person );
-					 person.setLoginAccount( loginAccount );
-					 em.persist( person );
-				 }
+					Person person = new Person( 1l, "Henry" );
+					LoginAccount loginAccount = new LoginAccount();
+					loginAccount.setOwner( person );
+					person.setLoginAccount( loginAccount );
+					em.persist( person );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.createQuery( "delete from Person" ).executeUpdate();
-					 em.createQuery( "delete from LoginAccount" ).executeUpdate();
-					 em.createQuery( "delete from AccountPreferences" ).executeUpdate();
-				 }
+					em.createQuery( "delete from Person" ).executeUpdate();
+					em.createQuery( "delete from LoginAccount" ).executeUpdate();
+					em.createQuery( "delete from AccountPreferences" ).executeUpdate();
+				}
 		);
 	}
 
 	@Test
 	public void findTest(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.find( Person.class, 1L );
-					 person.setFirstName( "Liza" );
-				 }
+					em.clear();
+					Person person = em.find( Person.class, 1L );
+					person.setFirstName( "Liza" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void getReferenceTest(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.getReference( Person.class, 1L );
-					 person.setFirstName( "Liza" );
-				 }
+					em.clear();
+					Person person = em.getReference( Person.class, 1L );
+					person.setFirstName( "Liza" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void findTest2(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.find( Person.class, 1L );
-					 person.setFirstName( "Liza" );
+					em.clear();
+					Person person = em.find( Person.class, 1L );
+					person.setFirstName( "Liza" );
 
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 loginAccount.setName( "abc" );
-				 }
+					LoginAccount loginAccount = person.getLoginAccount();
+					loginAccount.setName( "abc" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 Person person = em.find( Person.class, 1L );
-					 assertThat( person.getFirstName() ).isEqualTo( "Liza" );
-
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 assertThat( loginAccount ).isNotNull();
-					 assertThat( loginAccount.getName() ).isEqualTo( "abc" );
-
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					Person person = em.find( Person.class, 1L );
+					assertThat( person.getFirstName() ).isEqualTo( "Liza" );
+
+					LoginAccount loginAccount = person.getLoginAccount();
+					assertThat( loginAccount ).isNotNull();
+					assertThat( loginAccount.getName() ).isEqualTo( "abc" );
+
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
 	@Test
 	public void getReferenceTest2(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-					 em.clear();
-					 Person person = em.getReference( Person.class, 1L );
-					 person.setFirstName( "Liza" );
+					em.clear();
+					Person person = em.getReference( Person.class, 1L );
+					person.setFirstName( "Liza" );
 
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 loginAccount.setName( "abc" );
-				 }
+					LoginAccount loginAccount = person.getLoginAccount();
+					loginAccount.setName( "abc" );
+				}
 		);
 
 		scope.inTransaction( em -> {
-					 Person person = em.find( Person.class, 1L );
-					 assertThat( person.getFirstName() ).isEqualTo( "Liza" );
-
-					 LoginAccount loginAccount = person.getLoginAccount();
-					 assertThat( loginAccount ).isNotNull();
-					 assertThat( loginAccount.getName() ).isEqualTo( "abc" );
-
-					 List accounts = em.createQuery(
-							 "select la from LoginAccount la",
-							 LoginAccount.class
-					 ).getResultList();
-					 assertThat( accounts.size() ).isEqualTo( 1 );
-
-					 List preferences = em.createQuery(
-							 "select ap from AccountPreferences ap",
-							 AccountPreferences.class
-					 ).getResultList();
-					 assertThat( preferences.size() ).isEqualTo( 1 );
-				 }
+					Person person = em.find( Person.class, 1L );
+					assertThat( person.getFirstName() ).isEqualTo( "Liza" );
+
+					LoginAccount loginAccount = person.getLoginAccount();
+					assertThat( loginAccount ).isNotNull();
+					assertThat( loginAccount.getName() ).isEqualTo( "abc" );
+
+					List accounts = em.createQuery(
+							"select la from LoginAccount la",
+							LoginAccount.class
+					).getResultList();
+					assertThat( accounts.size() ).isEqualTo( 1 );
+
+					List preferences = em.createQuery(
+							"select ap from AccountPreferences ap",
+							AccountPreferences.class
+					).getResultList();
+					assertThat( preferences.size() ).isEqualTo( 1 );
+				}
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyAbstractManyToOneNoProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyAbstractManyToOneNoProxyTest.java
index 6a29dce84eb8..dcd322db0f1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyAbstractManyToOneNoProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyAbstractManyToOneNoProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import org.hibernate.annotations.ConcreteProxy;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java
index 524a91da7a4d..97572a4517aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -33,125 +31,125 @@
  */
 @JiraKey("HHH-11117")
 @DomainModel(
-        annotatedClasses = {
-                LazyBasicFieldMergeTest.Company.class,
-                LazyBasicFieldMergeTest.Manager.class,
-        }
+		annotatedClasses = {
+				LazyBasicFieldMergeTest.Company.class,
+				LazyBasicFieldMergeTest.Manager.class,
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyBasicFieldMergeTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            Manager manager = new Manager();
-            manager.setName("John Doe");
-            manager.setResume(new byte[] {1, 2, 3});
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Manager manager = new Manager();
+			manager.setName("John Doe");
+			manager.setResume(new byte[] {1, 2, 3});
 
-            Company company = new Company();
-            company.setName("Company");
-            company.setManager(manager);
+			Company company = new Company();
+			company.setName("Company");
+			company.setManager(manager);
 
-            Company _company = (Company) session.merge( company);
-            assertEquals( company.getName(), _company.getName() );
-            assertArrayEquals( company.getManager().getResume(), _company.getManager().getResume() );
-        } );
-    }
+			Company _company = (Company) session.merge( company);
+			assertEquals( company.getName(), _company.getName() );
+			assertArrayEquals( company.getManager().getResume(), _company.getManager().getResume() );
+		} );
+	}
 
-    @Entity(name = "Company")
-    @Table(name = "COMPANY")
-    public static class Company {
+	@Entity(name = "Company")
+	@Table(name = "COMPANY")
+	public static class Company {
 
-        @Id
-        @GeneratedValue
-        @Column(name = "COMP_ID")
-        private Long id;
+		@Id
+		@GeneratedValue
+		@Column(name = "COMP_ID")
+		private Long id;
 
-        @Column(name = "NAME")
-        private String name;
+		@Column(name = "NAME")
+		private String name;
 
-        @OneToOne(mappedBy = "company", cascade = jakarta.persistence.CascadeType.ALL, orphanRemoval = true)
-        private Manager manager;
+		@OneToOne(mappedBy = "company", cascade = jakarta.persistence.CascadeType.ALL, orphanRemoval = true)
+		private Manager manager;
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public Manager getManager() {
-            return manager;
-        }
+		public Manager getManager() {
+			return manager;
+		}
 
-        public void setManager(Manager manager) {
-            this.manager = manager;
-        }
+		public void setManager(Manager manager) {
+			this.manager = manager;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-    }
+	}
 
 
-    @Entity(name = "Manager")
-    @Table(name = "MANAGER")
-    public static class Manager {
+	@Entity(name = "Manager")
+	@Table(name = "MANAGER")
+	public static class Manager {
 
-        @Id
-        @GeneratedValue
-        @Column(name = "MAN_ID")
-        private Long id;
+		@Id
+		@GeneratedValue
+		@Column(name = "MAN_ID")
+		private Long id;
 
-        @Column(name = "NAME")
-        private String name;
+		@Column(name = "NAME")
+		private String name;
 
-        @Lob
-        @Column(name = "RESUME")
-        @Basic(fetch = FetchType.LAZY)
-        private byte[] resume;
+		@Lob
+		@Column(name = "RESUME")
+		@Basic(fetch = FetchType.LAZY)
+		private byte[] resume;
 
-        @OneToOne(fetch = FetchType.LAZY)
-        @JoinColumn(name = "COMP_ID")
-        private Company company;
+		@OneToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name = "COMP_ID")
+		private Company company;
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public byte[] getResume() {
-            return resume;
-        }
+		public byte[] getResume() {
+			return resume;
+		}
 
-        public void setResume(byte[] resume) {
-            this.resume = resume;
-        }
+		public void setResume(byte[] resume) {
+			this.resume = resume;
+		}
 
-        public Company getCompany() {
-            return company;
-        }
+		public Company getCompany() {
+			return company;
+		}
 
-        public void setCompany(Company company) {
-            this.company = company;
-        }
-    }
+		public void setCompany(Company company) {
+			this.company = company;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java
index 64947b42eda0..43a440889a93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -40,65 +38,65 @@
  */
 @JiraKey("HHH-9937")
 @DomainModel(
-        annotatedClasses = {
-               LazyBasicFieldNotInitializedTest.TestEntity.class
-        }
+		annotatedClasses = {
+			LazyBasicFieldNotInitializedTest.TestEntity.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyBasicFieldNotInitializedTest {
 
-    private Long entityId;
-
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity entity = new TestEntity();
-            entity.description = "desc";
-            s.persist( entity );
-            entityId = entity.id;
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity entity = s.get( TestEntity.class, entityId );
-            assertFalse( Hibernate.isPropertyInitialized( entity, "description" ) );
-
-            EntityPersister entityPersister = scope.getSessionFactory().getRuntimeMetamodels()
-                    .getMappingMetamodel()
-                    .getEntityDescriptor( TestEntity.class );
-
-            boolean[] propertyLaziness = entityPersister.getPropertyLaziness();
-            assertEquals( 1, propertyLaziness.length );
-            Assertions.assertTrue( propertyLaziness[0] );
-
-            // Make sure NonIdentifierAttribute#isLazy is consistent (HHH-10551)
-            final AttributeMapping theBytesAttr = entityPersister.findAttributeMapping( "description" );
-            assertThat( theBytesAttr ).isInstanceOf( BasicValuedModelPart.class );
-            assertThat( theBytesAttr.getMappedFetchOptions().getTiming() ).isEqualTo( FetchTiming.DELAYED );
-        } );
-    }
-
-    // --- //
-    
-    @Entity(name = "TestEntity")
-    @Table( name = "TEST_ENTITY" )
-    static class TestEntity {
-
-        @Id
-        @GeneratedValue
-        Long id;
-
-        @Basic( fetch = FetchType.LAZY )
-        String description;
-    }
+	private Long entityId;
+
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity entity = new TestEntity();
+			entity.description = "desc";
+			s.persist( entity );
+			entityId = entity.id;
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity entity = s.get( TestEntity.class, entityId );
+			assertFalse( Hibernate.isPropertyInitialized( entity, "description" ) );
+
+			EntityPersister entityPersister = scope.getSessionFactory().getRuntimeMetamodels()
+					.getMappingMetamodel()
+					.getEntityDescriptor( TestEntity.class );
+
+			boolean[] propertyLaziness = entityPersister.getPropertyLaziness();
+			assertEquals( 1, propertyLaziness.length );
+			Assertions.assertTrue( propertyLaziness[0] );
+
+			// Make sure NonIdentifierAttribute#isLazy is consistent (HHH-10551)
+			final AttributeMapping theBytesAttr = entityPersister.findAttributeMapping( "description" );
+			assertThat( theBytesAttr ).isInstanceOf( BasicValuedModelPart.class );
+			assertThat( theBytesAttr.getMappedFetchOptions().getTiming() ).isEqualTo( FetchTiming.DELAYED );
+		} );
+	}
+
+	// --- //
+
+	@Entity(name = "TestEntity")
+	@Table( name = "TEST_ENTITY" )
+	static class TestEntity {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@Basic( fetch = FetchType.LAZY )
+		String description;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java
index 5df558d21f55..7ca6d428016b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -38,112 +36,112 @@
  */
 @JiraKey("HHH-11576")
 @DomainModel(
-        annotatedClasses = {
-                LazyCollectionDeletedTest.Post.class,
-                LazyCollectionDeletedTest.Tag.class,
-                LazyCollectionDeletedTest.AdditionalDetails.class
-        }
+		annotatedClasses = {
+				LazyCollectionDeletedTest.Post.class,
+				LazyCollectionDeletedTest.Tag.class,
+				LazyCollectionDeletedTest.AdditionalDetails.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyCollectionDeletedTest {
 
-    private Long postId;
+	private Long postId;
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Post post = new Post();
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Post post = new Post();
 
-            Tag tag1 = new Tag( "tag1" );
-            Tag tag2 = new Tag( "tag2" );
+			Tag tag1 = new Tag( "tag1" );
+			Tag tag2 = new Tag( "tag2" );
 
-            Set tagSet = new HashSet<>();
-            tagSet.add( tag1 );
-            tagSet.add( tag2 );
-            post.tags = tagSet;
+			Set tagSet = new HashSet<>();
+			tagSet.add( tag1 );
+			tagSet.add( tag2 );
+			post.tags = tagSet;
 
-            AdditionalDetails details = new AdditionalDetails();
-            details.post = post;
-            details.details = "Some data";
-            post.additionalDetails = details;
-            s.persist( post );
-            postId = post.id;
-        } );
-    }
+			AdditionalDetails details = new AdditionalDetails();
+			details.post = post;
+			details.details = "Some data";
+			post.additionalDetails = details;
+			s.persist( post );
+			postId = post.id;
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Query query = s.createQuery( "from AdditionalDetails where id=" + postId );
-            AdditionalDetails additionalDetails = (AdditionalDetails) query.getSingleResult();
-            additionalDetails.details = "New data";
-            s.persist( additionalDetails );
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Query query = s.createQuery( "from AdditionalDetails where id=" + postId );
+			AdditionalDetails additionalDetails = (AdditionalDetails) query.getSingleResult();
+			additionalDetails.details = "New data";
+			s.persist( additionalDetails );
 
-            // additionalDetails.post.tags get deleted on commit
-        } );
+			// additionalDetails.post.tags get deleted on commit
+		} );
 
-        scope.inTransaction( s -> {
-            Query query = s.createQuery( "from Post where id=" + postId );
-            Post retrievedPost = (Post) query.getSingleResult();
+		scope.inTransaction( s -> {
+			Query query = s.createQuery( "from Post where id=" + postId );
+			Post retrievedPost = (Post) query.getSingleResult();
 
-            assertFalse( retrievedPost.tags.isEmpty(), "No tags found" );
-            retrievedPost.tags.forEach( tag -> System.out.println( "Found tag: " + tag ) );
-        } );
-    }
+			assertFalse( retrievedPost.tags.isEmpty(), "No tags found" );
+			retrievedPost.tags.forEach( tag -> System.out.println( "Found tag: " + tag ) );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity( name = "Tag" )
-    @Table( name = "TAG" )
-    static class Tag {
+	@Entity( name = "Tag" )
+	@Table( name = "TAG" )
+	static class Tag {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        String name;
+		String name;
 
-        Tag() {
-        }
+		Tag() {
+		}
 
-        Tag(String name) {
-            this.name = name;
-        }
-    }
+		Tag(String name) {
+			this.name = name;
+		}
+	}
 
-    @Entity( name = "Post" )
-    @Table( name = "POST" )
-    static class Post {
+	@Entity( name = "Post" )
+	@Table( name = "POST" )
+	static class Post {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @ManyToMany( cascade = CascadeType.ALL )
-        Set tags;
+		@ManyToMany( cascade = CascadeType.ALL )
+		Set tags;
 
-        @OneToOne( fetch = FetchType.LAZY, mappedBy = "post", cascade = CascadeType.ALL )
-        AdditionalDetails additionalDetails;
-    }
+		@OneToOne( fetch = FetchType.LAZY, mappedBy = "post", cascade = CascadeType.ALL )
+		AdditionalDetails additionalDetails;
+	}
 
-    @Entity( name = "AdditionalDetails" )
-    @Table( name = "ADDITIONAL_DETAILS" )
-    static class AdditionalDetails {
+	@Entity( name = "AdditionalDetails" )
+	@Table( name = "ADDITIONAL_DETAILS" )
+	static class AdditionalDetails {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String details;
+		String details;
 
-        @OneToOne( optional = false )
-        @MapsId
-        Post post;
-    }
+		@OneToOne( optional = false )
+		@MapsId
+		Post post;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java
index 9733d3bc86fa..2bbdfadaa15e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -34,7 +32,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachWithCollectionInDefaultFetchGroupFalseTest.java
index 87a036197fc3..a5fc4bcadafb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachWithCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachWithCollectionInDefaultFetchGroupFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java
index f9bdc39ed7b2..8b10cd633ba1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java
index 38f48a270956..0615c88a872f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -56,146 +54,146 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey( "HHH-10055" )
 @DomainModel(
-        annotatedClasses = {
-                LazyCollectionLoadingTest.Parent.class, LazyCollectionLoadingTest.Child.class
-        }
+		annotatedClasses = {
+				LazyCollectionLoadingTest.Parent.class, LazyCollectionLoadingTest.Child.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyCollectionLoadingTest {
-    private static final int CHILDREN_SIZE = 10;
-    private Long parentID;
-    private Parent parent;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent parent = new Parent();
-            parent.setChildren( new ArrayList<>() );
-            for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
-                Child child = new Child();
-                child.parent = parent;
-                s.persist( child );
-            }
-            s.persist( parent );
-            parentID = parent.id;
-        } );
-    }
-
-    @Test
-    public void testTransaction(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent parent = s.getReference( Parent.class, parentID );
-            assertThat( parent, notNullValue() );
-            assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
-            assertFalse( isPropertyInitialized( parent, "children" ) );
-            checkDirtyTracking( parent );
-
-            List children1 = parent.children;
-            List children2 = parent.children;
-
-            assertTrue( isPropertyInitialized( parent, "children" ) );
-            checkDirtyTracking( parent );
-
-            assertThat( children1, sameInstance( children2 ) );
-
-            assertFalse( isInitialized( children1 ) );
-            assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
-            assertTrue( isInitialized( children1 ) );
-        } );
-    }
-
-    @Test
-    @JiraKey( "HHH-14620" )
-    public void testTransaction_noProxy(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            // find will not return a proxy, which is exactly what we want here.
-            Parent parent = s.find( Parent.class, parentID );
-            assertThat( parent, notNullValue() );
-            assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
-            checkDirtyTracking( parent );
-
-            List children1 = parent.children;
-            List children2 = parent.children;
-
-            checkDirtyTracking( parent );
-
-            assertThat( children1, sameInstance( children2 ) );
-
-            // This check is important: a bug used to cause the collection to be initialized
-            // during the call to parent.children above.
-            // Note the same problem would occur if we were using getters:
-            // we only need extended enhancement to be enabled.
-            assertFalse( isInitialized( children1 ) );
-            assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
-            assertTrue( isInitialized( children1 ) );
-        } );
-    }
-
-    @Test
-    public void testNoTransaction(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            parent = s.getReference( Parent.class, parentID );
-            assertThat( parent, notNullValue() );
-            assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
-            assertFalse( isPropertyInitialized( parent, "children" ) );
-        } );
-
-        List children1 = parent.children;
-        List children2 = parent.children;
-
-        assertTrue( isPropertyInitialized( parent, "children" ) );
-
-        checkDirtyTracking( parent );
-        assertThat( children1, sameInstance( children2 ) );
-
-        assertFalse( isInitialized( children1 ) );
-        assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
-        assertTrue( isInitialized( children1 ) );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List children;
-
-        void setChildren(List children) {
-            this.children = children;
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        Parent parent;
-
-        String name;
-
-        Child() {
-        }
-
-        Child(String name) {
-            this.name = name;
-        }
-    }
+	private static final int CHILDREN_SIZE = 10;
+	private Long parentID;
+	private Parent parent;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent parent = new Parent();
+			parent.setChildren( new ArrayList<>() );
+			for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
+				Child child = new Child();
+				child.parent = parent;
+				s.persist( child );
+			}
+			s.persist( parent );
+			parentID = parent.id;
+		} );
+	}
+
+	@Test
+	public void testTransaction(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent parent = s.getReference( Parent.class, parentID );
+			assertThat( parent, notNullValue() );
+			assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
+			assertFalse( isPropertyInitialized( parent, "children" ) );
+			checkDirtyTracking( parent );
+
+			List children1 = parent.children;
+			List children2 = parent.children;
+
+			assertTrue( isPropertyInitialized( parent, "children" ) );
+			checkDirtyTracking( parent );
+
+			assertThat( children1, sameInstance( children2 ) );
+
+			assertFalse( isInitialized( children1 ) );
+			assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
+			assertTrue( isInitialized( children1 ) );
+		} );
+	}
+
+	@Test
+	@JiraKey( "HHH-14620" )
+	public void testTransaction_noProxy(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			// find will not return a proxy, which is exactly what we want here.
+			Parent parent = s.find( Parent.class, parentID );
+			assertThat( parent, notNullValue() );
+			assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
+			checkDirtyTracking( parent );
+
+			List children1 = parent.children;
+			List children2 = parent.children;
+
+			checkDirtyTracking( parent );
+
+			assertThat( children1, sameInstance( children2 ) );
+
+			// This check is important: a bug used to cause the collection to be initialized
+			// during the call to parent.children above.
+			// Note the same problem would occur if we were using getters:
+			// we only need extended enhancement to be enabled.
+			assertFalse( isInitialized( children1 ) );
+			assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
+			assertTrue( isInitialized( children1 ) );
+		} );
+	}
+
+	@Test
+	public void testNoTransaction(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			parent = s.getReference( Parent.class, parentID );
+			assertThat( parent, notNullValue() );
+			assertThat( parent, not( instanceOf( HibernateProxy.class ) ) );
+			assertFalse( isPropertyInitialized( parent, "children" ) );
+		} );
+
+		List children1 = parent.children;
+		List children2 = parent.children;
+
+		assertTrue( isPropertyInitialized( parent, "children" ) );
+
+		checkDirtyTracking( parent );
+		assertThat( children1, sameInstance( children2 ) );
+
+		assertFalse( isInitialized( children1 ) );
+		assertThat( children1.size(), equalTo( CHILDREN_SIZE ) );
+		assertTrue( isInitialized( children1 ) );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List children;
+
+		void setChildren(List children) {
+			this.children = children;
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		Parent parent;
+
+		String name;
+
+		Child() {
+		}
+
+		Child(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java
index 7c4545366384..a5aaa475bad9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java
index 334deae04c4a..df1ba3941965 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndParameterizedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndParameterizedInheritanceTest.java
index 35523f23cc27..76c246418cf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndParameterizedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndParameterizedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
index c490d8068c9f..331e526a7c64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -39,125 +37,125 @@
 
 @JiraKey( "HHH-10747" )
 @DomainModel(
-        annotatedClasses = {
-                LazyLoadingByEnhancerSetterTest.ItemField.class, LazyLoadingByEnhancerSetterTest.ItemProperty.class
-        }
+		annotatedClasses = {
+				LazyLoadingByEnhancerSetterTest.ItemField.class, LazyLoadingByEnhancerSetterTest.ItemProperty.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyLoadingByEnhancerSetterTest {
 
-    private Item item, mergedItem;
-
-    @Test
-    public void testField(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            ItemField input = new ItemField();
-            input.name = "F";
-            input.parameters = new HashMap<>();
-            input.parameters.put( "aaa", "AAA" );
-            input.parameters.put( "bbb", "BBB" );
-            s.persist( input );
-        } );
-
-        scope.inTransaction( s -> {
-            // A parameters map is created with the class and is being compared to the persistent map (by the generated code) -- it shouldn't
-            item = s.find( ItemField.class, "F" );
-        } );
-
-        scope.inTransaction( s -> {
-            mergedItem = (Item) s.merge( item );
-        } );
-
-        assertEquals( 2, mergedItem.getParameters().size() );
-    }
-
-    @Test
-    @FailureExpected( jiraKey = "HHH-10747" )
-    public void testProperty(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            ItemProperty input = new ItemProperty();
-            input.setName( "P" );
-            Map parameters = new HashMap<>();
-            parameters.put( "ccc", "CCC" );
-            parameters.put( "ddd", "DDD" );
-            input.setParameters( parameters );
-            s.persist( input );
-        } );
-
-        scope.inTransaction( s -> {
-            // A parameters map is created with the class and is being compared to the persistent map (by the generated code) -- it shouldn't
-            item = s.find( ItemProperty.class, "P" );
-        } );
-
-        scope.inTransaction( s -> {
-            mergedItem = (Item) s.merge( item );
-        } );
-
-        assertEquals( 2, mergedItem.getParameters().size() );
-    }
-
-    // --- //
-
-    private interface Item {
-        Map getParameters();
-    }
-
-    @Entity
-    @Table( name = "ITEM_F" )
-    static class ItemField implements Item {
-
-        @Id
-        @Column( nullable = false )
-        private String name;
-
-        @ElementCollection( fetch = FetchType.EAGER )
-        @MapKeyColumn( name = "NAME" )
-        @Lob
-        @Column( name = "PARAM_VAL", length = 65535 )
-        private Map parameters = new HashMap<>();
-
-        @Override
-        public Map getParameters() {
-            return parameters;
-        }
-    }
-
-    @Entity
-    @Table( name = "ITEM_P" )
-    static class ItemProperty implements Item {
-
-        private String aName;
-
-        private Map parameterMap = new HashMap<>();
-
-        @Id
-        @Column( nullable = false )
-        public String getName() {
-            return aName;
-        }
-
-        public void setName(String name) {
-            this.aName = name;
-        }
-
-        @ElementCollection( fetch = FetchType.EAGER )
-        @MapKeyColumn( name = "NAME" )
-        @Lob
-        @Column( name = "PARAM_VAL", length = 65535 )
-        @Override
-        public Map getParameters() {
-            return parameterMap;
-        }
-
-        public void setParameters(Map parameters) {
-            this.parameterMap = parameters;
-        }
-    }
+	private Item item, mergedItem;
+
+	@Test
+	public void testField(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			ItemField input = new ItemField();
+			input.name = "F";
+			input.parameters = new HashMap<>();
+			input.parameters.put( "aaa", "AAA" );
+			input.parameters.put( "bbb", "BBB" );
+			s.persist( input );
+		} );
+
+		scope.inTransaction( s -> {
+			// A parameters map is created with the class and is being compared to the persistent map (by the generated code) -- it shouldn't
+			item = s.find( ItemField.class, "F" );
+		} );
+
+		scope.inTransaction( s -> {
+			mergedItem = (Item) s.merge( item );
+		} );
+
+		assertEquals( 2, mergedItem.getParameters().size() );
+	}
+
+	@Test
+	@FailureExpected( jiraKey = "HHH-10747" )
+	public void testProperty(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			ItemProperty input = new ItemProperty();
+			input.setName( "P" );
+			Map parameters = new HashMap<>();
+			parameters.put( "ccc", "CCC" );
+			parameters.put( "ddd", "DDD" );
+			input.setParameters( parameters );
+			s.persist( input );
+		} );
+
+		scope.inTransaction( s -> {
+			// A parameters map is created with the class and is being compared to the persistent map (by the generated code) -- it shouldn't
+			item = s.find( ItemProperty.class, "P" );
+		} );
+
+		scope.inTransaction( s -> {
+			mergedItem = (Item) s.merge( item );
+		} );
+
+		assertEquals( 2, mergedItem.getParameters().size() );
+	}
+
+	// --- //
+
+	private interface Item {
+		Map getParameters();
+	}
+
+	@Entity
+	@Table( name = "ITEM_F" )
+	static class ItemField implements Item {
+
+		@Id
+		@Column( nullable = false )
+		private String name;
+
+		@ElementCollection( fetch = FetchType.EAGER )
+		@MapKeyColumn( name = "NAME" )
+		@Lob
+		@Column( name = "PARAM_VAL", length = 65535 )
+		private Map parameters = new HashMap<>();
+
+		@Override
+		public Map getParameters() {
+			return parameters;
+		}
+	}
+
+	@Entity
+	@Table( name = "ITEM_P" )
+	static class ItemProperty implements Item {
+
+		private String aName;
+
+		private Map parameterMap = new HashMap<>();
+
+		@Id
+		@Column( nullable = false )
+		public String getName() {
+			return aName;
+		}
+
+		public void setName(String name) {
+			this.aName = name;
+		}
+
+		@ElementCollection( fetch = FetchType.EAGER )
+		@MapKeyColumn( name = "NAME" )
+		@Lob
+		@Column( name = "PARAM_VAL", length = 65535 )
+		@Override
+		public Map getParameters() {
+			return parameterMap;
+		}
+
+		public void setParameters(Map parameters) {
+			this.parameterMap = parameters;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java
index 999726a2007a..65e31ec803d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -37,97 +35,97 @@
  * @author Luis Barreiro
  */
 @DomainModel(
-        annotatedClasses = {
-                LazyLoadingIntegrationTest.Parent.class, LazyLoadingIntegrationTest.Child.class
-        }
+		annotatedClasses = {
+				LazyLoadingIntegrationTest.Parent.class, LazyLoadingIntegrationTest.Child.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-                @Setting( name = AvailableSettings.DEFAULT_LIST_SEMANTICS, value = "BAG" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+				@Setting( name = AvailableSettings.DEFAULT_LIST_SEMANTICS, value = "BAG" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyLoadingIntegrationTest {
 
-    private static final int CHILDREN_SIZE = 10;
-    private Long lastChildID;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent parent = new Parent();
-            for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
-                Child child = new Child();
-                // Association management should kick in here
-                child.parent = parent;
-                s.persist( child );
-                lastChildID = child.id;
-            }
-            s.persist( parent );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Child loadedChild = s.getReference( Child.class, lastChildID );
-            checkDirtyTracking( loadedChild );
-
-            loadedChild.name = "Barrabas";
-            checkDirtyTracking( loadedChild, "name" );
-
-            Parent loadedParent = loadedChild.parent;
-            checkDirtyTracking( loadedChild, "name" );
-            checkDirtyTracking( loadedParent );
-
-            List loadedChildren = new ArrayList<>( loadedParent.children );
-            loadedChildren.remove( 0 );
-            loadedChildren.remove( loadedChild );
-            loadedParent.setChildren( loadedChildren );
-
-            assertNull( loadedChild.parent );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List children;
-
-        void setChildren(List children) {
-            this.children = children;
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        Parent parent;
-
-        String name;
-
-        Child() {
-        }
-
-        Child(String name) {
-            this.name = name;
-        }
-    }
+	private static final int CHILDREN_SIZE = 10;
+	private Long lastChildID;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent parent = new Parent();
+			for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
+				Child child = new Child();
+				// Association management should kick in here
+				child.parent = parent;
+				s.persist( child );
+				lastChildID = child.id;
+			}
+			s.persist( parent );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Child loadedChild = s.getReference( Child.class, lastChildID );
+			checkDirtyTracking( loadedChild );
+
+			loadedChild.name = "Barrabas";
+			checkDirtyTracking( loadedChild, "name" );
+
+			Parent loadedParent = loadedChild.parent;
+			checkDirtyTracking( loadedChild, "name" );
+			checkDirtyTracking( loadedParent );
+
+			List loadedChildren = new ArrayList<>( loadedParent.children );
+			loadedChildren.remove( 0 );
+			loadedChildren.remove( loadedChild );
+			loadedParent.setChildren( loadedChildren );
+
+			assertNull( loadedChild.parent );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List children;
+
+		void setChildren(List children) {
+			this.children = children;
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		Parent parent;
+
+		String name;
+
+		Child() {
+		}
+
+		Child(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java
index e6fdb8bc50b5..c0435e0e4f4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -48,116 +46,116 @@
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(
-        annotatedClasses = {
-                LazyLoadingTest.Parent.class, LazyLoadingTest.Child.class
-        }
+		annotatedClasses = {
+				LazyLoadingTest.Parent.class, LazyLoadingTest.Child.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyLoadingTest {
 
-    private static final int CHILDREN_SIZE = 10;
-    private Long parentID;
-    private Long lastChildID;
-
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent parent = new Parent();
-            for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
-                Child child = new Child( "Child #" + i );
-                child.parent = parent;
-                parent.addChild( child );
-                s.persist( child );
-                lastChildID = child.id;
-            }
-            s.persist( parent );
-            parentID = parent.id;
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Child loadedChild = s.getReference( Child.class, lastChildID );
-            assertThat( loadedChild, not( instanceOf( HibernateProxy.class ) ) );
-            assertThat( loadedChild, instanceOf( PersistentAttributeInterceptable.class ) );
-            final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild;
-            final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor();
-            assertThat( interceptor, instanceOf( EnhancementAsProxyLazinessInterceptor.class ) );
-
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "name" ), is( false ) );
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "parent" ), is( false ) );
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "children" ), is( false ) );
-
-            Parent loadedParent = loadedChild.parent;
-            assertThat( loadedChild.name, notNullValue() );
-            assertThat( loadedParent, notNullValue() );
-            assertThat( loadedChild.parent, notNullValue() );
-
-            checkDirtyTracking( loadedChild );
-
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "name" ), is( true ) );
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "parent" ), is( true ) );
-            assertThat( Hibernate.isPropertyInitialized( loadedChild, "children" ), is( true ) );
-
-            Collection loadedChildren = loadedParent.children;
-            assertThat( Hibernate.isInitialized( loadedChildren ), is( false ) );
-
-            checkDirtyTracking( loadedChild );
-            checkDirtyTracking( loadedParent );
-
-            loadedChildren.size();
-            assertThat( Hibernate.isInitialized( loadedChildren ), is( true ) );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List children;
-
-        void addChild(Child child) {
-            if ( children == null ) {
-                children = new ArrayList<>();
-            }
-            children.add( child );
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        Parent parent;
-
-        String name;
-
-        Child() {
-        }
-
-        Child(String name) {
-            this.name = name;
-        }
-    }
+	private static final int CHILDREN_SIZE = 10;
+	private Long parentID;
+	private Long lastChildID;
+
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent parent = new Parent();
+			for ( int i = 0; i < CHILDREN_SIZE; i++ ) {
+				Child child = new Child( "Child #" + i );
+				child.parent = parent;
+				parent.addChild( child );
+				s.persist( child );
+				lastChildID = child.id;
+			}
+			s.persist( parent );
+			parentID = parent.id;
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Child loadedChild = s.getReference( Child.class, lastChildID );
+			assertThat( loadedChild, not( instanceOf( HibernateProxy.class ) ) );
+			assertThat( loadedChild, instanceOf( PersistentAttributeInterceptable.class ) );
+			final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild;
+			final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor();
+			assertThat( interceptor, instanceOf( EnhancementAsProxyLazinessInterceptor.class ) );
+
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "name" ), is( false ) );
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "parent" ), is( false ) );
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "children" ), is( false ) );
+
+			Parent loadedParent = loadedChild.parent;
+			assertThat( loadedChild.name, notNullValue() );
+			assertThat( loadedParent, notNullValue() );
+			assertThat( loadedChild.parent, notNullValue() );
+
+			checkDirtyTracking( loadedChild );
+
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "name" ), is( true ) );
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "parent" ), is( true ) );
+			assertThat( Hibernate.isPropertyInitialized( loadedChild, "children" ), is( true ) );
+
+			Collection loadedChildren = loadedParent.children;
+			assertThat( Hibernate.isInitialized( loadedChildren ), is( false ) );
+
+			checkDirtyTracking( loadedChild );
+			checkDirtyTracking( loadedParent );
+
+			loadedChildren.size();
+			assertThat( Hibernate.isInitialized( loadedChildren ), is( true ) );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List children;
+
+		void addChild(Child child) {
+			if ( children == null ) {
+				children = new ArrayList<>();
+			}
+			children.add( child );
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		Parent parent;
+
+		String name;
+
+		Child() {
+		}
+
+		Child(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyManyToOneNoProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyManyToOneNoProxyTest.java
index 8a7b2cb99251..30e646accdb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyManyToOneNoProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyManyToOneNoProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java
index dd487f1b19e9..de3c5e798da5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -31,95 +29,95 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey("HHH-13380")
 @DomainModel(
-        annotatedClasses = {
-                LazyOneToManyWithEqualsImplementationTest.Person.class, LazyOneToManyWithEqualsImplementationTest.Course.class
-        }
+		annotatedClasses = {
+				LazyOneToManyWithEqualsImplementationTest.Person.class, LazyOneToManyWithEqualsImplementationTest.Course.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyOneToManyWithEqualsImplementationTest {
 
-    private Long personId;
-
-    @BeforeEach
-    public void setUp(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            Person p = new Person();
-            entityManager.persist(p);
-            personId = p.getId();
-
-            Course c1 = new Course( "First Course", p );
-            p.getCourses().add( c1 );
-            entityManager.persist( c1 );
-
-            Course c2 = new Course("Second Course", p );
-            p.getCourses().add( c2 );
-            entityManager.persist( c2 );
-        });
-    }
-
-
-    @Test
-    public void testRetrievalOfOneToMany(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            Person p = entityManager.find( Person.class, personId );
-
-            Set courses = p.getCourses();
-            Assertions.assertEquals( courses.size(), 2 );
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue()
-        private Long id;
-        public Long getId() {
-            return id;
-        }
-
-        @OneToMany(mappedBy="person", fetch = FetchType.LAZY)
-        private Set courses = new HashSet<>();
-        public Set getCourses() { return courses; }
-
-    }
-
-    @Entity(name = "Course")
-    public static class Course {
-
-        @Id
-        @GeneratedValue()
-        private Long id;
-        public Long getId() { return id; }
-
-        @Basic
-        private String title;
-        public String getTitle() { return title; }
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        private Person person;
-        public Person getPerson() { return person; }
-
-        protected Course() {}
-        public Course(String title, Person person) {
-            this.title = title;
-            this.person = person;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if ( this == o ) return true;
-            if ( o == null || getClass() != o.getClass() ) return false;
-            Course course = (Course) o;
-            return title.equals( course.title ) &&
-                    person.equals( course.person );
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash( title, person );
-        }
-    }
+	private Long personId;
+
+	@BeforeEach
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Person p = new Person();
+			entityManager.persist(p);
+			personId = p.getId();
+
+			Course c1 = new Course( "First Course", p );
+			p.getCourses().add( c1 );
+			entityManager.persist( c1 );
+
+			Course c2 = new Course("Second Course", p );
+			p.getCourses().add( c2 );
+			entityManager.persist( c2 );
+		});
+	}
+
+
+	@Test
+	public void testRetrievalOfOneToMany(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Person p = entityManager.find( Person.class, personId );
+
+			Set courses = p.getCourses();
+			Assertions.assertEquals( courses.size(), 2 );
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue()
+		private Long id;
+		public Long getId() {
+			return id;
+		}
+
+		@OneToMany(mappedBy="person", fetch = FetchType.LAZY)
+		private Set courses = new HashSet<>();
+		public Set getCourses() { return courses; }
+
+	}
+
+	@Entity(name = "Course")
+	public static class Course {
+
+		@Id
+		@GeneratedValue()
+		private Long id;
+		public Long getId() { return id; }
+
+		@Basic
+		private String title;
+		public String getTitle() { return title; }
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Person person;
+		public Person getPerson() { return person; }
+
+		protected Course() {}
+		public Course(String title, Person person) {
+			this.title = title;
+			this.person = person;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) return true;
+			if ( o == null || getClass() != o.getClass() ) return false;
+			Course course = (Course) o;
+			return title.equals( course.title ) &&
+					person.equals( course.person );
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash( title, person );
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToOneRemoveFlushAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToOneRemoveFlushAccessTest.java
index 7dde063a90aa..9c4af50f6066 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToOneRemoveFlushAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToOneRemoveFlushAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java
index b9ee377b03f3..144faad8d8c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -36,101 +34,101 @@
  */
 @JiraKey( "HHH-10922" )
 @DomainModel(
-        annotatedClasses = {
-                LazyProxyOnEnhancedEntityTest.Parent.class, LazyProxyOnEnhancedEntityTest.Child.class
-        }
+		annotatedClasses = {
+				LazyProxyOnEnhancedEntityTest.Parent.class, LazyProxyOnEnhancedEntityTest.Child.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 @CustomEnhancementContext( {EnhancerTestContext.class, LazyProxyOnEnhancedEntityTest.NoLazyLoadingContext.class} )
 public class LazyProxyOnEnhancedEntityTest {
 
-    private Long parentID;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            Child c = new Child();
-            em.persist( c );
-
-            Parent parent = new Parent();
-            parent.setChild( c );
-            em.persist( parent );
-            parentID = parent.getId();
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        EventListenerRegistry registry = scope.getSessionFactory().getServiceRegistry().getService( EventListenerRegistry.class );
-        registry.prependListeners( EventType.LOAD, new ImmediateLoadTrap() );
-
-        scope.inTransaction( em -> {
-
-            em.find( Parent.class, parentID );
-
-            // unwanted lazy load occurs on flush
-        } );
-    }
-
-    private static class ImmediateLoadTrap implements LoadEventListener {
-        @Override
-        public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException {
-            if ( IMMEDIATE_LOAD == loadType ) {
-                String msg = loadType + ":" + event.getEntityClassName() + "#" + event.getEntityId();
-                throw new RuntimeException( msg );
-            }
-        }
-    }
-
-    // --- //
-
-    @Entity(name = "Parent")
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @OneToOne( fetch = FetchType.LAZY
-        )
-        Child child;
-
-        public Long getId() {
-            return id;
-        }
-
-        public Child getChild() {
-            return child;
-        }
-
-        public void setChild(Child child) {
-            this.child = child;
-        }
-    }
-
-    @Entity(name = "Child")
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        String name;
-
-        Child() {
-            // No-arg constructor necessary for proxy factory
-        }
-    }
-
-    // --- //
-
-    public static class NoLazyLoadingContext extends EnhancerTestContext {
-        @Override
-        public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
-            return false;
-        }
-    }
+	private Long parentID;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Child c = new Child();
+			em.persist( c );
+
+			Parent parent = new Parent();
+			parent.setChild( c );
+			em.persist( parent );
+			parentID = parent.getId();
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		EventListenerRegistry registry = scope.getSessionFactory().getServiceRegistry().getService( EventListenerRegistry.class );
+		registry.prependListeners( EventType.LOAD, new ImmediateLoadTrap() );
+
+		scope.inTransaction( em -> {
+
+			em.find( Parent.class, parentID );
+
+			// unwanted lazy load occurs on flush
+		} );
+	}
+
+	private static class ImmediateLoadTrap implements LoadEventListener {
+		@Override
+		public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException {
+			if ( IMMEDIATE_LOAD == loadType ) {
+				String msg = loadType + ":" + event.getEntityClassName() + "#" + event.getEntityId();
+				throw new RuntimeException( msg );
+			}
+		}
+	}
+
+	// --- //
+
+	@Entity(name = "Parent")
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@OneToOne( fetch = FetchType.LAZY
+		)
+		Child child;
+
+		public Long getId() {
+			return id;
+		}
+
+		public Child getChild() {
+			return child;
+		}
+
+		public void setChild(Child child) {
+			this.child = child;
+		}
+	}
+
+	@Entity(name = "Child")
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		String name;
+
+		Child() {
+			// No-arg constructor necessary for proxy factory
+		}
+	}
+
+	// --- //
+
+	public static class NoLazyLoadingContext extends EnhancerTestContext {
+		@Override
+		public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java
index 3e205bd644a5..faf1ef241e55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -34,145 +32,145 @@
  */
 @Jira( "https://hibernate.atlassian.net/browse/HHH-14619" )
 @DomainModel(
-        annotatedClasses = {
-                LazyProxyWithCollectionTest.Parent.class,
-                LazyProxyWithCollectionTest.Child.class
-        }
+		annotatedClasses = {
+				LazyProxyWithCollectionTest.Parent.class,
+				LazyProxyWithCollectionTest.Child.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyProxyWithCollectionTest {
 
-    private Long childId;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            Child c = new Child();
-            em.persist( c );
-            childId = c.getId();
-        } );
-    }
-
-    @Test
-    public void testReference(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            Child child = em.getReference( Child.class, childId );
-            Parent parent = new Parent();
-            parent.child = child;
-            em.persist( parent );
-            // Class cast exception occurs during auto-flush
-            em.find( Parent.class, parent.getId() );
-        } );
-    }
-
-    @Test
-    public void testLazyCollection(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            Child child = em.find( Child.class, childId );
-            Parent parent = new Parent();
-            parent.child = child;
-            em.persist( parent );
-            child.children = new HashSet<>();
-            // Class cast exception occurs during auto-flush
-            em.find( Parent.class, parent.getId() );
-        } );
-    }
-
-    @Test
-    @Jira( "https://hibernate.atlassian.net/browse/HHH-17750" )
-    public void testMerge(SessionFactoryScope scope) {
-        final Child child = scope.fromTransaction( em -> em.find( Child.class, childId ) );
-
-        final Parent parent = scope.fromTransaction( em -> {
-            Parent p = new Parent();
-            p.setChild( child );
-            return em.merge( p );
-        } );
-
-        scope.inTransaction( em -> em.merge( parent ) );
-
-        scope.inTransaction( em -> {
-            assertThat( em.find( Parent.class, parent.getId() ).getChild().getId() ).isEqualTo( child.getId() );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        @OneToOne( fetch = FetchType.LAZY )
-        Child child;
-
-        public Long getId() {
-            return id;
-        }
-
-        public Child getChild() {
-            return child;
-        }
-
-        public void setChild(Child child) {
-            this.child = child;
-        }
-    }
-
-    @Entity
-    @Table( name = "CHILD" )
-    static class Child {
-
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-        @Version
-        Long version;
-
-        String name;
-
-        @OneToMany
-        Set children = new HashSet<>();
-
-        Child() {
-            // No-arg constructor necessary for proxy factory
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public Long getVersion() {
-            return version;
-        }
-
-        public void setVersion(Long version) {
-            this.version = version;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Set getChildren() {
-            return children;
-        }
-
-        public void setChildren(Set children) {
-            this.children = children;
-        }
-    }
+	private Long childId;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Child c = new Child();
+			em.persist( c );
+			childId = c.getId();
+		} );
+	}
+
+	@Test
+	public void testReference(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Child child = em.getReference( Child.class, childId );
+			Parent parent = new Parent();
+			parent.child = child;
+			em.persist( parent );
+			// Class cast exception occurs during auto-flush
+			em.find( Parent.class, parent.getId() );
+		} );
+	}
+
+	@Test
+	public void testLazyCollection(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Child child = em.find( Child.class, childId );
+			Parent parent = new Parent();
+			parent.child = child;
+			em.persist( parent );
+			child.children = new HashSet<>();
+			// Class cast exception occurs during auto-flush
+			em.find( Parent.class, parent.getId() );
+		} );
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-17750" )
+	public void testMerge(SessionFactoryScope scope) {
+		final Child child = scope.fromTransaction( em -> em.find( Child.class, childId ) );
+
+		final Parent parent = scope.fromTransaction( em -> {
+			Parent p = new Parent();
+			p.setChild( child );
+			return em.merge( p );
+		} );
+
+		scope.inTransaction( em -> em.merge( parent ) );
+
+		scope.inTransaction( em -> {
+			assertThat( em.find( Parent.class, parent.getId() ).getChild().getId() ).isEqualTo( child.getId() );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		@OneToOne( fetch = FetchType.LAZY )
+		Child child;
+
+		public Long getId() {
+			return id;
+		}
+
+		public Child getChild() {
+			return child;
+		}
+
+		public void setChild(Child child) {
+			this.child = child;
+		}
+	}
+
+	@Entity
+	@Table( name = "CHILD" )
+	static class Child {
+
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+		@Version
+		Long version;
+
+		String name;
+
+		@OneToMany
+		Set children = new HashSet<>();
+
+		Child() {
+			// No-arg constructor necessary for proxy factory
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getVersion() {
+			return version;
+		}
+
+		public void setVersion(Long version) {
+			this.version = version;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Set getChildren() {
+			return children;
+		}
+
+		public void setChildren(Set children) {
+			this.children = children;
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyToOneJoinOnNonPrimaryKeyColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyToOneJoinOnNonPrimaryKeyColumnTest.java
index b4ce6fe923f4..72f1c51fe964 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyToOneJoinOnNonPrimaryKeyColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyToOneJoinOnNonPrimaryKeyColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
index 7c025ad66c8a..b20ad3616e88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupFetchModeSelectTest.java
index 63670fa7b0bf..408f4e0d2b14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupFetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
index 800b8e5c093b..5f723844dc5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -30,53 +28,53 @@
  * @author Christian Beikov
  */
 @DomainModel(
-        annotatedClasses = {
-            MultipleBagsInLazyFetchGroupTest.StringsEntity.class
-        }
+		annotatedClasses = {
+			MultipleBagsInLazyFetchGroupTest.StringsEntity.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class MultipleBagsInLazyFetchGroupTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
 
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.text = "abc";
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            entity.someStrings2 = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.text = "abc";
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			entity.someStrings2 = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        Assertions.assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.getReference( StringsEntity.class, 1L );
-            assertEquals( 3, entity.someStrings.size() );
-            assertEquals( 3, entity.someStrings2.size() );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		Assertions.assertTrue( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.getReference( StringsEntity.class, 1L );
+			assertEquals( 3, entity.someStrings.size() );
+			assertEquals( 3, entity.someStrings2.size() );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "STRINGS_ENTITY" )
-    static class StringsEntity {
+	@Entity
+	@Table( name = "STRINGS_ENTITY" )
+	static class StringsEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String text;
+		String text;
 
-        @ElementCollection(fetch = FetchType.EAGER)
-        List someStrings;
+		@ElementCollection(fetch = FetchType.EAGER)
+		List someStrings;
 
-        @ElementCollection(fetch = FetchType.EAGER)
-        List someStrings2;
-    }
+		@ElementCollection(fetch = FetchType.EAGER)
+		List someStrings2;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
index 0622783b25b2..7e083c3f5c15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
@@ -30,52 +28,52 @@
  * @author Christian Beikov
  */
 @DomainModel(
-        annotatedClasses = {
-                MultipleBagsNotInLazyFetchGroupTest.StringsEntity.class
-        }
+		annotatedClasses = {
+				MultipleBagsNotInLazyFetchGroupTest.StringsEntity.class
+		}
 )
 @SessionFactory(applyCollectionsInDefaultFetchGroup = false)
 @BytecodeEnhanced
 public class MultipleBagsNotInLazyFetchGroupTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        assertFalse( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		assertFalse( scope.getSessionFactory().getSessionFactoryOptions().isCollectionsInDefaultFetchGroupEnabled() );
 
-        scope.inTransaction( em -> {
-            StringsEntity entity = new StringsEntity();
-            entity.id = 1L;
-            entity.text = "abc";
-            entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            entity.someStrings2 = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
-            em.persist( entity );
-        } );
-    }
+		scope.inTransaction( em -> {
+			StringsEntity entity = new StringsEntity();
+			entity.id = 1L;
+			entity.text = "abc";
+			entity.someStrings = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			entity.someStrings2 = new ArrayList<>( Arrays.asList( "a", "b", "c" ) );
+			em.persist( entity );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            StringsEntity entity = entityManager.getReference( StringsEntity.class, 1L );
-            assertEquals( 3, entity.someStrings.size() );
-            assertEquals( 3, entity.someStrings2.size() );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			StringsEntity entity = entityManager.getReference( StringsEntity.class, 1L );
+			assertEquals( 3, entity.someStrings.size() );
+			assertEquals( 3, entity.someStrings2.size() );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table(name = "STRINGS_ENTITY")
-    static class StringsEntity {
+	@Entity
+	@Table(name = "STRINGS_ENTITY")
+	static class StringsEntity {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String text;
+		String text;
 
-        @ElementCollection(fetch = FetchType.EAGER)
-        List someStrings;
+		@ElementCollection(fetch = FetchType.EAGER)
+		List someStrings;
 
-        @ElementCollection(fetch = FetchType.EAGER)
-        List someStrings2;
-    }
+		@ElementCollection(fetch = FetchType.EAGER)
+		List someStrings2;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java
index cb9ef648ab84..f19ca23393c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NoDirtyCheckingContext.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NoDirtyCheckingContext.java
index e1a194893708..a9c75e795145 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NoDirtyCheckingContext.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NoDirtyCheckingContext.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
 import org.hibernate.bytecode.enhance.spi.UnloadedClass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ReferenceLoadedEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ReferenceLoadedEnhancedEntityTest.java
index 35fefdbcbb3a..ef770d91530b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ReferenceLoadedEnhancedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/ReferenceLoadedEnhancedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java
index dda489462b7a..d2a4c62cc38f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java
index 8332b7405247..8410aaeba2b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.backref;
 
@@ -10,7 +8,6 @@
 import org.hibernate.LockMode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.orm.test.bytecode.enhancement.lazy.NoDirtyCheckingContext;
 import org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.DirtyCheckEnhancementContext;
 import org.hibernate.orm.test.collection.backref.map.compkey.MapKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java
index 8b45c138d5c3..da9c06a1a78a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java
index 9e92cf747057..fece529d7cfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.basic;
 
@@ -37,120 +35,120 @@
  * @author Gail Badner
  */
 @DomainModel(
-        annotatedClasses = {
-                LazyBasicFieldAccessTest.LazyEntity.class
-        }
+		annotatedClasses = {
+				LazyBasicFieldAccessTest.LazyEntity.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyBasicFieldAccessTest {
 
-    private LazyEntity entity;
+	private LazyEntity entity;
 
-    private Long entityId;
+	private Long entityId;
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            LazyEntity entity = new LazyEntity();
-            entity.description = "desc";
-            s.persist( entity );
-            entityId = entity.id;
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			LazyEntity entity = new LazyEntity();
+			entity.description = "desc";
+			s.persist( entity );
+			entityId = entity.id;
+		} );
+	}
 
-    @Test
-    public void testAttachedUpdate(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
+	@Test
+	public void testAttachedUpdate(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
 
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( entity );
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( entity );
 
-            assertEquals( "desc", entity.description );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
+			assertEquals( "desc", entity.description );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
 
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            entity.description = "desc1";
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			entity.description = "desc1";
 
-            checkDirtyTracking( entity, "description" );
+			checkDirtyTracking( entity, "description" );
 
-            assertEquals( "desc1", entity.description );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
+			assertEquals( "desc1", entity.description );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
 
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc1", entity.description );
-        } );
-    }
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc1", entity.description );
+		} );
+	}
 
-    @Test
-    @JiraKey("HHH-11882")
-    public void testDetachedUpdate(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
+	@Test
+	@JiraKey("HHH-11882")
+	public void testDetachedUpdate(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
 
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( entity );
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( entity );
 
-            assertEquals( "desc", entity.description );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
+			assertEquals( "desc", entity.description );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
 
-        scope.inTransaction( s -> {
-            entity.description = "desc1";
-            LazyEntity merged = s.merge( entity );
+		scope.inTransaction( s -> {
+			entity.description = "desc1";
+			LazyEntity merged = s.merge( entity );
 
-            checkDirtyTracking( merged, "description" );
+			checkDirtyTracking( merged, "description" );
 
-            assertEquals( "desc1", merged.description );
-            assertTrue( isPropertyInitialized( merged, "description" ) );
-        } );
+			assertEquals( "desc1", merged.description );
+			assertTrue( isPropertyInitialized( merged, "description" ) );
+		} );
 
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc1", entity.description );
-        } );
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc1", entity.description );
+		} );
 
-        scope.inTransaction( s -> {
-            entity.description = "desc2";
-            LazyEntity mergedEntity = s.merge( entity );
+		scope.inTransaction( s -> {
+			entity.description = "desc2";
+			LazyEntity mergedEntity = s.merge( entity );
 
-            //Assert.assertFalse( Hibernate.isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( mergedEntity, "description" );
+			//Assert.assertFalse( Hibernate.isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( mergedEntity, "description" );
 
-            assertEquals( "desc2", mergedEntity.description );
-            assertTrue( isPropertyInitialized( mergedEntity, "description" ) );
-        } );
+			assertEquals( "desc2", mergedEntity.description );
+			assertTrue( isPropertyInitialized( mergedEntity, "description" ) );
+		} );
 
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc2", entity.description );
-        } );
-    }
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc2", entity.description );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Access( AccessType.FIELD )
-    @Table( name = "LAZY_PROPERTY_ENTITY" )
-    static class LazyEntity {
+	@Entity
+	@Access( AccessType.FIELD )
+	@Table( name = "LAZY_PROPERTY_ENTITY" )
+	static class LazyEntity {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @Basic( fetch = FetchType.LAZY )
-        String description;
-    }
+		@Basic( fetch = FetchType.LAZY )
+		String description;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java
index 8e64cc3e7b3e..7376ef0d5b36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.basic;
 
@@ -35,132 +33,132 @@
  * @author Gail Badner
  */
 @DomainModel(
-        annotatedClasses = {
-                LazyBasicPropertyAccessTest.LazyEntity.class
-        }
+		annotatedClasses = {
+				LazyBasicPropertyAccessTest.LazyEntity.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false"),
-                @Setting(name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true"),
-        }
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false"),
+				@Setting(name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true"),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyBasicPropertyAccessTest {
 
-    private LazyEntity entity;
-    private Long entityId;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            LazyEntity entity = new LazyEntity();
-            entity.setDescription( "desc" );
-            s.persist( entity );
-            entityId = entity.getId();
-        } );
-    }
-
-    @Test
-    public void testAttachedUpdate(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( entity );
-
-            assertEquals( "desc", entity.getDescription() );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
-
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            entity.setDescription( "desc1" );
-
-            checkDirtyTracking( entity, "description" );
-
-            assertEquals( "desc1", entity.getDescription() );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
-
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc1", entity.getDescription() );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-11882")
-    public void testDetachedUpdate(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-
-            assertFalse( isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( entity );
-
-            assertEquals( "desc", entity.getDescription() );
-            assertTrue( isPropertyInitialized( entity, "description" ) );
-        } );
-
-        scope.inTransaction( s -> {
-            entity.setDescription( "desc1" );
-            LazyEntity merged = s.merge( entity );
-
-            checkDirtyTracking( merged, "description" );
-
-            assertEquals( "desc1", merged.getDescription() );
-            assertTrue( isPropertyInitialized( merged, "description" ) );
-        } );
-
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc1", entity.getDescription() );
-        } );
-
-        scope.inTransaction( s -> {
-            entity.setDescription( "desc2" );
-            LazyEntity mergedEntity = s.merge( entity );
-
-            // Assert.assertFalse( isPropertyInitialized( entity, "description" ) );
-            checkDirtyTracking( mergedEntity, "description" );
-
-            assertEquals( "desc2", mergedEntity.getDescription() );
-            assertTrue( isPropertyInitialized( mergedEntity, "description" ) );
-        } );
-
-        scope.inTransaction( s -> {
-            entity = s.get( LazyEntity.class, entityId );
-            assertEquals( "desc2", entity.getDescription() );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "LAZY_FIELD_ENTITY" )
-    static class LazyEntity {
-        Long id;
-        String description;
-
-        @Id
-        @GeneratedValue
-        Long getId() {
-            return id;
-        }
-
-        void setId(Long id) {
-            this.id = id;
-        }
-
-        @Basic( fetch = FetchType.LAZY )
-        String getDescription() {
-            return description;
-        }
-
-        void setDescription(String description) {
-            this.description = description;
-        }
-    }
+	private LazyEntity entity;
+	private Long entityId;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			LazyEntity entity = new LazyEntity();
+			entity.setDescription( "desc" );
+			s.persist( entity );
+			entityId = entity.getId();
+		} );
+	}
+
+	@Test
+	public void testAttachedUpdate(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( entity );
+
+			assertEquals( "desc", entity.getDescription() );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
+
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			entity.setDescription( "desc1" );
+
+			checkDirtyTracking( entity, "description" );
+
+			assertEquals( "desc1", entity.getDescription() );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
+
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc1", entity.getDescription() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-11882")
+	public void testDetachedUpdate(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+
+			assertFalse( isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( entity );
+
+			assertEquals( "desc", entity.getDescription() );
+			assertTrue( isPropertyInitialized( entity, "description" ) );
+		} );
+
+		scope.inTransaction( s -> {
+			entity.setDescription( "desc1" );
+			LazyEntity merged = s.merge( entity );
+
+			checkDirtyTracking( merged, "description" );
+
+			assertEquals( "desc1", merged.getDescription() );
+			assertTrue( isPropertyInitialized( merged, "description" ) );
+		} );
+
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc1", entity.getDescription() );
+		} );
+
+		scope.inTransaction( s -> {
+			entity.setDescription( "desc2" );
+			LazyEntity mergedEntity = s.merge( entity );
+
+			// Assert.assertFalse( isPropertyInitialized( entity, "description" ) );
+			checkDirtyTracking( mergedEntity, "description" );
+
+			assertEquals( "desc2", mergedEntity.getDescription() );
+			assertTrue( isPropertyInitialized( mergedEntity, "description" ) );
+		} );
+
+		scope.inTransaction( s -> {
+			entity = s.get( LazyEntity.class, entityId );
+			assertEquals( "desc2", entity.getDescription() );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "LAZY_FIELD_ENTITY" )
+	static class LazyEntity {
+		Long id;
+		String description;
+
+		@Id
+		@GeneratedValue
+		Long getId() {
+			return id;
+		}
+
+		void setId(Long id) {
+			this.id = id;
+		}
+
+		@Basic( fetch = FetchType.LAZY )
+		String getDescription() {
+			return description;
+		}
+
+		void setDescription(String description) {
+			this.description = description;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyEagerBasicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyEagerBasicUpdateTest.java
index 457754e2c425..da5c4f83a7d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyEagerBasicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyEagerBasicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java
index 6aa12b9c41e3..e846dc33fd8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java
index 11f7c07b5031..e8330e89ff62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.cache;
 
@@ -40,94 +38,94 @@
  * @author Luis Barreiro
  */
 @DomainModel(
-        annotatedClasses = {
-               LazyInCacheTest.Order.class, LazyInCacheTest.Product.class, LazyInCacheTest.Tag.class
-        }
+		annotatedClasses = {
+			LazyInCacheTest.Order.class, LazyInCacheTest.Product.class, LazyInCacheTest.Tag.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyInCacheTest {
 
-    private Long orderId;
+	private Long orderId;
 
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        Order order = new Order();
-        Product product = new Product();
-        order.products.add( product );
-        order.data = "some data".getBytes( Charset.defaultCharset() );
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		Order order = new Order();
+		Product product = new Product();
+		order.products.add( product );
+		order.data = "some data".getBytes( Charset.defaultCharset() );
 
-        scope.inTransaction( em -> {
-            em.persist( product );
-            em.persist( order );
-        } );
+		scope.inTransaction( em -> {
+			em.persist( product );
+			em.persist( order );
+		} );
 
-        orderId = order.id;
-    }
+		orderId = order.id;
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            Order order = em.find( Order.class, orderId );
-            assertEquals( 1, order.products.size() );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Order order = em.find( Order.class, orderId );
+			assertEquals( 1, order.products.size() );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity(name = "Order")
-    @Table( name = "ORDER_TABLE" )
-    @Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE )
-    static class Order {
+	@Entity(name = "Order")
+	@Table( name = "ORDER_TABLE" )
+	@Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE )
+	static class Order {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        @OneToMany
-        List products = new ArrayList<>();
+		@OneToMany
+		List products = new ArrayList<>();
 
-        @OneToMany
-        List tags = new ArrayList<>();
+		@OneToMany
+		List tags = new ArrayList<>();
 
-        @Basic( fetch = FetchType.LAZY )
-        @Type( BinaryCustomType.class )
+		@Basic( fetch = FetchType.LAZY )
+		@Type( BinaryCustomType.class )
 //        @JdbcTypeCode(Types.LONGVARBINARY)
-        byte[] data;
-    }
+		byte[] data;
+	}
 
-    @Entity(name = "Product")
-    @Table( name = "PRODUCT" )
-    static class Product {
+	@Entity(name = "Product")
+	@Table( name = "PRODUCT" )
+	static class Product {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        String name;
-    }
+		String name;
+	}
 
-    @Entity(name = "Tag")
-    @Table( name = "TAG" )
-    static class Tag {
+	@Entity(name = "Tag")
+	@Table( name = "TAG" )
+	static class Tag {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        String name;
-    }
+		String name;
+	}
 
-    public static class BinaryCustomType extends UserTypeLegacyBridge {
-        public BinaryCustomType() {
-            super( "binary" );
-        }
-    }
+	public static class BinaryCustomType extends UserTypeLegacyBridge {
+		public BinaryCustomType() {
+			super( "binary" );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java
index 6d97724274b9..4df31baa963c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.cache;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java
index e48b26533ed5..4625ad63140a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.cache;
 
@@ -30,7 +28,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/EnhancedFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/EnhancedFetchTest.java
index ecd6a5cc20d4..d1c49388c1f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/EnhancedFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/EnhancedFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/FetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/FetchTest.java
index 1c1562a12083..a7258982c64f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/FetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/fetch/FetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java
index 249d7630bc5a..62bfd153f079 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import java.util.List;
@@ -14,9 +18,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java
index 7a4bee470dd8..905bb866dc9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java
index 306a5e67a4a9..9c8a3b0371f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_From.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_From.java
index 26ca34b386b7..7c40d768cd4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_From.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_From.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import org.hibernate.annotations.LazyGroup;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_To.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_To.java
index 88db53ff0174..3773bdc571ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_To.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_To.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import jakarta.persistence.AccessType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java
index 2ee1ae52a3bf..786cf3ba368b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java
index c967e9585028..b4c77a3926d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
@@ -47,239 +45,239 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey( "HHH-11155" )
 @DomainModel(
-        annotatedClasses = {
-                LazyGroupTest.Child.class, LazyGroupTest.Parent.class
-        }
+		annotatedClasses = {
+				LazyGroupTest.Child.class, LazyGroupTest.Parent.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class LazyGroupTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Child c1 = new Child( "steve", "Hibernater" );
-            Child c2 = new Child( "sally", "Joe Mama" );
-
-            Parent p1 = new Parent( "Hibernate" );
-            Parent p2 = new Parent( "Swimming" );
-
-            c1.parent = p1;
-            p1.children.add( c1 );
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Child c1 = new Child( "steve", "Hibernater" );
+			Child c2 = new Child( "sally", "Joe Mama" );
+
+			Parent p1 = new Parent( "Hibernate" );
+			Parent p2 = new Parent( "Swimming" );
+
+			c1.parent = p1;
+			p1.children.add( c1 );
 
-            c1.alternateParent = p2;
-            p2.alternateChildren.add( c1 );
+			c1.alternateParent = p2;
+			p2.alternateChildren.add( c1 );
 
-            c2.parent = p2;
-            p2.children.add( c2 );
+			c2.parent = p2;
+			p2.children.add( c2 );
 
-            c2.alternateParent = p1;
-            p1.alternateChildren.add( c2 );
+			c2.alternateParent = p1;
+			p1.alternateChildren.add( c2 );
 
-            s.persist( p1 );
-            s.persist( p2 );
-        } );
-    }
+			s.persist( p1 );
+			s.persist( p2 );
+		} );
+	}
 
-    @Test
-    @JiraKey( "HHH-10267" )
-    public void testAccess(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (s) -> {
-                    SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getSessionFactory()
-                            .getSessionFactoryOptions()
-                            .getStatementInspector();
-                    statementInspector.clear();
-
-                    final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
-                            .setParameter( "name", "steve" )
-                            .uniqueResult();
-
-                    statementInspector.assertExecutedCount( 1 );
-
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
-
-                    assertFalse( Hibernate.isPropertyInitialized( c1, "nickName" ) );
-
-                    // parent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
-                    assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getParent() ) );
-
-                    // alternateParent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
-                    assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
-
-                    // Now lets access nickName which ought to initialize nickName
-                    c1.getNickName();
-                    statementInspector.assertExecutedCount( 2 );
-
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "nickName" ) );
-
-                    // parent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
-                    assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getParent() ) );
-
-                    // alternateParent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
-                    assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
-                }
-        );
-    }
-
-    @Test
-    @JiraKey( "HHH-11155" )
-    public void testUpdate(SessionFactoryScope scope) {
-        Parent p1New = new Parent();
-        p1New.nombre = "p1New";
-
-        scope.inTransaction(
-                (s) -> {
-                    SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getSessionFactory()
-                            .getSessionFactoryOptions()
-                            .getStatementInspector();
-                    statementInspector.clear();
-
-                    final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
-                            .setParameter( "name", "steve" )
-                            .uniqueResult();
-                    statementInspector.assertExecutedCount( 1 );
-
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
-
-                    assertFalse( Hibernate.isPropertyInitialized( c1, "nickName" ) );
+	@Test
+	@JiraKey( "HHH-10267" )
+	public void testAccess(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(s) -> {
+					SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getSessionFactory()
+							.getSessionFactoryOptions()
+							.getStatementInspector();
+					statementInspector.clear();
+
+					final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
+							.setParameter( "name", "steve" )
+							.uniqueResult();
+
+					statementInspector.assertExecutedCount( 1 );
+
+					assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
+
+					assertFalse( Hibernate.isPropertyInitialized( c1, "nickName" ) );
+
+					// parent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
+					assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getParent() ) );
+
+					// alternateParent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
+					assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
+
+					// Now lets access nickName which ought to initialize nickName
+					c1.getNickName();
+					statementInspector.assertExecutedCount( 2 );
+
+					assertTrue( Hibernate.isPropertyInitialized( c1, "nickName" ) );
+
+					// parent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
+					assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getParent() ) );
+
+					// alternateParent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
+					assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey( "HHH-11155" )
+	public void testUpdate(SessionFactoryScope scope) {
+		Parent p1New = new Parent();
+		p1New.nombre = "p1New";
+
+		scope.inTransaction(
+				(s) -> {
+					SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getSessionFactory()
+							.getSessionFactoryOptions()
+							.getStatementInspector();
+					statementInspector.clear();
+
+					final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
+							.setParameter( "name", "steve" )
+							.uniqueResult();
+					statementInspector.assertExecutedCount( 1 );
+
+					assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
+
+					assertFalse( Hibernate.isPropertyInitialized( c1, "nickName" ) );
 
-                    // parent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
-                    assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getParent() ) );
-
-                    // alternateParent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
-                    assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
-
-                    // Now lets update nickName
-                    c1.nickName = "new nickName";
-
-                    statementInspector.assertExecutedCount( 1 );
-
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
-
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "nickName" ) );
-
-                    // parent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
-                    assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getParent() ) );
-
-                    // alternateParent should be an uninitialized enhanced-proxy
-                    assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
-                    assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
-                    assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
-
-                    // Now update c1.parent
-                    c1.parent.children.remove( c1 );
-                    c1.parent = p1New;
-                    p1New.children.add( c1 );
-                }
-        );
-
-        // verify updates
-        scope.inTransaction(
-                (s) -> {
-                    final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
-                            .setParameter( "name", "steve" )
-                            .uniqueResult();
+					// parent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
+					assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getParent() ) );
+
+					// alternateParent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
+					assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
+
+					// Now lets update nickName
+					c1.nickName = "new nickName";
+
+					statementInspector.assertExecutedCount( 1 );
+
+					assertTrue( Hibernate.isPropertyInitialized( c1, "name" ) );
+
+					assertTrue( Hibernate.isPropertyInitialized( c1, "nickName" ) );
+
+					// parent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "parent" ) );
+					assertThat( c1.getParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getParent() ) );
+
+					// alternateParent should be an uninitialized enhanced-proxy
+					assertTrue( Hibernate.isPropertyInitialized( c1, "alternateParent" ) );
+					assertThat( c1.getAlternateParent() ).isNotInstanceOf( HibernateProxy.class );
+					assertFalse( Hibernate.isInitialized( c1.getAlternateParent() ) );
+
+					// Now update c1.parent
+					c1.parent.children.remove( c1 );
+					c1.parent = p1New;
+					p1New.children.add( c1 );
+				}
+		);
+
+		// verify updates
+		scope.inTransaction(
+				(s) -> {
+					final Child c1 = s.createQuery( "from Child c where c.name = :name", Child.class )
+							.setParameter( "name", "steve" )
+							.uniqueResult();
 
-                    assertThat( c1.getNickName() ).isEqualTo( "new nickName" );
-                    assertThat( c1.parent.nombre ).isEqualTo( "p1New" );
-                }
-        );
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.createQuery( "delete Child" ).executeUpdate();
-            s.createQuery( "delete Parent" ).executeUpdate();
-        } );
-    }
-
-    // --- //
-
-    // --- //
-
-    @Entity( name = "Parent" )
-    @Table( name = "PARENT" )
-    static class Parent {
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
-
-        String nombre;
-
-        @OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List children = new ArrayList<>();
-
-        @OneToMany( mappedBy = "alternateParent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List alternateChildren = new ArrayList<>();
-
-        Parent() {
-        }
-
-        Parent(String nombre) {
-            this.nombre = nombre;
-        }
-    }
+					assertThat( c1.getNickName() ).isEqualTo( "new nickName" );
+					assertThat( c1.parent.nombre ).isEqualTo( "p1New" );
+				}
+		);
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.createQuery( "delete Child" ).executeUpdate();
+			s.createQuery( "delete Parent" ).executeUpdate();
+		} );
+	}
+
+	// --- //
+
+	// --- //
+
+	@Entity( name = "Parent" )
+	@Table( name = "PARENT" )
+	static class Parent {
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
+
+		String nombre;
+
+		@OneToMany( mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List children = new ArrayList<>();
+
+		@OneToMany( mappedBy = "alternateParent", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List alternateChildren = new ArrayList<>();
+
+		Parent() {
+		}
+
+		Parent(String nombre) {
+			this.nombre = nombre;
+		}
+	}
 
-    @Entity( name = "Child" )
-    @Table( name = "CHILD" )
-    static class Child {
+	@Entity( name = "Child" )
+	@Table( name = "CHILD" )
+	static class Child {
 
-        @Id
-        @GeneratedValue( strategy = GenerationType.AUTO )
-        Long id;
+		@Id
+		@GeneratedValue( strategy = GenerationType.AUTO )
+		Long id;
 
-        String name;
+		String name;
 
-        @Basic( fetch = FetchType.LAZY )
-        String nickName;
+		@Basic( fetch = FetchType.LAZY )
+		String nickName;
 
-        @ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        Parent parent;
+		@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		Parent parent;
 
-        @ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        @LazyGroup( "SECONDARY" )
-        Parent alternateParent;
+		@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		@LazyGroup( "SECONDARY" )
+		Parent alternateParent;
 
-        Child() {
-        }
+		Child() {
+		}
 
-        Child(String name, String nickName) {
-            this.name = name;
-            this.nickName = nickName;
-        }
+		Child(String name, String nickName) {
+			this.name = name;
+			this.nickName = nickName;
+		}
 
-        public Parent getParent() {
-            return parent;
-        }
-
-        Parent getAlternateParent() {
-            return alternateParent;
-        }
-
-        String getNickName() {
-            return nickName;
-        }
-    }
+		public Parent getParent() {
+			return parent;
+		}
+
+		Parent getAlternateParent() {
+			return alternateParent;
+		}
+
+		String getNickName() {
+			return nickName;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateTest.java
index f30785ca54ac..92c1be459918 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateToNullTest.java
index af0ec542fa0c..0b6b15346ada 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateToNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/MultiLazyBasicInLazyGroupUpdateToNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateTest.java
index de942410b6c9..d171e40f5cf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateToNullTest.java
index 593d206df945..ee7138d466b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateToNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/OnlyLazyBasicInLazyGroupBasicUpdateToNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java
index 69f9540356f1..cbd1831c3e73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
@@ -40,111 +38,111 @@
 @JiraKey("HHH-11155")
 @JiraKey("HHH-11506")
 @DomainModel(
-        annotatedClasses = {
-                SimpleLazyGroupUpdateTest.TestEntity.class
-        }
+		annotatedClasses = {
+				SimpleLazyGroupUpdateTest.TestEntity.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false"),
-                @Setting(name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true"),
-        }
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false"),
+				@Setting(name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true"),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 @CustomEnhancementContext({ EnhancerTestContext.class, SimpleLazyGroupUpdateTest.NoDirtyCheckingContext.class })
 public class SimpleLazyGroupUpdateTest {
 
-    public static final String REALLY_BIG_STRING = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new TestEntity( 1L, "entity 1", "blah", REALLY_BIG_STRING ) );
-        } );
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            TestEntity entity = s.get( TestEntity.class, 1L );
-            assertLoaded( entity, "name" );
-            assertNotLoaded( entity, "lifeStory" );
-            assertNotLoaded( entity, "reallyBigString" );
-
-            entity.lifeStory = "blah blah blah";
-            assertLoaded( entity, "name" );
-            assertLoaded( entity, "lifeStory" );
-            assertNotLoaded( entity, "reallyBigString" );
-        } );
-
-        scope.inTransaction( s -> {
-            TestEntity entity = s.get( TestEntity.class, 1L );
-
-            assertLoaded( entity, "name" );
-            assertNotLoaded( entity, "lifeStory" );
-            assertNotLoaded( entity, "reallyBigString" );
-            assertEquals( "blah blah blah", entity.lifeStory );
-            assertEquals( REALLY_BIG_STRING, entity.reallyBigString );
-        } );
-    }
-
-    private void assertLoaded(Object owner, String name) {
-        // NOTE we assume null == not-loaded
-        Object fieldByReflection = getFieldByReflection( owner, name );
-        assertNotNull( fieldByReflection, "Expecting field '" + name + "' to be loaded, but it was not" );
-    }
-
-    private void assertNotLoaded(Object owner, String name) {
-        // NOTE we assume null == not-loaded
-        Object fieldByReflection = getFieldByReflection( owner, name );
-        assertNull( fieldByReflection, "Expecting field '" + name + "' to be not loaded, but it was" );
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.createQuery( "delete TestEntity" ).executeUpdate();
-        } );
-    }
-
-    // --- //
-
-    @Entity( name = "TestEntity" )
-    @Table( name = "TEST_ENTITY" )
-    static class TestEntity {
-
-        @Id
-        Long id;
-
-        String name;
-
-        @Basic( fetch = FetchType.LAZY )
-        @LazyGroup( "grp1" )
-        String lifeStory;
-
-        @Basic( fetch = FetchType.LAZY )
-        @LazyGroup( "grp2" )
-        String reallyBigString;
-
-        TestEntity() {
-        }
-
-        TestEntity(Long id, String name, String lifeStory, String reallyBigString) {
-            this.id = id;
-            this.name = name;
-            this.lifeStory = lifeStory;
-            this.reallyBigString = reallyBigString;
-        }
-    }
-
-    // --- //
-
-    public static class NoDirtyCheckingContext extends EnhancerTestContext {
-
-        @Override
-        public boolean doDirtyCheckingInline(UnloadedClass classDescriptor) {
-            return false;
-        }
-    }
+	public static final String REALLY_BIG_STRING = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new TestEntity( 1L, "entity 1", "blah", REALLY_BIG_STRING ) );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TestEntity entity = s.get( TestEntity.class, 1L );
+			assertLoaded( entity, "name" );
+			assertNotLoaded( entity, "lifeStory" );
+			assertNotLoaded( entity, "reallyBigString" );
+
+			entity.lifeStory = "blah blah blah";
+			assertLoaded( entity, "name" );
+			assertLoaded( entity, "lifeStory" );
+			assertNotLoaded( entity, "reallyBigString" );
+		} );
+
+		scope.inTransaction( s -> {
+			TestEntity entity = s.get( TestEntity.class, 1L );
+
+			assertLoaded( entity, "name" );
+			assertNotLoaded( entity, "lifeStory" );
+			assertNotLoaded( entity, "reallyBigString" );
+			assertEquals( "blah blah blah", entity.lifeStory );
+			assertEquals( REALLY_BIG_STRING, entity.reallyBigString );
+		} );
+	}
+
+	private void assertLoaded(Object owner, String name) {
+		// NOTE we assume null == not-loaded
+		Object fieldByReflection = getFieldByReflection( owner, name );
+		assertNotNull( fieldByReflection, "Expecting field '" + name + "' to be loaded, but it was not" );
+	}
+
+	private void assertNotLoaded(Object owner, String name) {
+		// NOTE we assume null == not-loaded
+		Object fieldByReflection = getFieldByReflection( owner, name );
+		assertNull( fieldByReflection, "Expecting field '" + name + "' to be not loaded, but it was" );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.createQuery( "delete TestEntity" ).executeUpdate();
+		} );
+	}
+
+	// --- //
+
+	@Entity( name = "TestEntity" )
+	@Table( name = "TEST_ENTITY" )
+	static class TestEntity {
+
+		@Id
+		Long id;
+
+		String name;
+
+		@Basic( fetch = FetchType.LAZY )
+		@LazyGroup( "grp1" )
+		String lifeStory;
+
+		@Basic( fetch = FetchType.LAZY )
+		@LazyGroup( "grp2" )
+		String reallyBigString;
+
+		TestEntity() {
+		}
+
+		TestEntity(Long id, String name, String lifeStory, String reallyBigString) {
+			this.id = id;
+			this.name = name;
+			this.lifeStory = lifeStory;
+			this.reallyBigString = reallyBigString;
+		}
+	}
+
+	// --- //
+
+	public static class NoDirtyCheckingContext extends EnhancerTestContext {
+
+		@Override
+		public boolean doDirtyCheckingInline(UnloadedClass classDescriptor) {
+			return false;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java
index c81081c46c65..9439520c3781 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java
index 1298f8947c9c..cd52e708091c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java
index 984f9de7eb3c..09e31bebbc04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/package-info.java
index 942f39d72dcb..c939e4bbe036 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/package-info.java
@@ -14,4 +14,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
\ No newline at end of file
+package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/AbstractKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/AbstractKey.java
index 273f9ca756cd..0ec3dedbc423 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/AbstractKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/AbstractKey.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Activity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Activity.java
index 65c336b74924..d8deab3d2397 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Activity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Activity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Address.java
index 06f7e90f16d7..d52aeb180d68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BaseEntity.java
index 0f866e34a2a2..43174fab4941 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java
index 63dd5bf9130d..a8eff7385e97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java
index 35106f085757..1403e79fa65d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java
index ea2710cf6249..26857b986752 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java
index 5341c84fd57c..906736863c2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Customer.java
index b732adff25f0..5e7e6b5fa392 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java
index 61786e8a61b1..b116c2087263 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java
index 700814b41723..b8cb6b74b9f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java
index 6d95ddaaf19b..ebb9b812f184 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java
index b8fa7672618b..c37cd4e1c80c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EagerOneToOneMappedByInDoubleEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EagerOneToOneMappedByInDoubleEmbeddedTest.java
index 83b90e781599..d9c42cdfea2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EagerOneToOneMappedByInDoubleEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EagerOneToOneMappedByInDoubleEmbeddedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java
index c570e1b592e0..731aed27de81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java
index d92e1ea99a9d..e3771c15c8f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java
index aa3aaa73ce02..5de0d251f655 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
-import org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.Customer;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/GenericKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/GenericKey.java
index eb0eaea32829..50cae714828e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/GenericKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/GenericKey.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/IdClassEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/IdClassEntityGraphTest.java
index ccb6a7df9733..6fe4b4d8d2ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/IdClassEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/IdClassEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Instruction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Instruction.java
index aeadd3df8dbb..c6f1625fec60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Instruction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Instruction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java
index a68b3e3aa1e7..5c2bdd542339 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java
index 169062a0b4d2..a91ad31d6e5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java
index d975c2f0f9db..6e9f1baded9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInDoubleEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInDoubleEmbeddedTest.java
index 2e70ba905651..1c2ad29117fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInDoubleEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInDoubleEmbeddedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInEmbeddedTest.java
index 3ca6bce570a6..6b745332554a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByInEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByTest.java
index f27509da1161..0cdedfe0ad2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMultiAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMultiAssociationTest.java
index c1225c188bfc..3df5e47a3549 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMultiAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyOneToOneMultiAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyProxyBytecodeEnhancementCollectionInitializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyProxyBytecodeEnhancementCollectionInitializationTest.java
index e396c67f4a14..1fbf030328ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyProxyBytecodeEnhancementCollectionInitializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyProxyBytecodeEnhancementCollectionInitializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java
index 685d0b396714..a667a1c31a68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
@@ -193,7 +191,7 @@ public void cleanUpTestData(SessionFactoryScope scope) {
 	@Entity(name = "Animal")
 	@Table(name = "Animal")
 	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-    public static abstract class Animal {
+	public static abstract class Animal {
 
 		@Id
 		private String name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java
index 03947c2b82b7..d16aba9ca155 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
@@ -193,7 +191,7 @@ public void cleanUpTestData(SessionFactoryScope scope) {
 	@Entity(name = "Animal")
 	@Table(name = "Animal")
 	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-    public static abstract class Animal {
+	public static abstract class Animal {
 
 		@Id
 		private String name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java
index 2f0b6e03cd57..1abc7a146cbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
@@ -96,7 +94,7 @@ public void mergeUpdatedHibernateProxy(SessionFactoryScope scope) {
 
 		withInitializedHibernateProxy.getHuman().setAge( 2 );
 
-		scope.inTransaction( 
+		scope.inTransaction(
 				session -> {
 					final OtherEntity otherEntity = session.get( OtherEntity.class, "test1" );
 					assertEquals( 1, stats.getPrepareStatementCount() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java
index 4a6bd8798aeb..0c138986f17b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java
index 8377ed64ff06..4e92a4120b9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java
index 75cd70e4ea87..cd0c01451614 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
index 3645f9af852f..c812ba4251c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
index 5561348e4aeb..432b56132ffa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
index 8091acd64f3f..668f723a5e9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java
index 60ee9be95e0e..a0181cf32412 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java
index 61e8297981bf..5f98a02e2a52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java
index f255ea83dd2d..3d1fd07976e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java
index 37d5a328f2ca..de8edb4082aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java
index a6f77e823e02..1651921ef6e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
@@ -218,4 +216,4 @@ public void cleanUpTestData(SessionFactoryScope scope) {
 				}
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ModelEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ModelEntity.java
index f2e4800d9b95..de2ef88f6a22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ModelEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ModelEntity.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java
index 7223e69b959a..aa0717df8c72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java
index 82f2fbb87d87..e4fa85ad5fc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
index 7986f5cb6e5d..a95968bdd322 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import org.hibernate.Hibernate;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.model.internal.ToOneBinder;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.internal.EntityRepresentationStrategyPojoStandard;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Order.java
index 89e9b953620e..a79cf580ed88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java
index 856a763946fe..902dc506550b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java
index 2f00874f715f..83a2f5aa055a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Payment.java
index 50c00850ed06..2ac0cacb7637 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Payment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java
index f87794102143..ac9a55a4c70c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java
index 28ab9a5bd8f4..159544d48715 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java
index adcf4da863a3..aae838e32cba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java
index 80547a347e1b..de16073de0f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java
index 4be998f7e45e..5dd1922d535c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
index e5d1eda6c285..27a8cbac8ab7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/RoleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/RoleEntity.java
index fb5af857f3d6..4f744cc59936 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/RoleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/RoleEntity.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java
index 22cd522a4a19..f3e6a2299793 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java
index 8fa13df247c3..dd49b44926d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java
index c99097387966..3cc664106c1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java
index 622e56a9d817..96a8d5856c55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java
index 0d900e666550..41c66b1112c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java
index 535814bb8a9d..b6032bafa914 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java
index 23dd5cc875f2..88f1aeecaeca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/WebApplication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/WebApplication.java
index 1dac7f01b260..3029246ced84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/WebApplication.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/WebApplication.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/batch/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/batch/BatchingTest.java
index 0675ff8b98a9..c9f5e907b7b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/batch/BatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/batch/BatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/CrossPackageMappedSuperclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/CrossPackageMappedSuperclassWithEmbeddableTest.java
index 2e5b72e00ef6..323a5a5e3ff7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/CrossPackageMappedSuperclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/CrossPackageMappedSuperclassWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.crosspackage;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/BaseEntity.java
index 3cdea43ec61b..7b529f0d292a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/BaseEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.crosspackage.base;
 
 import jakarta.persistence.Embedded;
@@ -8,26 +12,26 @@
 @MappedSuperclass
 public abstract class BaseEntity {
 
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @Embedded
-    protected EmbeddableType embeddedField;
+	@Embedded
+	protected EmbeddableType embeddedField;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(final Long id) {
-        this.id = id;
-    }
+	public void setId(final Long id) {
+		this.id = id;
+	}
 
-    public EmbeddableType getEmbeddedField() {
-        return embeddedField;
-    }
+	public EmbeddableType getEmbeddedField() {
+		return embeddedField;
+	}
 
-    public void setEmbeddedField(final EmbeddableType embeddedField) {
-        this.embeddedField = embeddedField;
-    }
+	public void setEmbeddedField(final EmbeddableType embeddedField) {
+		this.embeddedField = embeddedField;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/EmbeddableType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/EmbeddableType.java
index e500dff81f50..a5f9bfba3088 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/EmbeddableType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/base/EmbeddableType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.crosspackage.base;
 
 import jakarta.persistence.Column;
@@ -6,14 +10,14 @@
 @Embeddable
 public class EmbeddableType {
 
-    @Column
-    private String field;
+	@Column
+	private String field;
 
-    public String getField() {
-        return field;
-    }
+	public String getField() {
+		return field;
+	}
 
-    public void setField(final String field) {
-        this.field = field;
-    }
+	public void setField(final String field) {
+		this.field = field;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/derived/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/derived/TestEntity.java
index 39cf576960a3..e912713ac3f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/derived/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/crosspackage/derived/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.crosspackage.derived;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java
index 9a65f734e7c1..0e9d275d51f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java
index 7df3ab38bb6b..ba998ffa26e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckEnhancementContext.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckEnhancementContext.java
index 8b0c2ac63135..020384d15673 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckEnhancementContext.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckEnhancementContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java
index 76508cd1d015..ed9f4da61961 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
index de7eb1c95c26..ae153197b21f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
index c65572326f4d..442eeb026171 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java
index cec36c1cd6fa..3e7ca65a3dd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
@@ -81,50 +79,50 @@ public void setUp(SessionFactoryScope scope) {
 	@Test
 	public void testLoadAfterNativeQueryExecution(SessionFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-					 BankAccount account = entityManager.find( BankAccount.class, 1L );
+					BankAccount account = entityManager.find( BankAccount.class, 1L );
 
-					 Query nativeQuery = entityManager.createNativeQuery( "SELECT ID FROM BANK" );
-					 nativeQuery.getResultList();
+					Query nativeQuery = entityManager.createNativeQuery( "SELECT ID FROM BANK" );
+					nativeQuery.getResultList();
 
-					 Bank bank = account.getBank();
-					 List deps = bank.getDepartments();
+					Bank bank = account.getBank();
+					List deps = bank.getDepartments();
 
-					 assertEquals( deps.size(), 3 );
-				 }
+					assertEquals( deps.size(), 3 );
+				}
 		);
 	}
 
 	@Test
 	public void testLoadAfterFlush(SessionFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-					 BankAccount account = entityManager.find( BankAccount.class, 1L );
+					BankAccount account = entityManager.find( BankAccount.class, 1L );
 
-					 entityManager.flush();
+					entityManager.flush();
 
-					 Bank bank = account.getBank();
-					 List deps = bank.getDepartments();
+					Bank bank = account.getBank();
+					List deps = bank.getDepartments();
 
-					 assertEquals( deps.size(), 3 );
-				 }
+					assertEquals( deps.size(), 3 );
+				}
 		);
 	}
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-					 Bank bank = entityManager.find( Bank.class, 1L );
-					 bank.getDepartments().forEach(
-							 department -> entityManager.remove( department )
-					 );
-					 bank.getDepartments().clear();
-					 List accounts = entityManager.createQuery( "from BankAccount" ).getResultList();
-
-					 accounts.forEach(
-							 account -> entityManager.remove( account )
-					 );
-
-					 entityManager.remove( bank );
-				 }
+					Bank bank = entityManager.find( Bank.class, 1L );
+					bank.getDepartments().forEach(
+							department -> entityManager.remove( department )
+					);
+					bank.getDepartments().clear();
+					List accounts = entityManager.createQuery( "from BankAccount" ).getResultList();
+
+					accounts.forEach(
+							account -> entityManager.remove( account )
+					);
+
+					entityManager.remove( bank );
+				}
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java
index d2d9926cc837..4cb1b8b44910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
 import java.util.ArrayList;
@@ -27,7 +31,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java
index da941482e9fd..e709b470dfbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java
index e17c27dfc43e..4d8899342baf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/NoDirtyCheckEnhancementContext.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/NoDirtyCheckEnhancementContext.java
index f4e5a766dcae..9a521e28c71d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/NoDirtyCheckEnhancementContext.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/NoDirtyCheckEnhancementContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java
index 9a5111d8d4b7..0a5a7fd4298f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java
index b17a50343042..5de768d98f28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
index 62e78ffe5a54..38c8cf048097 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
@@ -307,4 +305,3 @@ public void setState(String state) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java
index ac58435961c9..3cd696bd81cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java
index 48c11dee742a..abaaf0e2167d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java
index 8273ba814166..16cba9a72124 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
index 2a4e93dcfa18..83d9ac9c96a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java
index 2094c09a210c..35fc861e5db7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java
index 9e5017806c82..ee8e88ae19be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java
index 75b038d9d093..d2c704158c2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java
index f970cc895305..b2828a92db5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazyCache;
 
@@ -50,52 +48,52 @@
  * @author Steve EbersolenPropertyRefTest
  */
 @DomainModel(
-        annotatedClasses = {
-                InitFromCacheTest.Document.class
-        }
+		annotatedClasses = {
+				InitFromCacheTest.Document.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
-                @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
+				@Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class InitFromCacheTest {
 
-    private EntityPersister persister;
-
-    private Long documentID;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        persister = scope.getSessionFactory().getRuntimeMetamodels()
-                .getMappingMetamodel()
-                .getEntityDescriptor( Document.class );
-        assertTrue( persister.hasCache() );
-
-        scope.inTransaction( s -> {
-            Document document = new Document( "HiA", "Hibernate book", "Hibernate is...." );
-            s.persist( document );
-            documentID = document.id;
-        } );
-    }
-
-    @Test
-    public void execute(SessionFactoryScope scope) {
-       scope.inTransaction( s -> {
-                    final RootGraph entityGraph = s.createEntityGraph( Document.class );
-                    entityGraph.addAttributeNodes( "text", "summary" );
-                    final Document document = s.createQuery( "from Document", Document.class )
-                            .setHint( HINT_SPEC_FETCH_GRAPH, entityGraph )
-                            .uniqueResult();
+	private EntityPersister persister;
+
+	private Long documentID;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		persister = scope.getSessionFactory().getRuntimeMetamodels()
+				.getMappingMetamodel()
+				.getEntityDescriptor( Document.class );
+		assertTrue( persister.hasCache() );
+
+		scope.inTransaction( s -> {
+			Document document = new Document( "HiA", "Hibernate book", "Hibernate is...." );
+			s.persist( document );
+			documentID = document.id;
+		} );
+	}
+
+	@Test
+	public void execute(SessionFactoryScope scope) {
+	scope.inTransaction( s -> {
+					final RootGraph entityGraph = s.createEntityGraph( Document.class );
+					entityGraph.addAttributeNodes( "text", "summary" );
+					final Document document = s.createQuery( "from Document", Document.class )
+							.setHint( HINT_SPEC_FETCH_GRAPH, entityGraph )
+							.uniqueResult();
 					assertTrue( isPropertyInitialized( document, "text" ) );
 					assertTrue( isPropertyInitialized( document, "summary" ) );
 
 					final EntityDataAccess entityDataAccess = persister.getCacheAccessStrategy();
 					final Object cacheKey = entityDataAccess.generateCacheKey(
-                            document.id,
+							document.id,
 							persister,
 							scope.getSessionFactory(),
 							null
@@ -103,69 +101,69 @@ public void execute(SessionFactoryScope scope) {
 					final Object cachedItem = entityDataAccess.get( (SharedSessionContractImplementor) s, cacheKey );
 					assertNotNull( cachedItem );
 					assertTyping( StandardCacheEntryImpl.class, cachedItem );
-                }
-        );
+				}
+		);
 
-        scope.getSessionFactory().getStatistics().clear();
+		scope.getSessionFactory().getStatistics().clear();
 
-        scope.inTransaction( s -> {
-            CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-            CriteriaQuery criteria = criteriaBuilder.createQuery( Document.class );
-            criteria.from( Document.class );
-            Document d = s.createQuery( criteria ).uniqueResult();
+		scope.inTransaction( s -> {
+			CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
+			CriteriaQuery criteria = criteriaBuilder.createQuery( Document.class );
+			criteria.from( Document.class );
+			Document d = s.createQuery( criteria ).uniqueResult();
 //            Document d = (Document) s.createCriteria( Document.class ).uniqueResult();
-            assertFalse( isPropertyInitialized( d, "text" ) );
-            assertFalse( isPropertyInitialized( d, "summary" ) );
-            assertEquals( "Hibernate is....", d.text );
-            assertTrue( isPropertyInitialized( d, "text" ) );
-            assertTrue( isPropertyInitialized( d, "summary" ) );
-        } );
-
-        assertEquals( 2, scope.getSessionFactory().getStatistics().getPrepareStatementCount() );
-
-        scope.inTransaction( s -> {
-            Document d = s.get( Document.class, documentID );
-            assertFalse( isPropertyInitialized( d, "text" ) );
-            assertFalse( isPropertyInitialized( d, "summary" ) );
-        } );
-    }
-
-    // --- //
-
-    @Entity( name = "Document" )
-    @Table( name = "DOCUMENT" )
-    @Cacheable
-    @Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy", region = "foo" )
-    static class Document {
-
-        @Id
-        @GeneratedValue
-        Long id;
-
-        String name;
-
-        @Basic( fetch = FetchType.LAZY )
-        @Formula( "upper(name)" )
-        String upperCaseName;
-
-        @Basic( fetch = FetchType.LAZY )
-        String summary;
-
-        @Basic( fetch = FetchType.LAZY )
-        String text;
-
-        @Basic( fetch = FetchType.LAZY )
-        Date lastTextModification;
-
-        Document() {
-        }
-
-        Document(String name, String summary, String text) {
-            this.lastTextModification = new Date();
-            this.name = name;
-            this.upperCaseName = name.toUpperCase( Locale.ROOT );
-            this.summary = summary;
-            this.text = text;
-        }
-    }
+			assertFalse( isPropertyInitialized( d, "text" ) );
+			assertFalse( isPropertyInitialized( d, "summary" ) );
+			assertEquals( "Hibernate is....", d.text );
+			assertTrue( isPropertyInitialized( d, "text" ) );
+			assertTrue( isPropertyInitialized( d, "summary" ) );
+		} );
+
+		assertEquals( 2, scope.getSessionFactory().getStatistics().getPrepareStatementCount() );
+
+		scope.inTransaction( s -> {
+			Document d = s.get( Document.class, documentID );
+			assertFalse( isPropertyInitialized( d, "text" ) );
+			assertFalse( isPropertyInitialized( d, "summary" ) );
+		} );
+	}
+
+	// --- //
+
+	@Entity( name = "Document" )
+	@Table( name = "DOCUMENT" )
+	@Cacheable
+	@Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy", region = "foo" )
+	static class Document {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String name;
+
+		@Basic( fetch = FetchType.LAZY )
+		@Formula( "upper(name)" )
+		String upperCaseName;
+
+		@Basic( fetch = FetchType.LAZY )
+		String summary;
+
+		@Basic( fetch = FetchType.LAZY )
+		String text;
+
+		@Basic( fetch = FetchType.LAZY )
+		Date lastTextModification;
+
+		Document() {
+		}
+
+		Document(String name, String summary, String text) {
+			this.lastTextModification = new Date();
+			this.name = name;
+			this.upperCaseName = name.toUpperCase( Locale.ROOT );
+			this.summary = summary;
+			this.text = text;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/locking/OptimisticLockTypeDirtyWithLazyOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/locking/OptimisticLockTypeDirtyWithLazyOneToOneTest.java
index 47a41d490394..707b2d280055 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/locking/OptimisticLockTypeDirtyWithLazyOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/locking/OptimisticLockTypeDirtyWithLazyOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java
index 7d9abf776e95..9da752f2d54c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
@@ -34,111 +32,111 @@
  * @author Luis Barreiro
  */
 @DomainModel(
-        annotatedClasses = {
-            CompositeMergeTest.ParentEntity.class, CompositeMergeTest.Address.class, CompositeMergeTest.Country.class
-        }
+		annotatedClasses = {
+			CompositeMergeTest.ParentEntity.class, CompositeMergeTest.Address.class, CompositeMergeTest.Country.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class CompositeMergeTest {
 
-    private long entityId;
+	private long entityId;
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        ParentEntity parent = new ParentEntity();
-        parent.description = "desc";
-        parent.address = new Address();
-        parent.address.street = "Sesame street";
-        parent.address.country = new Country();
-        parent.address.country.name = "Suriname";
-        parent.address.country.languages = Arrays.asList( "english", "spanish" );
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		ParentEntity parent = new ParentEntity();
+		parent.description = "desc";
+		parent.address = new Address();
+		parent.address.street = "Sesame street";
+		parent.address.country = new Country();
+		parent.address.country.name = "Suriname";
+		parent.address.country.languages = Arrays.asList( "english", "spanish" );
 
-        parent.lazyField = new byte[100];
+		parent.lazyField = new byte[100];
 
-        scope.inTransaction( s -> {
-            s.persist( parent );
-        } );
+		scope.inTransaction( s -> {
+			s.persist( parent );
+		} );
 
-        checkDirtyTracking( parent );
-        entityId = parent.id;
-    }
+		checkDirtyTracking( parent );
+		entityId = parent.id;
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        ParentEntity[] parent = new ParentEntity[3];
+	@Test
+	public void test(SessionFactoryScope scope) {
+		ParentEntity[] parent = new ParentEntity[3];
 
-        scope.inTransaction( s -> {
-            parent[0] = s.get( ParentEntity.class, entityId );
-        } );
+		scope.inTransaction( s -> {
+			parent[0] = s.get( ParentEntity.class, entityId );
+		} );
 
-        checkDirtyTracking( parent[0] );
+		checkDirtyTracking( parent[0] );
 
-        parent[0].address.country.name = "Paraguai";
+		parent[0].address.country.name = "Paraguai";
 
-        checkDirtyTracking( parent[0], "address.country" );
+		checkDirtyTracking( parent[0], "address.country" );
 
-        scope.inTransaction( s -> {
-            parent[1] = (ParentEntity) s.merge( parent[0] );
-            checkDirtyTracking( parent[0], "address.country" );
-            checkDirtyTracking( parent[1], "address.country" );
-        } );
+		scope.inTransaction( s -> {
+			parent[1] = (ParentEntity) s.merge( parent[0] );
+			checkDirtyTracking( parent[0], "address.country" );
+			checkDirtyTracking( parent[1], "address.country" );
+		} );
 
-        checkDirtyTracking( parent[0], "address.country" );
-        checkDirtyTracking( parent[1] );
+		checkDirtyTracking( parent[0], "address.country" );
+		checkDirtyTracking( parent[1] );
 
-        parent[1].address.country.name = "Honduras";
+		parent[1].address.country.name = "Honduras";
 
-        checkDirtyTracking( parent[1], "address.country" );
+		checkDirtyTracking( parent[1], "address.country" );
 
-        scope.inTransaction( s -> {
-            s.merge( parent[1] );
-            checkDirtyTracking( parent[1], "address.country" );
-        } );
+		scope.inTransaction( s -> {
+			s.merge( parent[1] );
+			checkDirtyTracking( parent[1], "address.country" );
+		} );
 
-        scope.inTransaction( s -> {
-            parent[2] = s.get( ParentEntity.class, entityId );
-            assertEquals( "Honduras", parent[2].address.country.name );
-        } );
-    }
+		scope.inTransaction( s -> {
+			parent[2] = s.get( ParentEntity.class, entityId );
+			assertEquals( "Honduras", parent[2].address.country.name );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity(name = "Parent")
-    @Table( name = "PARENT_ENTITY" )
-    static class ParentEntity {
+	@Entity(name = "Parent")
+	@Table( name = "PARENT_ENTITY" )
+	static class ParentEntity {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        String description;
+		String description;
 
-        @Embedded
-        Address address;
+		@Embedded
+		Address address;
 
-        @Basic( fetch = FetchType.LAZY )
-        byte[] lazyField;
-    }
+		@Basic( fetch = FetchType.LAZY )
+		byte[] lazyField;
+	}
 
-    @Embeddable
-    @Table( name = "ADDRESS" )
-    static class Address {
+	@Embeddable
+	@Table( name = "ADDRESS" )
+	static class Address {
 
-        String street;
+		String street;
 
-        @Embedded
-        Country country;
-    }
+		@Embedded
+		Country country;
+	}
 
-    @Embeddable
-    @Table( name = "COUNTRY" )
-    static class Country {
+	@Embeddable
+	@Table( name = "COUNTRY" )
+	static class Country {
 
-        String name;
+		String name;
 
-        @ElementCollection
-        @CollectionTable( name = "languages", joinColumns = @JoinColumn( name = "id", referencedColumnName = "id" ) )
-        List languages;
-    }
+		@ElementCollection
+		@CollectionTable( name = "languages", joinColumns = @JoinColumn( name = "id", referencedColumnName = "id" ) )
+		List languages;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeNullTest.java
index 319e95f68b81..84c8a4251aeb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
@@ -30,59 +28,59 @@
  * @author Luis Barreiro
  */
 @DomainModel(
-        annotatedClasses = {
-                CompositeNullTest.ParentEntity.class, CompositeNullTest.Address.class
-        }
+		annotatedClasses = {
+				CompositeNullTest.ParentEntity.class, CompositeNullTest.Address.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 @EnhancementOptions(lazyLoading = true, inlineDirtyChecking = true)
 public class CompositeNullTest {
 
-    private long entityId;
+	private long entityId;
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        ParentEntity parent = new ParentEntity();
-        parent.description = "Test";
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		ParentEntity parent = new ParentEntity();
+		parent.description = "Test";
 
-        scope.inTransaction( s -> {
-            s.persist( parent );
-        } );
+		scope.inTransaction( s -> {
+			s.persist( parent );
+		} );
 
-        entityId = parent.id;
-    }
+		entityId = parent.id;
+	}
 
-    @Test
-    @JiraKey("HHH-15730")
-    public void testNullComposite(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            ParentEntity parentEntity = s.find( ParentEntity.class, entityId );
-            assertNull( parentEntity.address );
-        } );
-    }
+	@Test
+	@JiraKey("HHH-15730")
+	public void testNullComposite(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			ParentEntity parentEntity = s.find( ParentEntity.class, entityId );
+			assertNull( parentEntity.address );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity(name = "Parent")
-    @Table( name = "PARENT_ENTITY" )
-    static class ParentEntity {
+	@Entity(name = "Parent")
+	@Table( name = "PARENT_ENTITY" )
+	static class ParentEntity {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        String description;
+		String description;
 
-        @Embedded
-        Address address;
-    }
+		@Embedded
+		Address address;
+	}
 
-    @Embeddable
-    @Table( name = "ADDRESS" )
-    static class Address {
+	@Embeddable
+	@Table( name = "ADDRESS" )
+	static class Address {
 
-        String street;
+		String street;
 
-    }
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java
index d9e2de124b95..920b7bf42406 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java
index 775c007a3082..53e418138067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java
index 1a64699a165d..ed69f95b52cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java
index 217b1097622a..ef7c036c8617 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java
index d91084947249..00ba35678fc2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
@@ -39,155 +37,155 @@
 @JiraKey( value = "HHH-11459" )
 @RunWith( BytecodeEnhancerRunner.class )
 public class MergeEnhancedEntityDynamicUpdateTest extends BaseCoreFunctionalTestCase {
-    private Person person;
-    @Override
-    public Class[] getAnnotatedClasses() {
-        return new Class[]{Person.class, PersonAddress.class, NullablePerson.class};
-    }
-
-    @Before
-    public void prepare() {
-        person = new Person( 1L, "Sam" );
-        doInHibernate( this::sessionFactory, s -> {
-            s.persist( person );
-        } );
-    }
-
-    @Test
-    public void testMerge() {
-        doInHibernate( this::sessionFactory, s -> {
-            Person entity = s.find( Person.class, 1L );
-            entity.name = "John";
-            try {
-                s.merge( entity );
-            } catch ( RuntimeException e ) {
-                fail( "Enhanced entity can't be merged: " + e.getMessage() );
-            }
-        } );
-    }
-
-    @Test
-    public void testRefresh() {
-        doInHibernate( this::sessionFactory, s -> {
-            Person entity = s.find( Person.class, 1L );
-            entity.name = "John";
-
-            s.refresh( entity );
+	private Person person;
+	@Override
+	public Class[] getAnnotatedClasses() {
+		return new Class[]{Person.class, PersonAddress.class, NullablePerson.class};
+	}
+
+	@Before
+	public void prepare() {
+		person = new Person( 1L, "Sam" );
+		doInHibernate( this::sessionFactory, s -> {
+			s.persist( person );
+		} );
+	}
+
+	@Test
+	public void testMerge() {
+		doInHibernate( this::sessionFactory, s -> {
+			Person entity = s.find( Person.class, 1L );
+			entity.name = "John";
+			try {
+				s.merge( entity );
+			} catch ( RuntimeException e ) {
+				fail( "Enhanced entity can't be merged: " + e.getMessage() );
+			}
+		} );
+	}
+
+	@Test
+	public void testRefresh() {
+		doInHibernate( this::sessionFactory, s -> {
+			Person entity = s.find( Person.class, 1L );
+			entity.name = "John";
+
+			s.refresh( entity );
 
 //            try {
 //                s.refresh( entity );
 //            } catch ( RuntimeException e ) {
 //                fail( "Enhanced entity can't be refreshed: " + e.getMessage() );
 //            }
-        } );
-    }
-
-    @Test
-    public void testMergeWithNullValues() {
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson nullablePerson = new NullablePerson( 1L, "Sam", 100 );
-            em.persist( nullablePerson );
-        } );
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson updated = em.find( NullablePerson.class, 1L );
-            assertThat( updated.name ).isEqualTo( "Sam" );
-            assertThat( updated.number ).isEqualTo( 100 );
-        } );
-
-        // only some properties are null
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson nullablePerson = new NullablePerson( 1L, "Joe", null );
-            em.merge( nullablePerson );
-        } );
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson updated = em.find( NullablePerson.class, 1L );
-            assertThat( updated.name ).isEqualTo( "Joe" );
-            assertThat( updated.number ).isNull();
-        } );
-
-        // all properties are null:
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson nullablePerson = new NullablePerson( 1L, null, null );
-            em.merge( nullablePerson );
-        } );
-        doInHibernate( this::sessionFactory, em -> {
-            NullablePerson updated = em.find( NullablePerson.class, 1L );
-            assertThat( updated.name ).isNull();
-            assertThat( updated.number ).isNull();
-        } );
-    }
-
-    @After
-    public void cleanup() {
-        doInHibernate( this::sessionFactory, s -> {
-            s.remove( person );
-        } );
-        doInHibernate( this::sessionFactory, s -> {
-            s.createQuery( "delete from NullablePerson" );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "PERSON" )
-    @DynamicUpdate
-    @DynamicInsert
-    private static class Person {
-
-        @Id
-        Long id;
-
-        @Column( name = "name", length = 10, nullable = false )
-        String name;
-
-        @OneToMany( fetch = FetchType.LAZY, mappedBy = "parent", orphanRemoval = true, cascade = CascadeType.ALL )
-        List details = new ArrayList<>();
-
-        Person() {
-        }
-
-        Person(Long id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
-    @Entity
-    @Table( name = "PERSON_ADDRESS" )
-    @DynamicUpdate
-    @DynamicInsert
-    private static class PersonAddress {
-
-        @Id
-        Long id;
-
-        @ManyToOne( optional = false, fetch = FetchType.LAZY )
-        Person parent;
-    }
-
-    @Entity(name = "NullablePerson")
-    @Table(name = "NULLABLE_PERSON")
-    @DynamicUpdate
-    @DynamicInsert
-    private static class NullablePerson {
-
-        @Id
-        Long id;
-
-        @Column
-        String name;
-
-        @Column(name = "NUMBER_COLUMN")
-        Integer number;
-
-        NullablePerson() {
-        }
-
-        NullablePerson(Long id, String name, Integer number) {
-            this.id = id;
-            this.name = name;
-            this.number = number;
-        }
-    }
+		} );
+	}
+
+	@Test
+	public void testMergeWithNullValues() {
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson nullablePerson = new NullablePerson( 1L, "Sam", 100 );
+			em.persist( nullablePerson );
+		} );
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson updated = em.find( NullablePerson.class, 1L );
+			assertThat( updated.name ).isEqualTo( "Sam" );
+			assertThat( updated.number ).isEqualTo( 100 );
+		} );
+
+		// only some properties are null
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson nullablePerson = new NullablePerson( 1L, "Joe", null );
+			em.merge( nullablePerson );
+		} );
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson updated = em.find( NullablePerson.class, 1L );
+			assertThat( updated.name ).isEqualTo( "Joe" );
+			assertThat( updated.number ).isNull();
+		} );
+
+		// all properties are null:
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson nullablePerson = new NullablePerson( 1L, null, null );
+			em.merge( nullablePerson );
+		} );
+		doInHibernate( this::sessionFactory, em -> {
+			NullablePerson updated = em.find( NullablePerson.class, 1L );
+			assertThat( updated.name ).isNull();
+			assertThat( updated.number ).isNull();
+		} );
+	}
+
+	@After
+	public void cleanup() {
+		doInHibernate( this::sessionFactory, s -> {
+			s.remove( person );
+		} );
+		doInHibernate( this::sessionFactory, s -> {
+			s.createQuery( "delete from NullablePerson" );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "PERSON" )
+	@DynamicUpdate
+	@DynamicInsert
+	private static class Person {
+
+		@Id
+		Long id;
+
+		@Column( name = "name", length = 10, nullable = false )
+		String name;
+
+		@OneToMany( fetch = FetchType.LAZY, mappedBy = "parent", orphanRemoval = true, cascade = CascadeType.ALL )
+		List details = new ArrayList<>();
+
+		Person() {
+		}
+
+		Person(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+
+	@Entity
+	@Table( name = "PERSON_ADDRESS" )
+	@DynamicUpdate
+	@DynamicInsert
+	private static class PersonAddress {
+
+		@Id
+		Long id;
+
+		@ManyToOne( optional = false, fetch = FetchType.LAZY )
+		Person parent;
+	}
+
+	@Entity(name = "NullablePerson")
+	@Table(name = "NULLABLE_PERSON")
+	@DynamicUpdate
+	@DynamicInsert
+	private static class NullablePerson {
+
+		@Id
+		Long id;
+
+		@Column
+		String name;
+
+		@Column(name = "NUMBER_COLUMN")
+		Integer number;
+
+		NullablePerson() {
+		}
+
+		NullablePerson(Long id, String name, Integer number) {
+			this.id = id;
+			this.name = name;
+			this.number = number;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java
index f02ace68f757..f7d356e262f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
@@ -34,53 +32,53 @@
  */
 @JiraKey( "HHH-11459" )
 @DomainModel(
-        annotatedClasses = {
-               MergeEnhancedEntityTest.Person.class,
+		annotatedClasses = {
+			MergeEnhancedEntityTest.Person.class,
 				MergeEnhancedEntityTest.PersonAddress.class,
 				MergeEnhancedEntityTest.NullablePerson.class
-        }
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class MergeEnhancedEntityTest {
-    private Person person;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        person = new Person( 1L, "Sam" );
-        scope.inTransaction( s -> {
-            s.persist( person );
-        } );
-    }
-
-    @Test
-    public void testMerge(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Person entity = s.find( Person.class, 1L );
-            entity.name = "John";
-            try {
-                s.merge( entity );
-            } catch ( RuntimeException e ) {
-                fail( "Enhanced entity can't be merged: " + e.getMessage() );
-            }
-        } );
-    }
-
-    @Test
-    public void testRefresh(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Person entity = s.find( Person.class, 1L );
-            entity.name = "John";
-
-            s.refresh( entity );
+	private Person person;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		person = new Person( 1L, "Sam" );
+		scope.inTransaction( s -> {
+			s.persist( person );
+		} );
+	}
+
+	@Test
+	public void testMerge(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Person entity = s.find( Person.class, 1L );
+			entity.name = "John";
+			try {
+				s.merge( entity );
+			} catch ( RuntimeException e ) {
+				fail( "Enhanced entity can't be merged: " + e.getMessage() );
+			}
+		} );
+	}
+
+	@Test
+	public void testRefresh(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Person entity = s.find( Person.class, 1L );
+			entity.name = "John";
+
+			s.refresh( entity );
 
 //            try {
 //                s.refresh( entity );
 //            } catch ( RuntimeException e ) {
 //                fail( "Enhanced entity can't be refreshed: " + e.getMessage() );
 //            }
-        } );
-    }
+		} );
+	}
 
 	@Test
 	public void testMergeWithNullValues(SessionFactoryScope scope) {
@@ -117,71 +115,71 @@ public void testMergeWithNullValues(SessionFactoryScope scope) {
 		} );
 	}
 
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.remove( person );
-        } );
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.remove( person );
+		} );
 		scope.inTransaction( s -> {
-            s.createQuery( "delete from NullablePerson" );
-        } );
-    }
+			s.createQuery( "delete from NullablePerson" );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "PERSON" )
-    static class Person {
+	@Entity
+	@Table( name = "PERSON" )
+	static class Person {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @Column( name = "name", length = 10, nullable = false )
-        String name;
+		@Column( name = "name", length = 10, nullable = false )
+		String name;
 
-        @OneToMany( fetch = FetchType.LAZY, mappedBy = "parent", orphanRemoval = true, cascade = CascadeType.ALL )
-        List details = new ArrayList<>();
+		@OneToMany( fetch = FetchType.LAZY, mappedBy = "parent", orphanRemoval = true, cascade = CascadeType.ALL )
+		List details = new ArrayList<>();
 
-        Person() {
-        }
+		Person() {
+		}
 
-        Person(Long id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
+		Person(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
 
-    @Entity
-    @Table( name = "PERSON_ADDRESS" )
-    static class PersonAddress {
+	@Entity
+	@Table( name = "PERSON_ADDRESS" )
+	static class PersonAddress {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @ManyToOne( optional = false, fetch = FetchType.LAZY )
-        Person parent;
-    }
+		@ManyToOne( optional = false, fetch = FetchType.LAZY )
+		Person parent;
+	}
 
-    @Entity(name = "NullablePerson")
-    @Table(name = "NULLABLE_PERSON")
-    static class NullablePerson {
+	@Entity(name = "NullablePerson")
+	@Table(name = "NULLABLE_PERSON")
+	static class NullablePerson {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        @Column
-        String name;
+		@Column
+		String name;
 
-        @Column(name = "NUMBER_COLUMN")
-        Integer number;
+		@Column(name = "NUMBER_COLUMN")
+		Integer number;
 
-        NullablePerson() {
-        }
+		NullablePerson() {
+		}
 
-        NullablePerson(Long id, String name, Integer number) {
-            this.id = id;
-            this.name = name;
-            this.number = number;
-        }
-    }
+		NullablePerson(Long id, String name, Integer number) {
+			this.id = id;
+			this.name = name;
+			this.number = number;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeUnsavedEntitiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeUnsavedEntitiesTest.java
index f92efc194678..98bb66d4e16c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeUnsavedEntitiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeUnsavedEntitiesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeWithReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeWithReferenceTest.java
index e20f21d0cf6d..c791963c9ce6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeWithReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeWithReferenceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
 import org.hibernate.annotations.Fetch;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java
index b15d898347d9..9c193bef330d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java
index c6b050f5f5e0..14ccdbcfe73c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.bytecode.enhancement.mutable;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java
index 15062c279b6a..75817353f516 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.bytecode.enhancement.mutable;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java
index 4a8143afc461..03ec9c911bb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.mutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/naturalid/QueryWithProxyAsParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/naturalid/QueryWithProxyAsParametersTest.java
index 52380a52a44f..ba7333362ead 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/naturalid/QueryWithProxyAsParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/naturalid/QueryWithProxyAsParametersTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.naturalid;
 
 import org.hibernate.annotations.NaturalId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java
index b16aafec7f13..6540d0c9eeb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.bytecode.enhancement.ondemandload;
 
 import org.hibernate.annotations.GenericGenerator;
@@ -48,250 +45,250 @@
  */
 @JiraKey( "HHH-10055" )
 @DomainModel(
-        annotatedClasses = {
-               OnDemandLoadTest.Store.class, OnDemandLoadTest.Inventory.class, OnDemandLoadTest.Product.class
-        }
+		annotatedClasses = {
+			OnDemandLoadTest.Store.class, OnDemandLoadTest.Inventory.class, OnDemandLoadTest.Product.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-                @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+				@Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class OnDemandLoadTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Store store = new Store( 1L ).setName( "Acme Super Outlet" );
-            s.persist( store );
-
-            Product product = new Product( "007" ).setName( "widget" ).setDescription( "FooBar" );
-            s.persist( product );
-
-            store.addInventoryProduct( product ).setQuantity( 10L ).setStorePrice( new BigDecimal( 500 ) );
-        } );
-    }
-
-    @Test
-    public void testClosedSession(SessionFactoryScope scope) {
-        scope.getSessionFactory().getStatistics().clear();
-        Store[] store = new Store[1];
-
-        scope.inTransaction( s -> {
-            // first load the store, making sure it is not initialized
-            store[0] = s.getReference( Store.class, 1L );
-            assertNotNull( store[0] );
-            assertFalse( isPropertyInitialized( store[0], "inventories" ) );
-
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-        } );
-
-        assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-        assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-        store[0].getInventories();
-        assertTrue( isPropertyInitialized( store[0], "inventories" ) );
-
-        assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-        assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-    }
-
-    @Test
-    public void testClearedSession(SessionFactoryScope scope) {
-        scope.getSessionFactory().getStatistics().clear();
-
-        scope.inTransaction( s -> {
-            // first load the store, making sure collection is not initialized
-            Store store = s.get( Store.class, 1L );
-            assertNotNull( store );
-            assertFalse( isInitialized( store.getInventories() ) );
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // then clear session and try to initialize collection
-            s.clear();
-            assertNotNull( store );
-            assertFalse( isInitialized( store.getInventories() ) );
-            store.getInventories().size();
-            assertTrue( isInitialized( store.getInventories() ) );
-
-            // the extra Session is the temp Sessions needed to perform the collection init (since it's lazy)
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // clear Session again.  The collection should still be recognized as initialized from above
-            s.clear();
-            assertNotNull( store );
-            assertTrue( isInitialized( store.getInventories() ) );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // lets clear the Session again and this time reload the Store
-            s.clear();
-            store = s.get( Store.class, 1L );
-            s.clear();
-            assertNotNull( store );
-
-            // collection should be back to uninitialized since we have a new entity instance
-            assertFalse( isInitialized( store.getInventories() ) );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-            store.getInventories().size();
-            assertTrue( isInitialized( store.getInventories() ) );
-
-            // the extra Session is the temp Sessions needed to perform the collection init (since it's lazy)
-            assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // clear Session again.  The collection should still be recognized as initialized from above
-            s.clear();
-            assertNotNull( store );
-            assertTrue( isInitialized( store.getInventories() ) );
-            assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-        } );
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) throws Exception {
-        scope.inTransaction( s -> {
-            Store store = s.find( Store.class, 1L );
-            s.remove( store );
-
-            Product product= s.find( Product.class, "007" );
-            s.remove( product );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "STORE" )
-    static class Store {
-        @Id
-        Long id;
-
-        String name;
-
-        @OneToMany( mappedBy = "store", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List inventories = new ArrayList<>();
-
-        @Version
-        Integer version;
-
-        Store() {
-        }
-
-        Store(long id) {
-            this.id = id;
-        }
-
-        Store setName(String name) {
-            this.name = name;
-            return this;
-        }
-
-        Inventory addInventoryProduct(Product product) {
-            Inventory inventory = new Inventory( this, product );
-            inventories.add( inventory );
-            return inventory;
-        }
-
-        public List getInventories() {
-            return inventories;
-        }
-    }
-
-    @Entity
-    @Table( name = "INVENTORY" )
-    static class Inventory {
-
-        @Id
-        @GeneratedValue
-        @GenericGenerator( name = "increment", strategy = "increment" )
-        Long id = -1L;
-
-        @ManyToOne
-        @JoinColumn( name = "STORE_ID" )
-        Store store;
-
-        @ManyToOne
-        @JoinColumn( name = "PRODUCT_ID" )
-        Product product;
-
-        Long quantity;
-
-        BigDecimal storePrice;
-
-        public Inventory() {
-        }
-
-        public Inventory(Store store, Product product) {
-            this.store = store;
-            this.product = product;
-        }
-
-        Inventory setStore(Store store) {
-            this.store = store;
-            return this;
-        }
-
-        Inventory setProduct(Product product) {
-            this.product = product;
-            return this;
-        }
-
-        Inventory setQuantity(Long quantity) {
-            this.quantity = quantity;
-            return this;
-        }
-
-        Inventory setStorePrice(BigDecimal storePrice) {
-            this.storePrice = storePrice;
-            return this;
-        }
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Store store = new Store( 1L ).setName( "Acme Super Outlet" );
+			s.persist( store );
+
+			Product product = new Product( "007" ).setName( "widget" ).setDescription( "FooBar" );
+			s.persist( product );
+
+			store.addInventoryProduct( product ).setQuantity( 10L ).setStorePrice( new BigDecimal( 500 ) );
+		} );
+	}
+
+	@Test
+	public void testClosedSession(SessionFactoryScope scope) {
+		scope.getSessionFactory().getStatistics().clear();
+		Store[] store = new Store[1];
+
+		scope.inTransaction( s -> {
+			// first load the store, making sure it is not initialized
+			store[0] = s.getReference( Store.class, 1L );
+			assertNotNull( store[0] );
+			assertFalse( isPropertyInitialized( store[0], "inventories" ) );
+
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+		} );
+
+		assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+		assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+		store[0].getInventories();
+		assertTrue( isPropertyInitialized( store[0], "inventories" ) );
+
+		assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+		assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+	}
+
+	@Test
+	public void testClearedSession(SessionFactoryScope scope) {
+		scope.getSessionFactory().getStatistics().clear();
+
+		scope.inTransaction( s -> {
+			// first load the store, making sure collection is not initialized
+			Store store = s.get( Store.class, 1L );
+			assertNotNull( store );
+			assertFalse( isInitialized( store.getInventories() ) );
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// then clear session and try to initialize collection
+			s.clear();
+			assertNotNull( store );
+			assertFalse( isInitialized( store.getInventories() ) );
+			store.getInventories().size();
+			assertTrue( isInitialized( store.getInventories() ) );
+
+			// the extra Session is the temp Sessions needed to perform the collection init (since it's lazy)
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// clear Session again.  The collection should still be recognized as initialized from above
+			s.clear();
+			assertNotNull( store );
+			assertTrue( isInitialized( store.getInventories() ) );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// lets clear the Session again and this time reload the Store
+			s.clear();
+			store = s.get( Store.class, 1L );
+			s.clear();
+			assertNotNull( store );
+
+			// collection should be back to uninitialized since we have a new entity instance
+			assertFalse( isInitialized( store.getInventories() ) );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+			store.getInventories().size();
+			assertTrue( isInitialized( store.getInventories() ) );
+
+			// the extra Session is the temp Sessions needed to perform the collection init (since it's lazy)
+			assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// clear Session again.  The collection should still be recognized as initialized from above
+			s.clear();
+			assertNotNull( store );
+			assertTrue( isInitialized( store.getInventories() ) );
+			assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+		} );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) throws Exception {
+		scope.inTransaction( s -> {
+			Store store = s.find( Store.class, 1L );
+			s.remove( store );
+
+			Product product= s.find( Product.class, "007" );
+			s.remove( product );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "STORE" )
+	static class Store {
+		@Id
+		Long id;
+
+		String name;
+
+		@OneToMany( mappedBy = "store", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List inventories = new ArrayList<>();
+
+		@Version
+		Integer version;
+
+		Store() {
+		}
+
+		Store(long id) {
+			this.id = id;
+		}
+
+		Store setName(String name) {
+			this.name = name;
+			return this;
+		}
+
+		Inventory addInventoryProduct(Product product) {
+			Inventory inventory = new Inventory( this, product );
+			inventories.add( inventory );
+			return inventory;
+		}
+
+		public List getInventories() {
+			return inventories;
+		}
+	}
+
+	@Entity
+	@Table( name = "INVENTORY" )
+	static class Inventory {
+
+		@Id
+		@GeneratedValue
+		@GenericGenerator( name = "increment", strategy = "increment" )
+		Long id = -1L;
+
+		@ManyToOne
+		@JoinColumn( name = "STORE_ID" )
+		Store store;
+
+		@ManyToOne
+		@JoinColumn( name = "PRODUCT_ID" )
+		Product product;
+
+		Long quantity;
+
+		BigDecimal storePrice;
+
+		public Inventory() {
+		}
+
+		public Inventory(Store store, Product product) {
+			this.store = store;
+			this.product = product;
+		}
+
+		Inventory setStore(Store store) {
+			this.store = store;
+			return this;
+		}
+
+		Inventory setProduct(Product product) {
+			this.product = product;
+			return this;
+		}
+
+		Inventory setQuantity(Long quantity) {
+			this.quantity = quantity;
+			return this;
+		}
+
+		Inventory setStorePrice(BigDecimal storePrice) {
+			this.storePrice = storePrice;
+			return this;
+		}
+	}
 
-    @Entity
-    @Table( name = "PRODUCT" )
-    static class Product {
-        @Id
-        String id;
+	@Entity
+	@Table( name = "PRODUCT" )
+	static class Product {
+		@Id
+		String id;
 
-        String name;
+		String name;
 
-        String description;
+		String description;
 
-        BigDecimal msrp;
+		BigDecimal msrp;
 
-        @Version
-        Long version;
+		@Version
+		Long version;
 
-        Product() {
-        }
+		Product() {
+		}
 
-        Product(String id) {
-            this.id = id;
-        }
-
-        Product setName(String name) {
-            this.name = name;
-            return this;
-        }
+		Product(String id) {
+			this.id = id;
+		}
+
+		Product setName(String name) {
+			this.name = name;
+			return this;
+		}
 
-        Product setDescription(String description) {
-            this.description = description;
-            return this;
-        }
-
-        Product setMsrp(BigDecimal msrp) {
-            this.msrp = msrp;
-            return this;
-        }
-    }
+		Product setDescription(String description) {
+			this.description = description;
+			return this;
+		}
+
+		Product setMsrp(BigDecimal msrp) {
+			this.msrp = msrp;
+			return this;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java
index 0f8c04159abf..256b3f980208 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.bytecode.enhancement.ondemandload;
 
 import static org.hibernate.Hibernate.isPropertyInitialized;
@@ -54,256 +51,256 @@
  */
 @JiraKey( "HHH-10055" )
 @DomainModel(
-        annotatedClasses = {
-               Store.class, Inventory.class, Product.class
-        }
+		annotatedClasses = {
+			Store.class, Inventory.class, Product.class
+		}
 )
 @ServiceRegistry(
-        settings = {
-                @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
-                @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
-        }
+		settings = {
+				@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, value = "true" ),
+				@Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ),
+		}
 )
 @SessionFactory(
-        // We want to test with this setting set to false explicitly,
-        // because another test already takes care of the default.
-        applyCollectionsInDefaultFetchGroup = false
+		// We want to test with this setting set to false explicitly,
+		// because another test already takes care of the default.
+		applyCollectionsInDefaultFetchGroup = false
 )
 @BytecodeEnhanced
 public class OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Store store = new Store( 1L ).setName( "Acme Super Outlet" );
-            s.persist( store );
-
-            Product product = new Product( "007" ).setName( "widget" ).setDescription( "FooBar" );
-            s.persist( product );
-
-            store.addInventoryProduct( product ).setQuantity( 10L ).setStorePrice( new BigDecimal( 500 ) );
-        } );
-    }
-
-    @Test
-    public void testClosedSession(SessionFactoryScope scope) {
-        scope.getSessionFactory().getStatistics().clear();
-        Store[] store = new Store[1];
-
-        scope.inTransaction( s -> {
-            // first load the store, making sure it is not initialized
-            store[0] = s.getReference( Store.class, 1L );
-            assertNotNull( store[0] );
-            assertFalse( isPropertyInitialized( store[0], "inventories" ) );
-
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-        } );
-
-        assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-        assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-        store[0].getInventories();
-        assertTrue( isPropertyInitialized( store[0], "inventories" ) );
-
-        assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-        assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-    }
-
-    @Test
-    public void testClearedSession(SessionFactoryScope scope) {
-        scope.getSessionFactory().getStatistics().clear();
-
-        scope.inTransaction( s -> {
-            // first load the store, making sure collection is not initialized
-            Store store = s.get( Store.class, 1L );
-            assertNotNull( store );
-            assertFalse( isPropertyInitialized( store, "inventories" ) );
-            assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // then clear session and try to initialize collection
-            s.clear();
-            assertNotNull( store );
-            assertFalse( isPropertyInitialized( store, "inventories" ) );
-            store.getInventories().size();
-            assertTrue( isPropertyInitialized( store, "inventories" ) );
-
-            // the extra Sessions are the temp Sessions needed to perform the init:
-            // first the entity, then the collection (since it's lazy)
-            assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // clear Session again.  The collection should still be recognized as initialized from above
-            s.clear();
-            assertNotNull( store );
-            assertTrue( isPropertyInitialized( store, "inventories" ) );
-            assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // lets clear the Session again and this time reload the Store
-            s.clear();
-            store = s.get( Store.class, 1L );
-            s.clear();
-            assertNotNull( store );
-
-            // collection should be back to uninitialized since we have a new entity instance
-            assertFalse( isPropertyInitialized( store, "inventories" ) );
-            assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-            store.getInventories().size();
-            assertTrue( isPropertyInitialized( store, "inventories" ) );
-
-            // the extra Sessions are the temp Sessions needed to perform the init:
-            // first the entity, then the collection (since it's lazy)
-            assertEquals( 5, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 4, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-
-            // clear Session again.  The collection should still be recognized as initialized from above
-            s.clear();
-            assertNotNull( store );
-            assertTrue( isPropertyInitialized( store, "inventories" ) );
-            assertEquals( 5, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
-            assertEquals( 4, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
-        } );
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) throws Exception {
-        scope.inTransaction( s -> {
-            Store store = s.find( Store.class, 1L );
-            s.remove( store );
-
-            Product product= s.find( Product.class, "007" );
-            s.remove( product );
-        } );
-    }
-
-    // --- //
-
-    @Entity
-    @Table( name = "STORE" )
-    static class Store {
-        @Id
-        Long id;
-
-        String name;
-
-        @OneToMany( mappedBy = "store", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
-        List inventories = new ArrayList<>();
-
-        @Version
-        Integer version;
-
-        Store() {
-        }
-
-        Store(long id) {
-            this.id = id;
-        }
-
-        Store setName(String name) {
-            this.name = name;
-            return this;
-        }
-
-        Inventory addInventoryProduct(Product product) {
-            Inventory inventory = new Inventory( this, product );
-            inventories.add( inventory );
-            return inventory;
-        }
-
-        public List getInventories() {
-            return Collections.unmodifiableList( inventories );
-        }
-    }
-
-    @Entity
-    @Table( name = "INVENTORY" )
-    static class Inventory {
-
-        @Id
-        @GeneratedValue
-        @GenericGenerator( name = "increment", strategy = "increment" )
-        Long id = -1L;
-
-        @ManyToOne
-        @JoinColumn( name = "STORE_ID" )
-        Store store;
-
-        @ManyToOne
-        @JoinColumn( name = "PRODUCT_ID" )
-        Product product;
-
-        Long quantity;
-
-        BigDecimal storePrice;
-
-        public Inventory() {
-        }
-
-        public Inventory(Store store, Product product) {
-            this.store = store;
-            this.product = product;
-        }
-
-        Inventory setStore(Store store) {
-            this.store = store;
-            return this;
-        }
-
-        Inventory setProduct(Product product) {
-            this.product = product;
-            return this;
-        }
-
-        Inventory setQuantity(Long quantity) {
-            this.quantity = quantity;
-            return this;
-        }
-
-        Inventory setStorePrice(BigDecimal storePrice) {
-            this.storePrice = storePrice;
-            return this;
-        }
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Store store = new Store( 1L ).setName( "Acme Super Outlet" );
+			s.persist( store );
+
+			Product product = new Product( "007" ).setName( "widget" ).setDescription( "FooBar" );
+			s.persist( product );
+
+			store.addInventoryProduct( product ).setQuantity( 10L ).setStorePrice( new BigDecimal( 500 ) );
+		} );
+	}
+
+	@Test
+	public void testClosedSession(SessionFactoryScope scope) {
+		scope.getSessionFactory().getStatistics().clear();
+		Store[] store = new Store[1];
+
+		scope.inTransaction( s -> {
+			// first load the store, making sure it is not initialized
+			store[0] = s.getReference( Store.class, 1L );
+			assertNotNull( store[0] );
+			assertFalse( isPropertyInitialized( store[0], "inventories" ) );
+
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+		} );
+
+		assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+		assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+		store[0].getInventories();
+		assertTrue( isPropertyInitialized( store[0], "inventories" ) );
+
+		assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+		assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+	}
+
+	@Test
+	public void testClearedSession(SessionFactoryScope scope) {
+		scope.getSessionFactory().getStatistics().clear();
+
+		scope.inTransaction( s -> {
+			// first load the store, making sure collection is not initialized
+			Store store = s.get( Store.class, 1L );
+			assertNotNull( store );
+			assertFalse( isPropertyInitialized( store, "inventories" ) );
+			assertEquals( 1, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 0, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// then clear session and try to initialize collection
+			s.clear();
+			assertNotNull( store );
+			assertFalse( isPropertyInitialized( store, "inventories" ) );
+			store.getInventories().size();
+			assertTrue( isPropertyInitialized( store, "inventories" ) );
+
+			// the extra Sessions are the temp Sessions needed to perform the init:
+			// first the entity, then the collection (since it's lazy)
+			assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// clear Session again.  The collection should still be recognized as initialized from above
+			s.clear();
+			assertNotNull( store );
+			assertTrue( isPropertyInitialized( store, "inventories" ) );
+			assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// lets clear the Session again and this time reload the Store
+			s.clear();
+			store = s.get( Store.class, 1L );
+			s.clear();
+			assertNotNull( store );
+
+			// collection should be back to uninitialized since we have a new entity instance
+			assertFalse( isPropertyInitialized( store, "inventories" ) );
+			assertEquals( 3, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 2, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+			store.getInventories().size();
+			assertTrue( isPropertyInitialized( store, "inventories" ) );
+
+			// the extra Sessions are the temp Sessions needed to perform the init:
+			// first the entity, then the collection (since it's lazy)
+			assertEquals( 5, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 4, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+
+			// clear Session again.  The collection should still be recognized as initialized from above
+			s.clear();
+			assertNotNull( store );
+			assertTrue( isPropertyInitialized( store, "inventories" ) );
+			assertEquals( 5, scope.getSessionFactory().getStatistics().getSessionOpenCount() );
+			assertEquals( 4, scope.getSessionFactory().getStatistics().getSessionCloseCount() );
+		} );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) throws Exception {
+		scope.inTransaction( s -> {
+			Store store = s.find( Store.class, 1L );
+			s.remove( store );
+
+			Product product= s.find( Product.class, "007" );
+			s.remove( product );
+		} );
+	}
+
+	// --- //
+
+	@Entity
+	@Table( name = "STORE" )
+	static class Store {
+		@Id
+		Long id;
+
+		String name;
+
+		@OneToMany( mappedBy = "store", cascade = CascadeType.ALL, fetch = FetchType.LAZY )
+		List inventories = new ArrayList<>();
+
+		@Version
+		Integer version;
+
+		Store() {
+		}
+
+		Store(long id) {
+			this.id = id;
+		}
+
+		Store setName(String name) {
+			this.name = name;
+			return this;
+		}
+
+		Inventory addInventoryProduct(Product product) {
+			Inventory inventory = new Inventory( this, product );
+			inventories.add( inventory );
+			return inventory;
+		}
+
+		public List getInventories() {
+			return Collections.unmodifiableList( inventories );
+		}
+	}
+
+	@Entity
+	@Table( name = "INVENTORY" )
+	static class Inventory {
+
+		@Id
+		@GeneratedValue
+		@GenericGenerator( name = "increment", strategy = "increment" )
+		Long id = -1L;
+
+		@ManyToOne
+		@JoinColumn( name = "STORE_ID" )
+		Store store;
+
+		@ManyToOne
+		@JoinColumn( name = "PRODUCT_ID" )
+		Product product;
+
+		Long quantity;
+
+		BigDecimal storePrice;
+
+		public Inventory() {
+		}
+
+		public Inventory(Store store, Product product) {
+			this.store = store;
+			this.product = product;
+		}
+
+		Inventory setStore(Store store) {
+			this.store = store;
+			return this;
+		}
+
+		Inventory setProduct(Product product) {
+			this.product = product;
+			return this;
+		}
+
+		Inventory setQuantity(Long quantity) {
+			this.quantity = quantity;
+			return this;
+		}
+
+		Inventory setStorePrice(BigDecimal storePrice) {
+			this.storePrice = storePrice;
+			return this;
+		}
+	}
 
-    @Entity
-    @Table( name = "PRODUCT" )
-    static class Product {
-        @Id
-        String id;
+	@Entity
+	@Table( name = "PRODUCT" )
+	static class Product {
+		@Id
+		String id;
 
-        String name;
+		String name;
 
-        String description;
+		String description;
 
-        BigDecimal msrp;
+		BigDecimal msrp;
 
-        @Version
-        Long version;
+		@Version
+		Long version;
 
-        Product() {
-        }
+		Product() {
+		}
 
-        Product(String id) {
-            this.id = id;
-        }
-
-        Product setName(String name) {
-            this.name = name;
-            return this;
-        }
+		Product(String id) {
+			this.id = id;
+		}
+
+		Product setName(String name) {
+			this.name = name;
+			return this;
+		}
 
-        Product setDescription(String description) {
-            this.description = description;
-            return this;
-        }
-
-        Product setMsrp(BigDecimal msrp) {
-            this.msrp = msrp;
-            return this;
-        }
-    }
+		Product setDescription(String description) {
+			this.description = description;
+			return this;
+		}
+
+		Product setMsrp(BigDecimal msrp) {
+			this.msrp = msrp;
+			return this;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoad2Test.java
index a1b45cfe99d5..f4984b79b8e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoadTest.java
index 1b0a276ea00e..d0e0a9b81299 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoad2Test.java
index 1ee6b30ffaab..bd45dce795e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoadTest.java
index a9a254dbdeb3..efa97a61597b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/EagerSubSelectOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoad2Test.java
index 890d62b5c704..cfb94c7dc480 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoadTest.java
index bda31d38ef38..3f670e7ea23a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/LazyOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/NoDirtyCheckEnhancementContext.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/NoDirtyCheckEnhancementContext.java
index 03356f0fb0ec..fc4619660c06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/NoDirtyCheckEnhancementContext.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/NoDirtyCheckEnhancementContext.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java
index ee939b0a2889..bea05618a137 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java
index 2c2b147f8f99..7255a9404485 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
index 498432283aa4..43efe5269778 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
 import org.hibernate.annotations.DynamicInsert;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java
index b6968a2d3f14..4ee60a41c646 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.orphan;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java
index d5d2ee90f7df..0e6a6be00068 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java
@@ -1,13 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.otherentityentrycontext;
 
-import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.ManagedEntity;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -20,12 +16,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * This task tests ManagedEntity objects that are already associated with a different PersistenceContext.
@@ -33,56 +26,56 @@
  * @author Gail Badner
  */
 @DomainModel(
-        annotatedClasses = {
-            OtherEntityEntryContextTest.Parent.class
-        }
+		annotatedClasses = {
+			OtherEntityEntryContextTest.Parent.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class OtherEntityEntryContextTest {
 
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        // Create a Parent
-        scope.inTransaction( s -> {
-            s.persist( new Parent( 1L, "first" ) );
-        } );
-    }
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		// Create a Parent
+		scope.inTransaction( s -> {
+			s.persist( new Parent( 1L, "first" ) );
+		} );
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            Parent p = s.get( Parent.class, 1L );
-            p.name = "third";
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Parent p = s.get( Parent.class, 1L );
+			p.name = "third";
 
-            s.merge( p );
-            assertTrue( s.contains( p ) );
-            s.evict( p );
-            assertFalse( s.contains( p ) );
+			s.merge( p );
+			assertTrue( s.contains( p ) );
+			s.evict( p );
+			assertFalse( s.contains( p ) );
 
-            p = s.get( Parent.class, p.id );
+			p = s.get( Parent.class, p.id );
 
-            assertEquals( "first", p.name );
-        } );
-    }
+			assertEquals( "first", p.name );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @Table( name = "PARENT" )
-    static class Parent {
+	@Entity
+	@Table( name = "PARENT" )
+	static class Parent {
 
-        @Id
-        Long id;
+		@Id
+		Long id;
 
-        String name;
+		String name;
 
-        Parent() {
-        }
+		Parent() {
+		}
 
-        Parent(Long id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
+		Parent(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java
index 2e3052d0f30b..3829bfc20ef4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.pk;
 
@@ -26,194 +24,194 @@
  * @author Gail Badner
  */
 @DomainModel(
-        annotatedClasses = {
-              EmbeddedPKTest.WorkOrder.class, EmbeddedPKTest.WorkOrderPK.class
-        }
+		annotatedClasses = {
+			EmbeddedPKTest.WorkOrder.class, EmbeddedPKTest.WorkOrderPK.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class EmbeddedPKTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new WorkOrder() );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new WorkOrder() );
+		} );
+	}
 
-    // --- //
+	// --- //
 
-    @Entity
-    @IdClass( WorkOrderPK.class )
-    @Table( name = "WORK_ORDER" )
-    static class WorkOrder {
+	@Entity
+	@IdClass( WorkOrderPK.class )
+	@Table( name = "WORK_ORDER" )
+	static class WorkOrder {
 
-        @Id
-        long id;
+		@Id
+		long id;
 
-        @Id
-        long location;
+		@Id
+		long location;
 
-        int originalQuantity;
+		int originalQuantity;
 
-        int completedQuantity;
+		int completedQuantity;
 
-        @Temporal( TemporalType.TIMESTAMP )
-        Calendar dueDate;
+		@Temporal( TemporalType.TIMESTAMP )
+		Calendar dueDate;
 
-        @Temporal( TemporalType.TIMESTAMP )
-        Calendar startDate;
+		@Temporal( TemporalType.TIMESTAMP )
+		Calendar startDate;
 
-        String assemblyId;
+		String assemblyId;
 
-        @Version
-        long version;
+		@Version
+		long version;
 
-        WorkOrder() {
-            this( "", 1, 0, Calendar.getInstance() );
-        }
+		WorkOrder() {
+			this( "", 1, 0, Calendar.getInstance() );
+		}
 
-        WorkOrder(String assemblyId, int origQty, int location, Calendar dueDate) {
-            if ( origQty < 1 ) {
-                throw new IllegalArgumentException( "WorkOrder can not be created with original quantity " + origQty + ". Must be > 0" );
-            }
-            if ( dueDate == null ) {
-                throw new IllegalArgumentException( "WorkOrder can not be created with null due Date" );
-            }
-            this.assemblyId = assemblyId;
-            this.originalQuantity = origQty;
-            this.dueDate = dueDate;
-            this.location = location;
-        }
+		WorkOrder(String assemblyId, int origQty, int location, Calendar dueDate) {
+			if ( origQty < 1 ) {
+				throw new IllegalArgumentException( "WorkOrder can not be created with original quantity " + origQty + ". Must be > 0" );
+			}
+			if ( dueDate == null ) {
+				throw new IllegalArgumentException( "WorkOrder can not be created with null due Date" );
+			}
+			this.assemblyId = assemblyId;
+			this.originalQuantity = origQty;
+			this.dueDate = dueDate;
+			this.location = location;
+		}
 
-        public long getId() {
-            return id;
-        }
+		public long getId() {
+			return id;
+		}
 
-        public void setId(long id) {
-            this.id = id;
-        }
+		public void setId(long id) {
+			this.id = id;
+		}
 
-        // --- //
+		// --- //
 
-        String getAssemblyId() {
-            return assemblyId;
-        }
+		String getAssemblyId() {
+			return assemblyId;
+		}
 
-        void setAssemblyId(String assemblyId) {
-            this.assemblyId = assemblyId;
-        }
+		void setAssemblyId(String assemblyId) {
+			this.assemblyId = assemblyId;
+		}
 
-        int getCompletedQuantity() {
-            return completedQuantity;
-        }
+		int getCompletedQuantity() {
+			return completedQuantity;
+		}
 
-        void setCompletedQuantity(int compQty) {
-            this.completedQuantity = compQty;
-        }
+		void setCompletedQuantity(int compQty) {
+			this.completedQuantity = compQty;
+		}
 
-        Calendar getDueDate() {
-            return (Calendar) dueDate.clone();
-        }
+		Calendar getDueDate() {
+			return (Calendar) dueDate.clone();
+		}
 
-        void setDueDate(Calendar dueDate) {
-            this.dueDate = dueDate;
-        }
+		void setDueDate(Calendar dueDate) {
+			this.dueDate = dueDate;
+		}
 
-        int getOriginalQuantity() {
-            return originalQuantity;
-        }
+		int getOriginalQuantity() {
+			return originalQuantity;
+		}
 
-        void setOriginalQuantity(int originalQuantity) {
-            this.originalQuantity = originalQuantity;
-        }
+		void setOriginalQuantity(int originalQuantity) {
+			this.originalQuantity = originalQuantity;
+		}
 
-        // --- //
+		// --- //
 
-        long getLocation() {
-            return location;
-        }
+		long getLocation() {
+			return location;
+		}
 
-        void setLocation(int location) {
-            this.location = location;
-        }
+		void setLocation(int location) {
+			this.location = location;
+		}
 
-        Calendar getStartDate() {
-            return (Calendar) startDate.clone();
-        }
+		Calendar getStartDate() {
+			return (Calendar) startDate.clone();
+		}
 
-        void setStartDate(Calendar instance) {
-            startDate = instance;
-        }
+		void setStartDate(Calendar instance) {
+			startDate = instance;
+		}
 
-        long getVersion() {
-            return version;
-        }
+		long getVersion() {
+			return version;
+		}
 
-        // Processing methods
+		// Processing methods
 
-        boolean update() {
-            return true;
-        }
+		boolean update() {
+			return true;
+		}
 
-        boolean setStatusCompleted() {
-            return true;
-        }
+		boolean setStatusCompleted() {
+			return true;
+		}
 
-        void advanceStatus() {
-        }
+		void advanceStatus() {
+		}
 
-        void setStatusCancelled() {
-        }
+		void setStatusCancelled() {
+		}
 
-        // --- //
-
-        @Override
-        public boolean equals(Object other) {
-            return this == other || other != null && other instanceof WorkOrder && id == ( (WorkOrder) other ).id;
-        }
-
-        @Override
-        public int hashCode() {
-            return (int) ( id ^ id >>> 32 );
-        }
+		// --- //
+
+		@Override
+		public boolean equals(Object other) {
+			return this == other || other != null && other instanceof WorkOrder && id == ( (WorkOrder) other ).id;
+		}
+
+		@Override
+		public int hashCode() {
+			return (int) ( id ^ id >>> 32 );
+		}
 
-        @Override
-        public String toString() {
-            return "WorkOrder:[" + id + "]";
-        }
-    }
+		@Override
+		public String toString() {
+			return "WorkOrder:[" + id + "]";
+		}
+	}
 
-    static class WorkOrderPK implements Serializable {
-        long id;
-        long location;
+	static class WorkOrderPK implements Serializable {
+		long id;
+		long location;
 
-        WorkOrderPK() {
-        }
+		WorkOrderPK() {
+		}
 
-        public WorkOrderPK(int location, int id) {
-            this.location = location;
-            this.id = id;
-        }
+		public WorkOrderPK(int location, int id) {
+			this.location = location;
+			this.id = id;
+		}
 
-        public long getId() {
-            return id;
-        }
+		public long getId() {
+			return id;
+		}
 
-        public long getLocation() {
-            return location;
-        }
+		public long getLocation() {
+			return location;
+		}
 
-        // --- //
+		// --- //
 
-        @Override
-        public boolean equals(Object other) {
-            return this == other || other != null && other instanceof WorkOrder && id == ( (WorkOrder) other ).id && location == ( (WorkOrder) other ).location;
-        }
+		@Override
+		public boolean equals(Object other) {
+			return this == other || other != null && other instanceof WorkOrder && id == ( (WorkOrder) other ).id && location == ( (WorkOrder) other ).location;
+		}
 
-        @Override
-        public int hashCode() {
-            return (int) ( 31 * ( id ^ id >>> 32 ) + ( location ^ location >>> 32 ) );
-        }
-    }
+		@Override
+		public int hashCode() {
+			return (int) ( 31 * ( id ^ id >>> 32 ) + ( location ^ location >>> 32 ) );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/MergeAndRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/MergeAndRefreshTest.java
index 319032ffe045..c2b660e567df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/MergeAndRefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/MergeAndRefreshTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.refresh;
 
 import org.hibernate.annotations.Cache;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java
index 5ea8671755d9..03574b7d757f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.refresh;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshTest.java
index 444a6c302e61..0cd5c31c30a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.refresh;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/secondarytables/SecondaryTableDynamicUpateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/secondarytables/SecondaryTableDynamicUpateTest.java
index 65f1567974d5..84b8cc2af223 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/secondarytables/SecondaryTableDynamicUpateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/secondarytables/SecondaryTableDynamicUpateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.secondarytables;
 
 import org.hibernate.annotations.DynamicUpdate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
index 0d9fa6108bc3..d3a173719088 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.superclass;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java
index a17213852aab..853398a2528c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.tracker;
 
@@ -17,55 +15,53 @@
  */
 public class CompositeOwnerTrackerTest {
 
-    private int counter = 0;
+	private int counter = 0;
 
-    @Test
-    public void testCompositeOwnerTracker() {
+	@Test
+	public void testCompositeOwnerTracker() {
 
-        CompositeOwnerTracker tracker = new CompositeOwnerTracker();
-        tracker.add( "foo", new TestCompositeOwner() );
+		CompositeOwnerTracker tracker = new CompositeOwnerTracker();
+		tracker.add( "foo", new TestCompositeOwner() );
 
-        tracker.callOwner( ".street1" );
-        assertEquals( 1, counter );
-        tracker.add( "bar", new TestCompositeOwner() );
-        tracker.callOwner( ".city" );
-        assertEquals( 3, counter );
+		tracker.callOwner( ".street1" );
+		assertEquals( 1, counter );
+		tracker.add( "bar", new TestCompositeOwner() );
+		tracker.callOwner( ".city" );
+		assertEquals( 3, counter );
 
-        tracker.removeOwner( "foo" );
+		tracker.removeOwner( "foo" );
 
-        tracker.callOwner( ".country" );
-        assertEquals( 4, counter );
-        tracker.removeOwner( "bar" );
+		tracker.callOwner( ".country" );
+		assertEquals( 4, counter );
+		tracker.removeOwner( "bar" );
 
-        tracker.callOwner( ".country" );
+		tracker.callOwner( ".country" );
 
-        tracker.add( "moo", new TestCompositeOwner() );
-        tracker.callOwner( ".country" );
-        assertEquals( 5, counter );
-    }
+		tracker.add( "moo", new TestCompositeOwner() );
+		tracker.callOwner( ".country" );
+		assertEquals( 5, counter );
+	}
 
-    class TestCompositeOwner implements CompositeOwner {
+	class TestCompositeOwner implements CompositeOwner {
 
-        @Override
-        public void $$_hibernate_trackChange(String attributeName) {
-            if ( counter == 0 ) {
-                assertEquals( "foo.street1", attributeName );
-            }
-            if ( counter == 1 ) {
-                assertEquals( "foo.city", attributeName );
-            }
-            if ( counter == 2 ) {
-                assertEquals( "bar.city", attributeName );
-            }
-            if ( counter == 3 ) {
-                assertEquals( "bar.country", attributeName );
-            }
-            if ( counter == 4 ) {
-                assertEquals( "moo.country", attributeName );
-            }
-            counter++;
-        }
-    }
+		@Override
+		public void $$_hibernate_trackChange(String attributeName) {
+			if ( counter == 0 ) {
+				assertEquals( "foo.street1", attributeName );
+			}
+			if ( counter == 1 ) {
+				assertEquals( "foo.city", attributeName );
+			}
+			if ( counter == 2 ) {
+				assertEquals( "bar.city", attributeName );
+			}
+			if ( counter == 3 ) {
+				assertEquals( "bar.country", attributeName );
+			}
+			if ( counter == 4 ) {
+				assertEquals( "moo.country", attributeName );
+			}
+			counter++;
+		}
+	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java
index 159a58f46b54..8ca264396988 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.bytecode.enhancement.tracker;
 
@@ -21,71 +19,69 @@
  */
 public class DirtyTrackerTest {
 
-    @Test
-    public void testSimpleTracker() {
-        DirtyTracker tracker = new SimpleFieldTracker();
-        assertTrue( tracker.isEmpty() );
-        assertEquals( 0, tracker.get().length );
-
-        tracker.add( "foo" );
-        assertFalse( tracker.isEmpty() );
-        assertArrayEquals( tracker.get(), new String[]{"foo"} );
-
-        tracker.clear();
-        assertTrue( tracker.isEmpty() );
-        assertEquals( 0, tracker.get().length );
-
-        tracker.add( "foo" );
-        tracker.add( "bar" );
-        tracker.add( "another.bar" );
-        tracker.add( "foo" );
-        tracker.add( "another.foo" );
-        tracker.add( "another.bar" );
-        assertEquals( 4, tracker.get().length );
-
-        tracker.suspend( true );
-        tracker.add( "one more" );
-        assertEquals( 4, tracker.get().length );
-    }
-
-    @Test
-    public void testSortedTracker() {
-        DirtyTracker tracker = new SortedFieldTracker();
-        assertTrue( tracker.isEmpty() );
-        assertEquals( 0, tracker.get().length );
-
-        tracker.add( "foo" );
-        assertFalse( tracker.isEmpty() );
-        assertArrayEquals( tracker.get(), new String[]{"foo"} );
-
-        tracker.clear();
-        assertTrue( tracker.isEmpty() );
-        assertEquals( 0, tracker.get().length );
-
-        tracker.add( "foo" );
-        tracker.add( "bar" );
-        tracker.add( "another.bar" );
-        tracker.add( "foo" );
-        tracker.add( "another.foo" );
-        tracker.add( "another.bar" );
-        assertEquals( 4, tracker.get().length );
-
-        // the algorithm for this implementation relies on the fact that the array is kept sorted, so let's check it really is
-        assertTrue( isSorted( tracker.get() ) );
-
-        tracker.suspend( true );
-        tracker.add( "one more" );
-        assertEquals( 4, tracker.get().length );
-    }
-
-    private boolean isSorted(String[] arr) {
-        for ( int i = 1; i < arr.length; i++ ) {
-            if ( arr[i - 1].compareTo( arr[i] ) > 0 ) {
-                return false;
-            }
-        }
-        return true;
-    }
+	@Test
+	public void testSimpleTracker() {
+		DirtyTracker tracker = new SimpleFieldTracker();
+		assertTrue( tracker.isEmpty() );
+		assertEquals( 0, tracker.get().length );
+
+		tracker.add( "foo" );
+		assertFalse( tracker.isEmpty() );
+		assertArrayEquals( tracker.get(), new String[]{"foo"} );
+
+		tracker.clear();
+		assertTrue( tracker.isEmpty() );
+		assertEquals( 0, tracker.get().length );
+
+		tracker.add( "foo" );
+		tracker.add( "bar" );
+		tracker.add( "another.bar" );
+		tracker.add( "foo" );
+		tracker.add( "another.foo" );
+		tracker.add( "another.bar" );
+		assertEquals( 4, tracker.get().length );
+
+		tracker.suspend( true );
+		tracker.add( "one more" );
+		assertEquals( 4, tracker.get().length );
+	}
+
+	@Test
+	public void testSortedTracker() {
+		DirtyTracker tracker = new SortedFieldTracker();
+		assertTrue( tracker.isEmpty() );
+		assertEquals( 0, tracker.get().length );
+
+		tracker.add( "foo" );
+		assertFalse( tracker.isEmpty() );
+		assertArrayEquals( tracker.get(), new String[]{"foo"} );
+
+		tracker.clear();
+		assertTrue( tracker.isEmpty() );
+		assertEquals( 0, tracker.get().length );
+
+		tracker.add( "foo" );
+		tracker.add( "bar" );
+		tracker.add( "another.bar" );
+		tracker.add( "foo" );
+		tracker.add( "another.foo" );
+		tracker.add( "another.bar" );
+		assertEquals( 4, tracker.get().length );
+
+		// the algorithm for this implementation relies on the fact that the array is kept sorted, so let's check it really is
+		assertTrue( isSorted( tracker.get() ) );
+
+		tracker.suspend( true );
+		tracker.add( "one more" );
+		assertEquals( 4, tracker.get().length );
+	}
+
+	private boolean isSorted(String[] arr) {
+		for ( int i = 1; i < arr.length; i++ ) {
+			if ( arr[i - 1].compareTo( arr[i] ) > 0 ) {
+				return false;
+			}
+		}
+		return true;
+	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/update/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/update/JoinedInheritanceTest.java
index 5da3bacb3e01..f725e543e1e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/update/JoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/update/JoinedInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.update;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/version/VersionedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/version/VersionedEntityTest.java
index 9a9fb69c6a62..75b95bd1b810 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/version/VersionedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/version/VersionedEntityTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.bytecode.enhancement.version;
 
 import org.hibernate.Hibernate;
@@ -32,212 +36,211 @@
 
 @JiraKey("HHH-15134")
 @DomainModel(
-        annotatedClasses = {
-              VersionedEntityTest.FooEntity.class, VersionedEntityTest.BarEntity.class, VersionedEntityTest.BazEntity.class
-        }
+		annotatedClasses = {
+			VersionedEntityTest.FooEntity.class, VersionedEntityTest.BarEntity.class, VersionedEntityTest.BazEntity.class
+		}
 )
 @SessionFactory
 @BytecodeEnhanced
 public class VersionedEntityTest {
-    private final Long parentID = 1L;
-
-    @BeforeEach
-    public void prepare(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            final FooEntity entity = FooEntity.of( parentID, "foo" );
-            em.persist( entity );
-        } );
-    }
-
-    @Test
-    public void testUpdateVersionedEntity(SessionFactoryScope scope) {
-        scope.inTransaction( em -> {
-            final FooEntity entity = em.getReference( FooEntity.class, parentID );
-
-            assertFalse( isInitialized( entity ) );
-            assertTrue( Hibernate.isPropertyInitialized( entity, "id" ) );
-            assertFalse( Hibernate.isPropertyInitialized( entity, "name" ) );
-            assertFalse( Hibernate.isPropertyInitialized( entity, "version" ) );
-            assertFalse( Hibernate.isPropertyInitialized( entity, "bars" ) );
-            assertFalse( Hibernate.isPropertyInitialized( entity, "bazzes" ) );
-
-            entity.setName( "bar" );
-        });
-    }
-
-    @MappedSuperclass
-    public static abstract class AbstractEntity {
-
-        public abstract T getId();
-
-        public abstract void setId(T id);
-
-        @Override
-        public int hashCode() {
-            return getClass().hashCode();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != getClass()) return false;
-
-            final AbstractEntity other = (AbstractEntity) obj;
-            return getId() != null && getId().equals(other.getId());
-        }
-    }
-
-    @Entity(name = "FooEntity")
-    public static class FooEntity extends AbstractEntity {
-
-        @Id
-        private long id;
-        @Version
-        private int version;
-
-        private String name;
-
-        @OneToMany(mappedBy = "foo", cascade = CascadeType.ALL, targetEntity = BarEntity.class, orphanRemoval = true)
-        public Set bars = new HashSet<>();
-
-        @OneToMany(mappedBy = "foo", cascade = CascadeType.ALL, targetEntity = BazEntity.class, orphanRemoval = true)
-        public Set bazzes = new HashSet<>();
-
-        public static FooEntity of(long id, String name) {
-            final FooEntity f = new FooEntity();
-            f.id = id;
-            f.name = name;
-            return f;
-        }
-
-        @Override
-        public Long getId() {
-            return id;
-        }
-
-        @Override
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public int getVersion() {
-            return version;
-        }
-
-        public void setVersion(int version) {
-            this.version = version;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Set getBars() {
-            return bars;
-        }
-
-        public void addBar(BarEntity bar) {
-            bars.add(bar);
-            bar.setFoo(this);
-        }
-
-        public void removeBar(BarEntity bar) {
-            bars.remove(bar);
-            bar.setFoo(null);
-        }
-
-        public Set getBazzes() {
-            return bazzes;
-        }
-
-        public void addBaz(BazEntity baz) {
-            bazzes.add(baz);
-            baz.setFoo(this);
-        }
-
-        public void removeBaz(BazEntity baz) {
-            bazzes.remove(baz);
-            baz.setFoo(null);
-        }
-
-        @Override
-        public String toString() {
-            return String.format("FooEntity: id=%d, version=%d, name=%s", id, version, name);
-        }
-    }
-
-    @Entity(name = "BazEntity")
-    public static class BazEntity extends AbstractEntity {
-
-        @Id
-        @GeneratedValue
-        private long id;
-
-        @ManyToOne(fetch = FetchType.LAZY, optional = false)
-        @JoinColumn(foreignKey = @ForeignKey(name = "fk_baz_foo"), nullable = false)
-        private FooEntity foo;
-
-        @Override
-        public Long getId() {
-            return id;
-        }
-
-        @Override
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public FooEntity getFoo() {
-            return foo;
-        }
-
-        public void setFoo(FooEntity foo) {
-            this.foo = foo;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("BazEntity: id=%d", id);
-        }
-    }
-
-    @Entity(name = "BarEntity")
-    public static class BarEntity extends AbstractEntity {
-
-        @Id
-        @GeneratedValue
-        private long id;
-
-        @ManyToOne(fetch = FetchType.LAZY, optional = false)
-        @JoinColumn(foreignKey = @ForeignKey(name = "fk_bar_foo"), nullable = false)
-        private FooEntity foo;
-
-        @Override
-        public Long getId() {
-            return id;
-        }
-
-        @Override
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public FooEntity getFoo() {
-            return foo;
-        }
-
-        public void setFoo(FooEntity foo) {
-            this.foo = foo;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("BarEntity: id=%d", id);
-        }
-    }
+	private final Long parentID = 1L;
+
+	@BeforeEach
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			final FooEntity entity = FooEntity.of( parentID, "foo" );
+			em.persist( entity );
+		} );
+	}
+
+	@Test
+	public void testUpdateVersionedEntity(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			final FooEntity entity = em.getReference( FooEntity.class, parentID );
+
+			assertFalse( isInitialized( entity ) );
+			assertTrue( Hibernate.isPropertyInitialized( entity, "id" ) );
+			assertFalse( Hibernate.isPropertyInitialized( entity, "name" ) );
+			assertFalse( Hibernate.isPropertyInitialized( entity, "version" ) );
+			assertFalse( Hibernate.isPropertyInitialized( entity, "bars" ) );
+			assertFalse( Hibernate.isPropertyInitialized( entity, "bazzes" ) );
+
+			entity.setName( "bar" );
+		});
+	}
+
+	@MappedSuperclass
+	public static abstract class AbstractEntity {
+
+		public abstract T getId();
+
+		public abstract void setId(T id);
+
+		@Override
+		public int hashCode() {
+			return getClass().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == this) return true;
+			if (obj == null || obj.getClass() != getClass()) return false;
+
+			final AbstractEntity other = (AbstractEntity) obj;
+			return getId() != null && getId().equals(other.getId());
+		}
+	}
+
+	@Entity(name = "FooEntity")
+	public static class FooEntity extends AbstractEntity {
+
+		@Id
+		private long id;
+		@Version
+		private int version;
+
+		private String name;
+
+		@OneToMany(mappedBy = "foo", cascade = CascadeType.ALL, targetEntity = BarEntity.class, orphanRemoval = true)
+		public Set bars = new HashSet<>();
+
+		@OneToMany(mappedBy = "foo", cascade = CascadeType.ALL, targetEntity = BazEntity.class, orphanRemoval = true)
+		public Set bazzes = new HashSet<>();
+
+		public static FooEntity of(long id, String name) {
+			final FooEntity f = new FooEntity();
+			f.id = id;
+			f.name = name;
+			return f;
+		}
+
+		@Override
+		public Long getId() {
+			return id;
+		}
+
+		@Override
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public int getVersion() {
+			return version;
+		}
+
+		public void setVersion(int version) {
+			this.version = version;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Set getBars() {
+			return bars;
+		}
+
+		public void addBar(BarEntity bar) {
+			bars.add(bar);
+			bar.setFoo(this);
+		}
+
+		public void removeBar(BarEntity bar) {
+			bars.remove(bar);
+			bar.setFoo(null);
+		}
+
+		public Set getBazzes() {
+			return bazzes;
+		}
+
+		public void addBaz(BazEntity baz) {
+			bazzes.add(baz);
+			baz.setFoo(this);
+		}
+
+		public void removeBaz(BazEntity baz) {
+			bazzes.remove(baz);
+			baz.setFoo(null);
+		}
+
+		@Override
+		public String toString() {
+			return String.format("FooEntity: id=%d, version=%d, name=%s", id, version, name);
+		}
+	}
+
+	@Entity(name = "BazEntity")
+	public static class BazEntity extends AbstractEntity {
+
+		@Id
+		@GeneratedValue
+		private long id;
+
+		@ManyToOne(fetch = FetchType.LAZY, optional = false)
+		@JoinColumn(foreignKey = @ForeignKey(name = "fk_baz_foo"), nullable = false)
+		private FooEntity foo;
+
+		@Override
+		public Long getId() {
+			return id;
+		}
+
+		@Override
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public FooEntity getFoo() {
+			return foo;
+		}
+
+		public void setFoo(FooEntity foo) {
+			this.foo = foo;
+		}
+
+		@Override
+		public String toString() {
+			return String.format("BazEntity: id=%d", id);
+		}
+	}
+
+	@Entity(name = "BarEntity")
+	public static class BarEntity extends AbstractEntity {
+
+		@Id
+		@GeneratedValue
+		private long id;
+
+		@ManyToOne(fetch = FetchType.LAZY, optional = false)
+		@JoinColumn(foreignKey = @ForeignKey(name = "fk_bar_foo"), nullable = false)
+		private FooEntity foo;
+
+		@Override
+		public Long getId() {
+			return id;
+		}
+
+		@Override
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public FooEntity getFoo() {
+			return foo;
+		}
+
+		public void setFoo(FooEntity foo) {
+			this.foo = foo;
+		}
+
+		@Override
+		public String toString() {
+			return String.format("BarEntity: id=%d", id);
+		}
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java
index 5c9279a45894..2161fdc92e71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -118,7 +116,7 @@ public void testAssociatedWithMultiplePersistenceContexts() {
 		s1 = openSession();
 		s1.beginTransaction();
 		myReferenceData = s1.get( MyEnhancedReferenceData.class, myReferenceData.getId() );
-	    myOtherReferenceData = s1.get( MyEnhancedReferenceData.class, myOtherReferenceData.getId() );
+		myOtherReferenceData = s1.get( MyEnhancedReferenceData.class, myOtherReferenceData.getId() );
 		assertTrue( s1.contains( myReferenceData ) );
 		assertTrue( s1.contains( myOtherReferenceData ) );
 		// prev/next references should be null; entityEntry should be non-null;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java
index ccdc9c638393..5cdf30cf99c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -21,7 +19,6 @@
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Chris Cranford
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheModeGetUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheModeGetUpdateTest.java
index 476490e46b5a..70119bec9f7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheModeGetUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheModeGetUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java
index d71737c5d2aa..8b38c88375eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.io.Serializable;
@@ -13,7 +17,6 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java
index 233bc5796449..b0a6b67e1407 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java
index 8d83a275ce60..8387390d8a1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java
index 3fd1d209902e..dc7c6b6e477b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import org.hibernate.annotations.Cache;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java
index b5ca5fc39b75..df2fe5dab91d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java
index ad13089285ce..051e5c7b5f3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -89,7 +87,7 @@ protected void cleanupTest() throws Exception {
 
 	@Test
 	public void testCachedValueAfterEviction() {
-        CollectionPersister persister = sessionFactory().getRuntimeMetamodels()
+		CollectionPersister persister = sessionFactory().getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getCollectionDescriptor(Company.class.getName() + ".users");
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
index acb7e24d3e60..7abe68fb7d14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java
index 5d6392f32374..4791d2f21866 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.cache;
 
 import jakarta.persistence.Entity;
@@ -24,7 +21,7 @@ public class Company {
 	int id;
 
 	String name;
-	
+
 	@OneToMany(fetch = FetchType.LAZY, mappedBy = "company")
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 	List users = new ArrayList();
@@ -59,5 +56,5 @@ public List getUsers() {
 	public void setUsers(List users) {
 		this.users = users;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java
index 350f0a76072e..da3b87f44844 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java
index b70ea6d1021b..496fedb952d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java
index 565ecc4f3922..5b106b48a0b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java
index be9cd97e3e9d..b916b87209ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java
index 101d0d1b0661..29ed6959ad5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/L2CacheAccessNoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/L2CacheAccessNoCommitTest.java
index 6b32f3621167..1369029b6fd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/L2CacheAccessNoCommitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/L2CacheAccessNoCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LazyOneToOneWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LazyOneToOneWithCollectionTest.java
index cb3e7152ad3a..7193200ed7ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LazyOneToOneWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LazyOneToOneWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
index be956a300cb8..24cc93779a7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import org.junit.After;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java
index 8e5695265d96..c1d4cef28298 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneTest.java
index b04f2549717a..25d6ae09b8c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.io.Serializable;
@@ -17,9 +21,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.junit.Before;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneWithOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneWithOptimisticLockingTest.java
index 771be42780cf..944a0a3ade14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneWithOptimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToOneWithOptimisticLockingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NaturalIdTest.java
index ad0a4cf7e353..537a84aef01e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NaturalIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import org.hibernate.annotations.Cache;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java
index 8eeb98a5aa5f..91b6941f4b3b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import org.hibernate.cache.internal.NoCachingRegionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java
index 7e5b1d50030a..4b66e2216154 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -15,7 +13,6 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.internal.EntityBinder;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.internal.CoreMessageLogger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java
index 79339996b125..91d6c880af6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -13,7 +11,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.internal.EntityBinder;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.internal.CoreMessageLogger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheAndOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheAndOneToManyTest.java
index 9e24b30f69d8..168a3797a595 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheAndOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheAndOneToManyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheWithObjectParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheWithObjectParameterTest.java
index fb7ffa91bb4d..00717923151c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheWithObjectParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QueryCacheWithObjectParameterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cache;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java
index 7d46b2ae67c1..c2e6f8237153 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java
index 1e87471a7205..a40aa9e52f20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java
index 8a87bc77da05..745a76fd962c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java
index 9ae6d055fd9a..a08a64d3399b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java
index 0034cc94c001..ca72518fa7ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -11,7 +9,6 @@
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.cache.internal.NoCachingRegionFactory;
 import org.hibernate.cache.spi.RegionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/StructuredEntityCacheInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/StructuredEntityCacheInheritanceTest.java
index 6e68a8077305..b557c4037e82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/StructuredEntityCacheInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/StructuredEntityCacheInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java
index f2c424e95a9b..af0d17a8ce2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache;
 
@@ -36,9 +34,6 @@
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
 
 /**
  * @author Christian Beikov
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java
index 1956310f4e1a..c237698285e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.cache;
 
 import jakarta.persistence.Column;
@@ -25,17 +22,17 @@ public class User {
 	@Id
 	int id;
 
-	
+
 	@Version
 	@Column(name="OPTLOCK")
 	private int version;
 
-	
-	
+
+
 	@Column
 	private String name;
-	
-	
+
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	Company company;
 
@@ -66,8 +63,8 @@ public Company getCompany() {
 	public void setCompany(Company group) {
 		this.company = group;
 	}
-	
-	
+
+
 
 	public int getVersion() {
 		return version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java
index 4409e6111fae..bf0ee8b8bae6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java
index 1f8f5d1e04bf..d624ea7200ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java
index ba439b8ead9b..df4f31c27dac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java
index 1baeaac8379e..1228c5b1d858 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java
index 20de0a348e85..8b631146bfec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java
@@ -1,20 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
 public abstract class DiscriminatorSubclassPerson {
 
-   private Long oid;
+private Long oid;
 
-   public Long getOid() {
-      return oid;
-   }
+public Long getOid() {
+	return oid;
+}
 
-   public void setOid(Long oid) {
-      this.oid = oid;
-   }
+public void setOid(Long oid) {
+	this.oid = oid;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java
index 317bfbe6a7e1..943d217a8e8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java
index 6e2b01648a99..b030e4341218 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java
index b763ed852f15..e07385900fa1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java
index 6856b3cffbac..3d89db409f0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java
@@ -1,20 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
 public abstract class JoinedSubclassPerson {
 
-   private Long oid;
+private Long oid;
 
-   public Long getOid() {
-      return oid;
-   }
+public Long getOid() {
+	return oid;
+}
 
-   public void setOid(Long oid) {
-      this.oid = oid;
-   }
+public void setOid(Long oid) {
+	this.oid = oid;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java
index a665d0990368..d297cb510896 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java
index 45a16e400d22..646bc756ed85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java
index 8fc9cb90ea67..592fd035ac3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java
@@ -1,20 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
 public abstract class UnionSubclassPerson {
 
-   private Long oid;
+private Long oid;
 
-   public Long getOid() {
-      return oid;
-   }
+public Long getOid() {
+	return oid;
+}
 
-   public void setOid(Long oid) {
-      this.oid = oid;
-   }
+public void setOid(Long oid) {
+	this.oid = oid;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java
index 09641d571e06..39eed9897421 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.hhh13179;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CacheHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CacheHolder.java
index 8760800dabbf..6f08b740770d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CacheHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CacheHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
@@ -47,4 +45,4 @@ public Cacheable getItem() {
 	public void setItem(Cacheable item) {
 		this.item = item;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/Cacheable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/Cacheable.java
index 6cc8471cbf2f..caf479de64f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/Cacheable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/Cacheable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java
index c2301f77de60..eaf69fd1c557 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
@@ -22,5 +20,5 @@ public CachedItem1() {
 	public CachedItem1(long id, String name) {
 		super( id, name );
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java
index 1a6eca053917..317e64307c8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
@@ -22,5 +20,5 @@ public CachedItem2() {
 	public CachedItem2(long id, String name) {
 		super( id, name );
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheAndBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheAndBatchingTest.java
index 5301c4f202c1..340c81dda8f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheAndBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheAndBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java
index fb92bd264425..f49cd3c3a780 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cache.polymorphism;
 
@@ -129,7 +127,7 @@ public void testPolymorphismAndCache(SessionFactoryScope scope) {
 
 			} );
 		} );
-		
+
 		// test deleting
 		scope.inSession( (session) -> {
 			scope.inTransaction( session, (s) -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CacheReadOnlyStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CacheReadOnlyStrategyTest.java
index b09720f6a66b..fa0286b6fbc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CacheReadOnlyStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CacheReadOnlyStrategyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import java.util.List;
@@ -92,8 +96,8 @@ public void testPersistThenClearAndQueryWithRollback(EntityManagerFactoryScope s
 		scope.inTransaction(
 				entityManager -> {
 					assertFalse( scope.getEntityManagerFactory()
-										 .getCache()
-										 .contains( TestEntity.class, testEntityId ) );
+										.getCache()
+										.contains( TestEntity.class, testEntityId ) );
 					List results = entityManager.createQuery(
 							"select t from TestEntity t where t.id = :id",
 							TestEntity.class
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
index 3344ec88b0ee..547e81c4c3cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import org.hibernate.annotations.BatchSize;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionOneToOneLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionOneToOneLazyTest.java
index 8f57d2d3eaaa..a1553edbd2e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionOneToOneLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionOneToOneLazyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java
index 3bc123d8a80c..b92401981d1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java
index 40803bc65c3b..c33054b28451 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
index 04ef656f0aab..7ec1d513c204 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
@@ -1,7 +1,10 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.caching;
 
 import java.time.Instant;
-import java.util.List;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -22,8 +25,6 @@
 import jakarta.persistence.Id;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @JiraKey("HHH-17997")
 @Jpa(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/NaturalIdCacheKeyCreationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/NaturalIdCacheKeyCreationTests.java
index 1dd7fa54eb72..a4cf55a37df4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/NaturalIdCacheKeyCreationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/NaturalIdCacheKeyCreationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java
index ebf630151521..d70599b8f0d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching.mocked;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java
index 2734e61981bb..9c2c0810aec3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching.mocked;
 
@@ -26,7 +24,6 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author Gail Badner
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/NaturalIdCacheKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/NaturalIdCacheKeyTest.java
index e44e45f749d9..dbf3bcb7c158 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/NaturalIdCacheKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/NaturalIdCacheKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching.mocked;
 
@@ -31,45 +29,45 @@
 
 public class NaturalIdCacheKeyTest {
 
-    @Test
-    public void testSerializationRoundTrip() throws Exception {
-        final SessionFactoryImplementor sessionFactoryImplementor = mock( SessionFactoryImplementor.class );
-        final SessionImplementor sessionImplementor = mock( SessionImplementor.class );
-
-        final RuntimeMetamodelsImplementor runtimeMetamodels = mock( RuntimeMetamodelsImplementor.class );
-        final EntityPersister entityPersister = mock( EntityPersister.class );
-        final NaturalIdMapping naturalIdMapping = mock( NaturalIdMapping.class );
-
-        when( sessionImplementor.getFactory() ).thenReturn( sessionFactoryImplementor );
-        when( sessionFactoryImplementor.getRuntimeMetamodels()).thenReturn( runtimeMetamodels );
-        when( runtimeMetamodels.getEntityMappingType( anyString() ) ).thenReturn( entityPersister );
-        when( entityPersister.getRootEntityName() ).thenReturn( "EntityName" );
-        when( entityPersister.getNaturalIdMapping() ).thenReturn( naturalIdMapping );
-        when( naturalIdMapping.disassemble( any(), eq( sessionImplementor ) ) ).thenAnswer( invocation -> invocation.getArguments()[0] );
-        when( naturalIdMapping.calculateHashCode( any() ) ).thenAnswer( invocation -> invocation.getArguments()[0].hashCode() );
-
-
-        final NaturalIdCacheKey key = (NaturalIdCacheKey) DefaultCacheKeysFactory.staticCreateNaturalIdKey( new Object[] {"a", "b", "c"}, entityPersister, sessionImplementor );
-
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(key);
-        
-        final ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
-        final NaturalIdCacheKey keyClone = (NaturalIdCacheKey) ois.readObject();
-        
-        assertEquals(key, keyClone);
-        assertEquals(key.hashCode(), keyClone.hashCode());
-        assertEquals(key.toString(), keyClone.toString());
-        assertEquals(key.getEntityName(), keyClone.getEntityName());
-        assertArrayEquals( (Object[]) key.getNaturalIdValues(), (Object[]) keyClone.getNaturalIdValues() );
-        assertEquals(key.getTenantId(), keyClone.getTenantId());
-        
-    }
-
-
-    @Test
-    public void testSimpleKeyCreation() {
-
-    }
+	@Test
+	public void testSerializationRoundTrip() throws Exception {
+		final SessionFactoryImplementor sessionFactoryImplementor = mock( SessionFactoryImplementor.class );
+		final SessionImplementor sessionImplementor = mock( SessionImplementor.class );
+
+		final RuntimeMetamodelsImplementor runtimeMetamodels = mock( RuntimeMetamodelsImplementor.class );
+		final EntityPersister entityPersister = mock( EntityPersister.class );
+		final NaturalIdMapping naturalIdMapping = mock( NaturalIdMapping.class );
+
+		when( sessionImplementor.getFactory() ).thenReturn( sessionFactoryImplementor );
+		when( sessionFactoryImplementor.getRuntimeMetamodels()).thenReturn( runtimeMetamodels );
+		when( runtimeMetamodels.getEntityMappingType( anyString() ) ).thenReturn( entityPersister );
+		when( entityPersister.getRootEntityName() ).thenReturn( "EntityName" );
+		when( entityPersister.getNaturalIdMapping() ).thenReturn( naturalIdMapping );
+		when( naturalIdMapping.disassemble( any(), eq( sessionImplementor ) ) ).thenAnswer( invocation -> invocation.getArguments()[0] );
+		when( naturalIdMapping.calculateHashCode( any() ) ).thenAnswer( invocation -> invocation.getArguments()[0].hashCode() );
+
+
+		final NaturalIdCacheKey key = (NaturalIdCacheKey) DefaultCacheKeysFactory.staticCreateNaturalIdKey( new Object[] {"a", "b", "c"}, entityPersister, sessionImplementor );
+
+		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		final ObjectOutputStream oos = new ObjectOutputStream(baos);
+		oos.writeObject(key);
+
+		final ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+		final NaturalIdCacheKey keyClone = (NaturalIdCacheKey) ois.readObject();
+
+		assertEquals(key, keyClone);
+		assertEquals(key.hashCode(), keyClone.hashCode());
+		assertEquals(key.toString(), keyClone.toString());
+		assertEquals(key.getEntityName(), keyClone.getEntityName());
+		assertArrayEquals( (Object[]) key.getNaturalIdValues(), (Object[]) keyClone.getNaturalIdValues() );
+		assertEquals(key.getTenantId(), keyClone.getTenantId());
+
+	}
+
+
+	@Test
+	public void testSimpleKeyCreation() {
+
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java
index 7a4b9bc980aa..f4f033ba1d3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching.mocked;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/package-info.java
index fdabdbb6855e..4293b6caf2ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Simple mock-driven tests for key and access contracts related to caching
  */
-package org.hibernate.orm.test.caching.mocked;
\ No newline at end of file
+package org.hibernate.orm.test.caching.mocked;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java
index 269cec8c3fab..ee2b5c2af338 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java
@@ -1,105 +1,102 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
 import java.util.HashSet;
 import java.util.Set;
-import jakarta.persistence.OneToMany;
 
 public class A
 {
-    // Constants -----------------------------------------------------------------------------------
+	// Constants -----------------------------------------------------------------------------------
 
-    // Static --------------------------------------------------------------------------------------
+	// Static --------------------------------------------------------------------------------------
 
-    // Attributes ----------------------------------------------------------------------------------
+	// Attributes ----------------------------------------------------------------------------------
 
-    private long id;
+	private long id;
 
-    private String data;
+	private String data;
 
-    // A 1 - * H
-    private Set hs;
+	// A 1 - * H
+	private Set hs;
 
-    // A 1 - 1 G
-    private G g;
+	// A 1 - 1 G
+	private G g;
 
 
-    // Constructors --------------------------------------------------------------------------------
+	// Constructors --------------------------------------------------------------------------------
 
-    public A()
-    {
-        hs = new HashSet();
-    }
+	public A()
+	{
+		hs = new HashSet();
+	}
 
-    public A(String data)
-    {
-        this();
-        this.data = data;
-    }
+	public A(String data)
+	{
+		this();
+		this.data = data;
+	}
 
-    // Public --------------------------------------------------------------------------------------
+	// Public --------------------------------------------------------------------------------------
 
-    public long getId()
-    {
-        return id;
-    }
+	public long getId()
+	{
+		return id;
+	}
 
-    public void setId(long id)
-    {
-        this.id = id;
-    }
+	public void setId(long id)
+	{
+		this.id = id;
+	}
 
-    public void setData(String data)
-    {
-        this.data = data;
-    }
+	public void setData(String data)
+	{
+		this.data = data;
+	}
 
-    public String getData()
-    {
-        return data;
-    }
+	public String getData()
+	{
+		return data;
+	}
 
-    public void setHs(Set hs)
-    {
-        this.hs = hs;
-    }
+	public void setHs(Set hs)
+	{
+		this.hs = hs;
+	}
 
-    public Set getHs()
-    {
-        return hs;
-    }
+	public Set getHs()
+	{
+		return hs;
+	}
 
-    public void setG(G g)
-    {
-        this.g = g;
-    }
+	public void setG(G g)
+	{
+		this.g = g;
+	}
 
-    public G getG()
-    {
-        return g;
-    }
+	public G getG()
+	{
+		return g;
+	}
 
-    public void addH(H h)
-    {
-        hs.add(h);
-        h.setA(this);
-    }
+	public void addH(H h)
+	{
+		hs.add(h);
+		h.setA(this);
+	}
 
-    public String toString()
-    {
-        return "A[" + id + ", " + data + "]";
-    }
+	public String toString()
+	{
+		return "A[" + id + ", " + data + "]";
+	}
 
-    // Package protected ---------------------------------------------------------------------------
+	// Package protected ---------------------------------------------------------------------------
 
-    // Protected -----------------------------------------------------------------------------------
+	// Protected -----------------------------------------------------------------------------------
 
-    // Private -------------------------------------------------------------------------------------
+	// Private -------------------------------------------------------------------------------------
 
-    // Inner classes -------------------------------------------------------------------------------
+	// Inner classes -------------------------------------------------------------------------------
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
index 6ea258a18825..88e0a8d87428 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java
index c1f8c1729137..26894cdb89a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java
index d3c609ce2882..54816285b603 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
index 4c3d67e7440f..955807ae31ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Child.java
index 063d610c4a56..af12fc1119db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/DeleteOrphanChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/DeleteOrphanChild.java
index aae3dfd7e845..a92567b7241c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/DeleteOrphanChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/DeleteOrphanChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java
index ea1c566a9142..47ec98da9bf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.cascade;
 
 import java.util.HashSet;
@@ -13,82 +9,82 @@
 
 public class G
 {
-    // Constants -----------------------------------------------------------------------------------
+	// Constants -----------------------------------------------------------------------------------
 
-    // Static --------------------------------------------------------------------------------------
+	// Static --------------------------------------------------------------------------------------
 
-    // Attributes ----------------------------------------------------------------------------------
+	// Attributes ----------------------------------------------------------------------------------
 
-    private long id;
+	private long id;
 
-    private String data;
+	private String data;
 
-    // A 1 <-> 1 G
-    private A a;
+	// A 1 <-> 1 G
+	private A a;
 
-    // G * <-> * H
-    private Set hs;
+	// G * <-> * H
+	private Set hs;
 
-    // Constructors --------------------------------------------------------------------------------
+	// Constructors --------------------------------------------------------------------------------
 
-    public G()
-    {
-        this(null);
-    }
+	public G()
+	{
+		this(null);
+	}
 
-    public G(String data)
-    {
-        this.data = data;
-        hs = new HashSet();
-    }
+	public G(String data)
+	{
+		this.data = data;
+		hs = new HashSet();
+	}
 
-    // Public --------------------------------------------------------------------------------------
+	// Public --------------------------------------------------------------------------------------
 
-    public String getData()
-    {
-        return data;
-    }
+	public String getData()
+	{
+		return data;
+	}
 
-    public void setData(String data)
-    {
-        this.data = data;
-    }
+	public void setData(String data)
+	{
+		this.data = data;
+	}
 
-    public A getA()
-    {
-        return a;
-    }
+	public A getA()
+	{
+		return a;
+	}
 
-    public void setA(A a)
-    {
-        this.a = a;
-    }
+	public void setA(A a)
+	{
+		this.a = a;
+	}
 
-    public Set getHs()
-    {
-        return hs;
-    }
+	public Set getHs()
+	{
+		return hs;
+	}
 
-    public void setHs(Set s)
-    {
-        hs = s;
-    }
+	public void setHs(Set s)
+	{
+		hs = s;
+	}
 
-    // Package protected ---------------------------------------------------------------------------
+	// Package protected ---------------------------------------------------------------------------
 
-    long getId()
-    {
-        return id;
-    }
+	long getId()
+	{
+		return id;
+	}
 
-    // Protected -----------------------------------------------------------------------------------
+	// Protected -----------------------------------------------------------------------------------
 
-    // Private -------------------------------------------------------------------------------------
+	// Private -------------------------------------------------------------------------------------
 
-    private void setId(long id)
-    {
-        this.id = id;
-    }
+	private void setId(long id)
+	{
+		this.id = id;
+	}
 
-    // Inner classes -------------------------------------------------------------------------------
+	// Inner classes -------------------------------------------------------------------------------
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java
index 5f8ead4c5c1f..39ddb93ce96d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java
@@ -1,95 +1,89 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.cascade;
 
 import java.util.HashSet;
 import java.util.Set;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 
 public class H
 {
-    // Constants -----------------------------------------------------------------------------------
+	// Constants -----------------------------------------------------------------------------------
 
-    // Static --------------------------------------------------------------------------------------
+	// Static --------------------------------------------------------------------------------------
 
-    // Attributes ----------------------------------------------------------------------------------
+	// Attributes ----------------------------------------------------------------------------------
 
-    private long id;
+	private long id;
 
-    private String data;
+	private String data;
 
-    private A a;
+	private A a;
 
-    // G * <-> * H
-    private Set gs;
+	// G * <-> * H
+	private Set gs;
 
-    // Constructors --------------------------------------------------------------------------------
+	// Constructors --------------------------------------------------------------------------------
 
-    public H()
-    {
-        this(null);
-    }
+	public H()
+	{
+		this(null);
+	}
 
-    public H(String data)
-    {
-        this.data = data;
-        gs = new HashSet();
-    }
+	public H(String data)
+	{
+		this.data = data;
+		gs = new HashSet();
+	}
 
-    // Public --------------------------------------------------------------------------------------
+	// Public --------------------------------------------------------------------------------------
 
-    public long getId()
-    {
-        return id;
-    }
+	public long getId()
+	{
+		return id;
+	}
 
-    public String getData()
-    {
-        return data;
-    }
+	public String getData()
+	{
+		return data;
+	}
 
-    public void setData(String data)
-    {
-        this.data = data;
-    }
+	public void setData(String data)
+	{
+		this.data = data;
+	}
 
-    public A getA()
-    {
-        return a;
-    }
+	public A getA()
+	{
+		return a;
+	}
 
-    public void setA(A a)
-    {
-        this.a = a;
-    }
+	public void setA(A a)
+	{
+		this.a = a;
+	}
 
-    public Set getGs()
-    {
-        return gs;
-    }
+	public Set getGs()
+	{
+		return gs;
+	}
 
-    public void setGs(Set gs)
-    {
-        this.gs = gs;
-    }
+	public void setGs(Set gs)
+	{
+		this.gs = gs;
+	}
 
-    // Package protected ---------------------------------------------------------------------------
+	// Package protected ---------------------------------------------------------------------------
 
-    // Protected -----------------------------------------------------------------------------------
+	// Protected -----------------------------------------------------------------------------------
 
-    // Private -------------------------------------------------------------------------------------
+	// Private -------------------------------------------------------------------------------------
 
-    private void setId(long id)
-    {
-        this.id = id;
-    }
+	private void setId(long id)
+	{
+		this.id = id;
+	}
 
-    // Inner classes -------------------------------------------------------------------------------
+	// Inner classes -------------------------------------------------------------------------------
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java
index 2810253d39f2..3d6cae7c5fe1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Job.java 6663 2005-05-03 20:55:31Z steveebersole $
 package org.hibernate.orm.test.cascade;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java
index e19780d1547f..457b62310bb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: JobBatch.java 6663 2005-05-03 20:55:31Z steveebersole $
 package org.hibernate.orm.test.cascade;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java
index 08896b0a32f2..c7074a86bbda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
index ffbfe21c49ec..f315284601a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Parent.java
index dc9f5f4195b8..3ce646e3cfb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java
index 2eeac9d6bc79..20ddfc014f4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
index f1763db1341c..3155e942b5bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java
index 7b726c5e3822..e5b806bd8b30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransientTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransientTest.java
index 4347c2192960..6b8fa72a37bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransientTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransientTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
index 0944f8ba300f..879128d26f66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
index 1bb38bb40c07..9b0cf29bb5e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
index dd1f73366f3c..d3f4f7d2fddb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
index 95b40ea7ed79..d8f18350bcb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
index 28d736119595..3b7121b4df03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
index 31d26da13230..2fd0fb47470e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
index c632aff3e921..150da7ad642b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cascade.circle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Node.java
index 54eb075190ca..66158597fbca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Node.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-//$Id: $
 package org.hibernate.orm.test.cascade.circle;
 
 import java.util.HashSet;
@@ -19,22 +16,22 @@ public class Node {
 	private Long nodeID;
 
 	private long version;
-	
+
 	private String name;
-	
+
 	/** the list of orders that are delivered at this node */
 //	@OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.MERGE, CascadeType.REFRESH}, mappedBy="deliveryNode")
 	private Set deliveryTransports = new HashSet();
-	
+
 	/** the list of orders that are picked up at this node */
 //	@OneToMany(fetch=FetchType.LAZY, cascade=CascadeType.ALL, mappedBy="pickupNode")
 	private Set pickupTransports = new HashSet();
-	
+
 	/** the route to which this node belongs */
 //	@ManyToOne(targetEntity=Route.class, optional=false, fetch=FetchType.EAGER)
 //	@JoinColumn(name="ROUTEID", nullable=false, insertable=true, updatable=true)
 	private Route route = null;
-	
+
 	/** the tour this node belongs to, null if this node does not belong to a tour (e.g first node of a route) */
 //	@ManyToOne(targetEntity=Tour.class, cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, optional=true, fetch=FetchType.LAZY)
 //	@JoinColumn(name="TOURID", nullable=true, insertable=true, updatable=true)
@@ -90,7 +87,7 @@ public void setRoute(Route route) {
 	public Tour getTour() {
 		return tour;
 	}
-	
+
 	public void setTour(Tour tour) {
 		this.tour = tour;
 	}
@@ -98,7 +95,7 @@ public void setTour(Tour tour) {
 	public String toString()
 	{
 		StringBuilder buffer = new StringBuilder();
-		
+
 		buffer.append( name + " id: " + nodeID );
 		if ( route != null ) {
 			buffer.append( " route name: " )
@@ -111,13 +108,13 @@ public String toString()
 				buffer.append("Pickup transports: " + it.next());
 			}
 		}
-		
+
 		if ( deliveryTransports != null ) {
 			for (Iterator it = deliveryTransports.iterator(); it.hasNext();) {
 				buffer.append("Delviery transports: " + it.next());
 			}
 		}
-		
+
 		return buffer.toString();
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Route.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Route.java
index fd5767b8f3e6..a580f520ca3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Route.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Route.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.cascade.circle;
 
 import java.util.HashSet;
@@ -14,7 +10,7 @@
 
 
 public class Route {
-	
+
 //	@Id
 //	@SequenceGenerator(name="ROUTE_SEQ", sequenceName="ROUTE_SEQ", initialValue=1, allocationSize=1)
 //	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ROUTE_SEQ")
@@ -29,7 +25,7 @@ public class Route {
 	private Set vehicles = new HashSet();
 
 	private String name;
-	
+
 //	@Transient
 	private String transientField = null;
 
@@ -64,7 +60,7 @@ protected void setRouteID(Long routeID) {
 	public Long getRouteID() {
 		return routeID;
 	}
-	
+
 	public long getVersion() {
 		return version;
 	}
@@ -76,12 +72,12 @@ protected void setVersion(long version) {
 	public String toString()
 	{
 		StringBuilder buffer = new StringBuilder();
-		
+
 		buffer.append("Route name: " + name + " id: " + routeID + " transientField: " + transientField + "\n");
 		for (Iterator it = nodes.iterator(); it.hasNext();) {
 			buffer.append("Node: " + it.next() );
 		}
-		
+
 		for (Iterator it = vehicles.iterator(); it.hasNext();) {
 			buffer.append("Vehicle: " + it.next() );
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Tour.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Tour.java
index e7ea0145141a..138a3f91522a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Tour.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Tour.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.cascade.circle;
 
 import java.util.HashSet;
@@ -14,7 +9,7 @@
 
 
 public class Tour {
-	
+
 //	@Id
 //	@SequenceGenerator(name="TOUR_SEQ", sequenceName="TOUR_SEQ", initialValue=1, allocationSize=1)
 //	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="TOUR_SEQ")
@@ -42,7 +37,7 @@ public long getVersion() {
 
 	protected void setVersion(long version) {
 		this.version = version;
-	}	
+	}
 
 	public void setName(String name) {
 		this.name = name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Transport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Transport.java
index a9cb7a3d2b6a..bb52a7291ff8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Transport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Transport.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.cascade.circle;
 
 public class Transport {
-	
+
 //	@Id
 //	@SequenceGenerator(name="TRANSPORT_SEQ", sequenceName="TRANSPORT_SEQ", initialValue=1, allocationSize=1)
 //	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="TRANSPORT_SEQ")
@@ -18,7 +14,7 @@ public class Transport {
 	private long version;
 
 	private String name;
-	
+
 	/** node value object at which the order is picked up */
 //	@ManyToOne(optional=false, cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, fetch=FetchType.EAGER)
 //	@JoinColumn(name="PICKUPNODEID", /*nullable=false,*/insertable=true, updatable=true)
@@ -73,7 +69,7 @@ public long getVersion() {
 	protected void setVersion(long version) {
 		this.version = version;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
@@ -81,13 +77,13 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String toString()
 	{
 		StringBuilder buffer = new StringBuilder();
-		
+
 		buffer.append(name + " id: " + transportID + "\n");
-		
+
 		return buffer.toString();
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Vehicle.java
index 2b2879703cff..a29454cc8bf1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Vehicle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/Vehicle.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.cascade.circle;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
index d886bc9f9110..eb545163f949 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cascade.circle.delete;
 
 import jakarta.persistence.Entity;
@@ -7,43 +11,43 @@
 
 @Entity
 public class Address {
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @ManyToOne
-    private Person person;
+	@ManyToOne
+	private Person person;
 
-    private String description;
+	private String description;
 
-    public Address() {
-    }
+	public Address() {
+	}
 
-    public Address(String description) {
-        this.description = description;
-    }
+	public Address(String description) {
+		this.description = description;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(final Long id) {
-        this.id = id;
-    }
+	public void setId(final Long id) {
+		this.id = id;
+	}
 
-    public Person getPerson() {
-        return person;
-    }
+	public Person getPerson() {
+		return person;
+	}
 
-    public void setPerson(Person person) {
-        this.person = person;
-    }
+	public void setPerson(Person person) {
+		this.person = person;
+	}
 
-    public String getDescription() {
-        return description;
-    }
+	public String getDescription() {
+		return description;
+	}
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
index 0decbaef5441..b0cb4018cd93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cascade.circle.delete;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
index 19b3a2f8352c..998fc720693b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cascade.circle.delete;
 
 import java.util.ArrayList;
@@ -17,49 +21,49 @@
 @OptimisticLocking(type = OptimisticLockType.DIRTY)
 @DynamicUpdate
 public class Person {
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    private String name;
+	private String name;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "person")
-    private final List
     addresses = new ArrayList<>();
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "person")
+	private final List
     addresses = new ArrayList<>();
 
-    @OneToOne(cascade = { CascadeType.ALL })
-    private Address currentAddress;
+	@OneToOne(cascade = { CascadeType.ALL })
+	private Address currentAddress;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(final Long id) {
-        this.id = id;
-    }
+	public void setId(final Long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public List
     getAddresses() {
-        return addresses;
-    }
+	public List
     getAddresses() {
+		return addresses;
+	}
 
-    public Address getCurrentAddress() {
-        return currentAddress;
-    }
+	public Address getCurrentAddress() {
+		return currentAddress;
+	}
 
-    public void setCurrentAddress(Address currentAddress) {
-        this.currentAddress = currentAddress;
-    }
+	public void setCurrentAddress(Address currentAddress) {
+		this.currentAddress = currentAddress;
+	}
 
-    public void addCurrentAddress(Address currentAddress){
-        this.addresses.add( currentAddress );
-        currentAddress.setPerson( this );
-        this.currentAddress = currentAddress;
-    }
+	public void addCurrentAddress(Address currentAddress){
+		this.addresses.add( currentAddress );
+		currentAddress.setPerson( this );
+		this.currentAddress = currentAddress;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java
index 2158615f88a5..44d10a00c9ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java
index 686645315670..e5a5153586db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MyData.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MyData.java
index 980844020580..55d501bb9bc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MyData.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MyData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/OrmXmlConverterBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/OrmXmlConverterBean.java
index 43b07a25bf05..c8189d3fcb02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/OrmXmlConverterBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/OrmXmlConverterBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java
index f8f8b8b2c257..e2cd0decf45c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheOrmXmlEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheOrmXmlEntity.java
index 466a4ef16b84..e8c4a90582a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheOrmXmlEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheOrmXmlEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java
index 8ca5d89a7e2e..805f5e2607a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.delayed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java
index efc04c92be0b..dc0815a300c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java
index 25e493967587..55e24d03fb38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java
index 109bf1ac7e1a..5f6ffc353bb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
@@ -66,7 +40,7 @@ public void testConverterIsNotIncorrectlyApplied() {
 		em.getTransaction().begin();
 		em.persist( w );
 		em.getTransaction().commit();
-		em.close();		
+		em.close();
 
 		em = entityManagerFactory().createEntityManager();
 		em.getTransaction().begin();
@@ -162,9 +136,9 @@ public void setCost(Money cost) {
 		}
 
 	}
-	
 
 
 
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java
index 769bce86252d..e07f90313caa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java
index 67c2a2ebeb89..e5e886c66cdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java
index 78a3dd0d30e2..eeb44a235577 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java
@@ -1,37 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java
index 7c287c96abb8..3459c9dc6382 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.converters.standard;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java
index 1adaf9d8a076..e31a15dfa616 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java
index 40cf4e960a2c..f31f93eaa084 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java
index 833bf1501053..eb596019ce54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java
index b8fa2059a38e..3f880fde111b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.delayed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java
index 4c3406989481..bae5601236da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.extended;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java
index f4828ee637e1..24555ae2ec0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.extended;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java
index 1292e8b63248..7e9c3f03804f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.nocdi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java
index 3091cc605b57..dc56be58a9b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.nocdi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java
index 9926549f180b..7ac1df119c9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.events.standard;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/HibernateSearchSimulatedIntegrator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/HibernateSearchSimulatedIntegrator.java
index 0efc80615cd6..d887ffa18464 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/HibernateSearchSimulatedIntegrator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/HibernateSearchSimulatedIntegrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
@@ -29,7 +27,7 @@
  * @author Yoann Rodiere
  */
 public class HibernateSearchSimulatedIntegrator implements Integrator, BeanContainer.LifecycleOptions {
-	
+
 	private final BeanInstanceProducer fallbackBeanInstanceProducer;
 
 	private ContainedBeanImplementor applicationScopedBean1;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/Monitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/Monitor.java
index 5cef3bce42ee..72e52fd6062c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/Monitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/Monitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedApplicationScopedBeanImpl.java
index 7fb24fccbd2f..e6f7b84f3474 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedApplicationScopedBeanImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedApplicationScopedBeanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedDependentBeanImpl.java
index 4189809d73e9..0c4eee8f7837 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedDependentBeanImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheAlternativeNamedDependentBeanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheApplicationScopedBean.java
index 73cd44e42e55..c9dcf9f12f39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheApplicationScopedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheApplicationScopedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheDependentBean.java
index 4383df01d328..a7c9c79925a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheDependentBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheDependentBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheEntity.java
index 648a75a147e0..630e043a051e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheFallbackBeanInstanceProducer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheFallbackBeanInstanceProducer.java
index db9fac54d5f4..0db51fed66e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheFallbackBeanInstanceProducer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheFallbackBeanInstanceProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedApplicationScopedBeanImpl.java
index b4521f046d27..0f13b66494b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedApplicationScopedBeanImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedApplicationScopedBeanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedDependentBeanImpl.java
index a2aa10ffb845..0ea45bf7a4bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedDependentBeanImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheMainNamedDependentBeanImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedApplicationScopedBean.java
index 6d19c2b26f7e..9232d3b88986 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedApplicationScopedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedApplicationScopedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedDependentBean.java
index 3f5028b5d7f6..0a7bc512f7ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedDependentBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNamedDependentBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNestedDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNestedDependentBean.java
index 9b4660a800a1..675ebaa773c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNestedDependentBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNestedDependentBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNonHibernateBeanConsumer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNonHibernateBeanConsumer.java
index 9d767112e554..0b7382e469ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNonHibernateBeanConsumer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheNonHibernateBeanConsumer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheReflectionInstantiatedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheReflectionInstantiatedBean.java
index 42673762f19b..7a36985c02a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheReflectionInstantiatedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheReflectionInstantiatedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheSharedApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheSharedApplicationScopedBean.java
index 514821bb5afd..569ef14a79f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheSharedApplicationScopedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/TheSharedApplicationScopedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/delayed/HibernateSearchDelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/delayed/HibernateSearchDelayedCdiSupportTest.java
index b96cae3f49ce..7706e58dd53e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/delayed/HibernateSearchDelayedCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/delayed/HibernateSearchDelayedCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch.delayed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/extended/HibernateSearchExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/extended/HibernateSearchExtendedCdiSupportTest.java
index 4b1527a7b723..5541fcf1fc08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/extended/HibernateSearchExtendedCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/extended/HibernateSearchExtendedCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch.extended;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/standard/HibernateSearchStandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/standard/HibernateSearchStandardCdiSupportTest.java
index f7dd36d233dc..2c8d37846712 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/standard/HibernateSearchStandardCdiSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/hibernatesearch/standard/HibernateSearchStandardCdiSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.hibernatesearch.standard;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java
index 47d8fc8baf81..f41c33e29e55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
@@ -11,7 +9,6 @@
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.resource.beans.container.internal.CdiBeanContainerBuilder;
 import org.hibernate.resource.beans.container.internal.CdiBeanContainerDelayedAccessImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java
index 17323076232e..5ed6d6ff0e75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
@@ -10,7 +8,6 @@
 import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.resource.beans.container.internal.CdiBeanContainerExtendedAccessImpl;
 import org.hibernate.resource.beans.container.spi.BeanContainer;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java
index ee8a3f430e7a..9e6d51bd0652 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java
index c2ed28192a2a..6a2331eab162 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java
index 2cb89d5ed8a4..a0a2b684eb21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
@@ -11,7 +9,6 @@
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.resource.beans.container.internal.CdiBeanContainerBuilder;
 import org.hibernate.resource.beans.container.internal.CdiBeanContainerImmediateAccessImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java
index 5624d018a2e0..ab19965edaa0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java
index bd957f03f6f1..b7105d26ee4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.general.mixed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java
index 28f5425ce785..404f1e9c58d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.lifecycle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java
index e0e2586ec778..8c02c3f0e2eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.lifecycle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java
index 393b0b1086c3..5f3a61b4f375 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.lifecycle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerSmokeTests.java
index d78693f454f2..5a6655be2b93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerSmokeTests.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.lifecycle;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java
index eb3b9387a4eb..f5fb8406a773 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.testsupport;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java
index 8d5cadf258f3..b6d9f4aa32e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.testsupport;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/CdiSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/CdiSmokeTests.java
index a6042824a782..6019d1f7e73b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/CdiSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/CdiSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/ExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/ExtendedBeanManagerImpl.java
index 2da3e6a3609a..da19924b2207 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/ExtendedBeanManagerImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/ExtendedBeanManagerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/OtherBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/OtherBean.java
index 132ee1e9bf0d..9f65ffd40332 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/OtherBean.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/OtherBean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/SimpleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/SimpleTests.java
index b1f926fb717a..24ed9b9f414c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/SimpleTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/SimpleTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/UrlType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/UrlType.java
index d2332d836d73..945dfc62697f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/UrlType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/type/UrlType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cdi.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java
index f43531a28c5c..75fe645cfdd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java
index ee97ca5ee13b..e62cfca7d3c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java
index 4ede0c209c63..7875376b7964 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java
index f5357eee0827..133816acd5c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java
index d5d3f1badbb6..990a52e3901a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java
index 89325abcc86e..5e9241e917d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg;
 
@@ -29,7 +27,7 @@
 /**
  * This test illustrates the problem when two related (in terms of joins)
  * classes have the same table name in different schemas.
- * 
+ *
  * @author Didier Villevalois
  */
 @JiraKey(value = "HHH-7134")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java
index aea1d318b77e..c8e062310551 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
@@ -25,5 +23,5 @@ public String getValue() {
 	public void setValue(String value) {
 		this.value = value;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java
index 2cc667974c31..ca1251e58cc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
@@ -14,7 +12,7 @@
 
 /**
  * Tests using of cacheable configuration files.
- * 
+ *
  * @author Tair Sabirgaliev
  */
 public class CacheConfigurationTest extends BaseUnitTestCase {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java
index b1f551271844..1e88e286f3aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
@@ -22,7 +20,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java
index 869121a68c00..f179cc5cd64c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java
index 91a1453d85ca..00cb34a308f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java
@@ -1,16 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
 public class Item {
 	Long id;
-	
+
 	String name;
-	
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java
index e8430c9d7913..1031371332d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java
index 1fdd3b509b7b..3379c96ac4a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java
index 0e56c2f3136f..d6ce39ab3be0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java
index 665a5dfdcb92..82a4f6c02918 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
@@ -504,7 +502,7 @@ public boolean hasCache() {
 		public EntityDataAccess getCacheAccessStrategy() {
 			return null;
 		}
-		
+
 		@Override
 		public boolean hasNaturalIdCache() {
 			return false;
@@ -735,10 +733,10 @@ public EntityRepresentationStrategy getRepresentationStrategy() {
 			return null;
 		}
 
-        @Override
-        public int[] resolveAttributeIndexes(String[] attributeNames) {
-            return null;
-        }
+		@Override
+		public int[] resolveAttributeIndexes(String[] attributeNames) {
+			return null;
+		}
 
 		@Override
 		public boolean canUseReferenceCacheEntries() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java
index c26e6231c53b..02139a344270 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
@@ -13,13 +11,13 @@
  */
 @Entity
 public class Palmtree extends Tree {
-    private double leaveSize;
+	private double leaveSize;
 
-    public double getLeaveSize() {
-        return leaveSize;
-    }
+	public double getLeaveSize() {
+		return leaveSize;
+	}
 
-    public void setLeaveSize(double leaveSize) {
-        this.leaveSize = leaveSize;
-    }
+	public void setLeaveSize(double leaveSize) {
+		this.leaveSize = leaveSize;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
index af867db584dc..caa0d5077a9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
@@ -19,7 +17,6 @@
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
@@ -54,7 +51,7 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-            fail("The entity persister should be overridden");
+			fail("The entity persister should be overridden");
 		}
 		catch ( MappingException e ) {
 			// expected
@@ -76,7 +73,7 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-            fail("The collection persister should be overridden but not the entity persister");
+			fail("The collection persister should be overridden but not the entity persister");
 		}
 		catch ( MappingException e ) {
 			// expected
@@ -87,7 +84,7 @@ public void testPersisterClassProvider() {
 		}
 
 
-        cfg = new Configuration();
+		cfg = new Configuration();
 		cfg.addAnnotatedClass( Tree.class );
 		cfg.addAnnotatedClass( Palmtree.class );
 		serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
@@ -97,7 +94,7 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-            fail("The entity persisters should be overridden in a class hierarchy");
+			fail("The entity persisters should be overridden in a class hierarchy");
 		}
 		catch ( MappingException e ) {
 			// expected
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java
index 046b8d538ee1..f10d1a4e0d7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java
index cf8a38fcea4f..39df0fa52569 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
@@ -14,7 +12,7 @@
  */
 @Entity
 public class Tree {
-    @Id
+	@Id
 	public Long getId() { return id; }
 	public void setId(Long id) {  this.id = id; }
 	private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java
index 05815954189c..3f7372198ef6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cfg.persister;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
index 77083100ad47..c69559a913ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java
index 11af4de75a92..23b5598e2011 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cid;
 
@@ -395,4 +393,3 @@ public void testGeneratedIdsWithChildren(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java
index b358f71427aa..1f48f5feefdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 4806 2004-11-25 14:37:00Z steveebersole $
 package org.hibernate.orm.test.cid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedInsideEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedInsideEmbeddedIdTest.java
index 6d8a83f0e1b1..74de7119885e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedInsideEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedInsideEmbeddedIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cid;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java
index 165e587eb39b..8759bb89e729 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: LineItem.java 4806 2004-11-25 14:37:00Z steveebersole $
 package org.hibernate.orm.test.cid;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java
index 5b5c32a8be5a..8bbc1698586d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Order.java 4806 2004-11-25 14:37:00Z steveebersole $
 package org.hibernate.orm.test.cid;
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java
index 0ed3f1150a6d..0ed8a44b8795 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Product.java 4806 2004-11-25 14:37:00Z steveebersole $
 package org.hibernate.orm.test.cid;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java
index ddeca4b7124b..a1cce51914c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cid;
 
@@ -12,20 +10,20 @@
  * @author Jacob Robertson
  */
 public class PurchaseDetail {
-	
+
 	private PurchaseRecord purchaseRecord;
-	
+
 	private String productId;
 	private int quantity;
-	
+
 	public PurchaseDetail(PurchaseRecord record, String productId, int quantity) {
 		this.productId = productId;
 		this.quantity = quantity;
 		this.purchaseRecord = record;
 	}
 	public PurchaseDetail() {}
-	
-	
+
+
 	/**
 	 * @return the purchaseRecord
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.java
index 3d815c57ba38..16d5c63411c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java
index 6ff67ebc1241..a258aee349d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cid;
 
@@ -11,7 +9,7 @@
 
 /**
  * Simple {@link IdentifierGenerator} implementation for testing composite-id.
- * 
+ *
  * @author Jacob Robertson
  */
 public class PurchaseRecordIdGenerator implements IdentifierGenerator {
@@ -22,8 +20,8 @@ public class PurchaseRecordIdGenerator implements IdentifierGenerator {
 	@Override
 	public Object generate(SharedSessionContractImplementor s, Object obj) {
 		return new PurchaseRecord.Id(
-				nextPurchaseNumber++, 
+				nextPurchaseNumber++,
 				String.valueOf(nextPurchaseSequence++));
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionSQLRestrictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionSQLRestrictionTest.java
index 6273de77f008..bb3071a9ce0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionSQLRestrictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionSQLRestrictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java
index 1ed4055eda43..55ab201d8af8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/LoadEntityWithElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/LoadEntityWithElementCollectionTest.java
index 48773f9b0c96..1a1f8af4c412 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/LoadEntityWithElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/LoadEntityWithElementCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.HashSet;
@@ -7,7 +11,6 @@
 import org.hibernate.event.spi.EventType;
 import org.hibernate.event.spi.PostUpdateEvent;
 import org.hibernate.event.spi.PostUpdateEventListener;
-import org.hibernate.persister.entity.EntityPersister;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -219,4 +222,4 @@ public void setIndexedEntities(Set indexedEntities) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkCompositeJoinColumnCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkCompositeJoinColumnCollectionTest.java
index dca725b9ddf9..c1bd7386c704 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkCompositeJoinColumnCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkCompositeJoinColumnCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkJoinColumnCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkJoinColumnCollectionTest.java
index 7539afa323ae..9387d41d26fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkJoinColumnCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/NonPkJoinColumnCollectionTest.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java
index 1f9f53b6ae54..ffed5f628d3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/SetAndBagCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/SetAndBagCollectionTest.java
index dade05b57f03..a54a7f1c2182 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/SetAndBagCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/SetAndBagCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java
index e13808cf74a2..484f192ac144 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.backref.map.compkey;
 
@@ -10,7 +8,6 @@
 import org.hibernate.LockMode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.SerializationHelper;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/MapKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/MapKey.java
index 3fbc477d6cbb..01586958d26d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/MapKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/MapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.backref.map.compkey;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Part.java
index 2d01de5c017b..4d9b8fe8f877 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Part.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.backref.map.compkey;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Product.java
index 0ab2f1d295e4..58899ea9417d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.backref.map.compkey;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java
index 3f755dd36717..7be8dc4f8515 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.bag;
 
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java
index 0b65cf0dce42..2199e0c5a68a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java
@@ -1,17 +1,6 @@
 /*
- * Copyright 2014 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java
index 9ed2c02382c3..9a29dd408b96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagOwner.java
index ca7a776bf4a4..941e18165d77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java
index 1252246ec59c..b4c64b110e03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.bag;
 
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Item.java
index 1124390d31cd..fb4b66a4ccc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java
index 2c13f606f2d5..6df6f5aea18a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java
index 9a48eebab5d2..554a6258a58e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
@@ -20,13 +18,10 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.loader.MultipleBagFetchException;
 
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class MultipleBagFetchTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Order.java
index ec92c141ee8a..49ab0eccac0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java
index 25fc38e02de7..c0572cc8b27b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java
index bc7a31ea8cb3..89505778e78f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionSizeTest.java
index cae86a5ab989..b39f6335e28c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionSizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java
index 79d1b35738bc..2b2dfe0c6599 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.basic;
 
@@ -26,89 +24,89 @@
 @Table(name="contact")
 public class Contact implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String name;
-    private Set emailAddresses = new HashSet<>();
-    private Set emailAddresses2 = new HashSet<>();
-    private Map contactsByEmail = new HashMap<>();
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Basic
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ElementCollection
-    @CollectionTable(name = "user_email_addresses2", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"))
-    public Set getEmailAddresses2() {
-        return emailAddresses2;
-    }
-
-    public void setEmailAddresses2(Set emailAddresses2) {
-        this.emailAddresses2 = emailAddresses2;
-    }
-
-    @ElementCollection
-    @CollectionTable(name = "user_email_addresses", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"))
-    public Set getEmailAddresses() {
-        return emailAddresses;
-    }
-
-    public void setEmailAddresses(Set emailAddresses) {
-        this.emailAddresses = emailAddresses;
-    }
-
-    @ManyToMany
-    @CollectionTable(name="contact_email_addresses")
-    public Map getContactsByEmail() {
-        return contactsByEmail;
-    }
-
-    public void setContactsByEmail(Map contactsByEmail) {
-        this.contactsByEmail = contactsByEmail;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (id != null ? id.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof Contact)) {
-            return false;
-        }
-        final Contact other = (Contact) obj;
-        if (this.id == null || other.id == null) {
-            return this == obj;
-        }
-        if(!this.id.equals(other.id)) {
-            return this == obj;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "com.clevercure.web.hibernateissuecache.User[ id=" + id + " ]";
-    }
+	private static final long serialVersionUID = 1L;
+	private Long id;
+	private String name;
+	private Set emailAddresses = new HashSet<>();
+	private Set emailAddresses2 = new HashSet<>();
+	private Map contactsByEmail = new HashMap<>();
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Basic
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@ElementCollection
+	@CollectionTable(name = "user_email_addresses2", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"))
+	public Set getEmailAddresses2() {
+		return emailAddresses2;
+	}
+
+	public void setEmailAddresses2(Set emailAddresses2) {
+		this.emailAddresses2 = emailAddresses2;
+	}
+
+	@ElementCollection
+	@CollectionTable(name = "user_email_addresses", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"))
+	public Set getEmailAddresses() {
+		return emailAddresses;
+	}
+
+	public void setEmailAddresses(Set emailAddresses) {
+		this.emailAddresses = emailAddresses;
+	}
+
+	@ManyToMany
+	@CollectionTable(name="contact_email_addresses")
+	public Map getContactsByEmail() {
+		return contactsByEmail;
+	}
+
+	public void setContactsByEmail(Map contactsByEmail) {
+		this.contactsByEmail = contactsByEmail;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (id != null ? id.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof Contact)) {
+			return false;
+		}
+		final Contact other = (Contact) obj;
+		if (this.id == null || other.id == null) {
+			return this == obj;
+		}
+		if(!this.id.equals(other.id)) {
+			return this == obj;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "com.clevercure.web.hibernateissuecache.User[ id=" + id + " ]";
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java
index cd21f642fb47..c0bdbc121283 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.basic;
 
@@ -12,51 +10,51 @@
 @Embeddable
 public class EmailAddress implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-    private String email;
-
-    public EmailAddress() {
-    }
-
-    public EmailAddress(String email) {
-        this.email = email;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (email != null ? email.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof EmailAddress)) {
-            return false;
-        }
-        final EmailAddress other = (EmailAddress) obj;
-        if (this.email == null || other.email == null) {
-            return this == obj;
-        }
-        if(!this.email.equals(other.email)) {
-            return this == obj;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "com.clevercure.web.hibernateissuecache.EmailAddress[ email=" + email + " ]";
-    }
+	private static final long serialVersionUID = 1L;
+	private String email;
+
+	public EmailAddress() {
+	}
+
+	public EmailAddress(String email) {
+		this.email = email;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (email != null ? email.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof EmailAddress)) {
+			return false;
+		}
+		final EmailAddress other = (EmailAddress) obj;
+		if (this.email == null || other.email == null) {
+			return this == obj;
+		}
+		if(!this.email.equals(other.email)) {
+			return this == obj;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "com.clevercure.web.hibernateissuecache.EmailAddress[ email=" + email + " ]";
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java
index 993a8eadb33a..535c590e4d77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java
index 070ec599b471..e64dec515585 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.basic;
 
@@ -20,67 +18,67 @@
 @Table(name="users")
 public class User implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String name;
-    private Contact contact;
+	private static final long serialVersionUID = 1L;
+	private Long id;
+	private String name;
+	private Contact contact;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public Long getId() {
-        return id;
-    }
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    @Basic
-    public String getName() {
-        return name;
-    }
+	@Basic
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    @ManyToOne(optional = true)
-    @JoinColumn(name = "contact_id", nullable = true, unique = true)
-    public Contact getContact() {
-            return contact;
-    }
+	@ManyToOne(optional = true)
+	@JoinColumn(name = "contact_id", nullable = true, unique = true)
+	public Contact getContact() {
+			return contact;
+	}
 
-    public void setContact(Contact contact) {
-            this.contact = contact;
-    }
+	public void setContact(Contact contact) {
+			this.contact = contact;
+	}
 
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (id != null ? id.hashCode() : 0);
-        return hash;
-    }
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (id != null ? id.hashCode() : 0);
+		return hash;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof User)) {
-            return false;
-        }
-        final User other = (User) obj;
-        if (this.id == null || other.id == null) {
-            return this == obj;
-        }
-        if(!this.id.equals(other.id)) {
-            return this == obj;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof User)) {
+			return false;
+		}
+		final User other = (User) obj;
+		if (this.id == null || other.id == null) {
+			return this == obj;
+		}
+		if(!this.id.equals(other.id)) {
+			return this == obj;
+		}
+		return true;
+	}
 
-    @Override
-    public String toString() {
-        return "com.clevercure.web.hibernateissuecache.User[ id=" + id + " ]";
-    }
+	@Override
+	public String toString() {
+		return "com.clevercure.web.hibernateissuecache.User[ id=" + id + " ]";
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java
index 57042c51550b..c0e15c205d93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.collection.delayedOperation;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java
index 19b379bf8269..6a8a6bb5bb18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.collection.delayedOperation;
 
 import java.util.ArrayList;
@@ -19,7 +16,6 @@
 import jakarta.persistence.OneToMany;
 
 import org.hibernate.Hibernate;
-import org.hibernate.LockOptions;
 import org.hibernate.collection.spi.AbstractPersistentCollection;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java
index a321a57641ae..ae151955ba5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.collection.delayedOperation;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java
index 04be008b3f6a..d2747f162d65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.delayedOperation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java
index 52857554a9b2..43b4b903bd2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.collection.delayedOperation;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java
index 8b6ab2b7e8bb..9722f9f8fb9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.collection.delayedOperation;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/AbstractDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/AbstractDereferencedCollectionTest.java
index 4fcc3bf69734..20c7e41d261c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/AbstractDereferencedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/AbstractDereferencedCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java
index 61307060c8a6..89f569b478e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java
index 2232456ba7ac..025b29836215 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
@@ -96,8 +77,8 @@ public void testMergeNullCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -179,8 +160,8 @@ public void testGetAndNullifyCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManies = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManies );
 					assertEquals( role, ceManies.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManies.getLoadedPersister()
@@ -265,8 +246,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -310,8 +291,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					);
 					assertNotNull( ceManiesAfterReplace );
 					assertEquals( role, ceManiesAfterReplace.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesAfterReplace.getLoadedPersister()
@@ -324,4 +305,4 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 		);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java
index afbe93427817..a15ac6909288 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java
index c34233b6e040..51e474aebfde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
@@ -94,8 +75,8 @@ public void testMergeNullCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -176,8 +157,8 @@ public void testGetAndNullifyCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManies = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManies );
 					assertEquals( role, ceManies.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManies.getLoadedPersister()
@@ -261,8 +242,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -306,8 +287,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					);
 					assertNotNull( ceManiesAfterReplace );
 					assertEquals( role, ceManiesAfterReplace.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesAfterReplace.getLoadedPersister()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java
index 4b6bd6f76ee4..f3d3d56e60c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java
index e832f673703b..69a13db2d22b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
@@ -96,8 +77,8 @@ public void testMergeNullCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -176,8 +157,8 @@ public void testGetAndNullifyCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManies = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManies );
 					assertEquals( role, ceManies.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManies.getLoadedPersister()
@@ -258,8 +239,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -303,8 +284,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					);
 					assertNotNull( ceManiesAfterReplace );
 					assertEquals( role, ceManiesAfterReplace.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesAfterReplace.getLoadedPersister()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java
index 2a03c08710f8..52a7c50273e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java
index 4fdfd45b4a16..ac3ae41866d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
@@ -96,8 +77,8 @@ public void testMergeNullCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -178,8 +159,8 @@ public void testGetAndNullifyCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManies = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManies );
 					assertEquals( role, ceManies.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManies.getLoadedPersister()
@@ -264,8 +245,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					CollectionEntry ceManiesOrig = getCollectionEntry( session, maniesEEOneStateOrig );
 					assertNotNull( ceManiesOrig );
 					assertEquals( role, ceManiesOrig.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesOrig.getLoadedPersister()
@@ -309,8 +290,8 @@ public void testGetAndReplaceCollection(SessionFactoryScope scope) {
 					);
 					assertNotNull( ceManiesAfterReplace );
 					assertEquals( role, ceManiesAfterReplace.getRole() );
-                    assertSame(
-                            scope.getSessionFactory().getRuntimeMetamodels()
+					assertSame(
+							scope.getSessionFactory().getRuntimeMetamodels()
 									.getMappingMetamodel()
 									.getCollectionDescriptor(role),
 							ceManiesAfterReplace.getLoadedPersister()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java
index bc7d307c4907..7599bb5294b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.dereferenced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/DetachedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/DetachedCollectionTest.java
index 19b32ce4e859..21a6c9673cd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/DetachedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/DetachedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.detached;
 
@@ -21,81 +19,81 @@
 import static org.junit.Assert.assertTrue;
 
 @DomainModel(
-    annotatedClasses = {One.class, Many.class, Several.class}
+	annotatedClasses = {One.class, Many.class, Several.class}
 )
 @SessionFactory
 public class DetachedCollectionTest {
 
-    @Test
-    public void testToOne(SessionFactoryScope scope) {
-        One one = new One();
-        scope.inTransaction( session -> session.persist(one) );
-        One two = Hibernate.createDetachedProxy( scope.getSessionFactory(), One.class, one.id );
-        assertEquals( one.id, two.getId() );
-        Many many = new Many();
-        many.one = two;
-        scope.inTransaction( session -> session.persist(many) );
-        scope.inTransaction( session -> {
-            Many m = session.find(Many.class, many.id);
-            assertNotNull(m.one);
-            assertEquals( one.id, m.one.id );
-        });
-    }
+	@Test
+	public void testToOne(SessionFactoryScope scope) {
+		One one = new One();
+		scope.inTransaction( session -> session.persist(one) );
+		One two = Hibernate.createDetachedProxy( scope.getSessionFactory(), One.class, one.id );
+		assertEquals( one.id, two.getId() );
+		Many many = new Many();
+		many.one = two;
+		scope.inTransaction( session -> session.persist(many) );
+		scope.inTransaction( session -> {
+			Many m = session.find(Many.class, many.id);
+			assertNotNull(m.one);
+			assertEquals( one.id, m.one.id );
+		});
+	}
 
-    @Test
-    public void testOwned(SessionFactoryScope scope) {
-        Several several = new Several();
-        several.many = new HashSet<>();
-        Many many = new Many();
-        several.many.add(many);
-        assertNotNull(several.many);
-        scope.inTransaction(session -> {
-            session.persist(several);
-            session.persist(many);
-        });
-        assertNotNull(several.many);
-        several.many = Hibernate.set().createDetachedInstance();
-        assertFalse(Hibernate.isInitialized(several.many));
-        scope.inTransaction(session -> {
-            Several merged = (Several) session.merge(several);
-            assertNotNull(merged.many);
-            assertTrue(Hibernate.isInitialized(merged.many));
-            assertEquals(1, merged.many.size());
-        });
-        scope.inTransaction(session -> {
-            Several found = session.find(Several.class, several.id);
-            Hibernate.initialize(found.many);
-            assertNotNull(found.many);
-            assertEquals(1, found.many.size());
-        });
-    }
+	@Test
+	public void testOwned(SessionFactoryScope scope) {
+		Several several = new Several();
+		several.many = new HashSet<>();
+		Many many = new Many();
+		several.many.add(many);
+		assertNotNull(several.many);
+		scope.inTransaction(session -> {
+			session.persist(several);
+			session.persist(many);
+		});
+		assertNotNull(several.many);
+		several.many = Hibernate.set().createDetachedInstance();
+		assertFalse(Hibernate.isInitialized(several.many));
+		scope.inTransaction(session -> {
+			Several merged = (Several) session.merge(several);
+			assertNotNull(merged.many);
+			assertTrue(Hibernate.isInitialized(merged.many));
+			assertEquals(1, merged.many.size());
+		});
+		scope.inTransaction(session -> {
+			Several found = session.find(Several.class, several.id);
+			Hibernate.initialize(found.many);
+			assertNotNull(found.many);
+			assertEquals(1, found.many.size());
+		});
+	}
 
-    @Test
-    public void testUnowned(SessionFactoryScope scope) {
-        One one = new One();
-        one.many = new ArrayList<>();
-        Many many = new Many();
-        many.one = one;
-        one.many.add(many);
-        assertNotNull(one.many);
-        scope.inTransaction(session -> {
-            session.persist(one);
-            session.persist(many);
-        });
-        assertNotNull(one.many);
-        one.many = Hibernate.list().createDetachedInstance();
-        assertFalse(Hibernate.isInitialized(one.many));
-        scope.inTransaction(session -> {
-            One merged = (One) session.merge(one);
-            assertNotNull(merged.many);
-            assertTrue(Hibernate.isInitialized(merged.many));
-            assertEquals(1, merged.many.size());
-        });
-        scope.inTransaction(session -> {
-            One found = session.find(One.class, one.id);
-            Hibernate.initialize(found.many);
-            assertNotNull(found.many);
-            assertEquals(1, found.many.size());
-        });
-    }
+	@Test
+	public void testUnowned(SessionFactoryScope scope) {
+		One one = new One();
+		one.many = new ArrayList<>();
+		Many many = new Many();
+		many.one = one;
+		one.many.add(many);
+		assertNotNull(one.many);
+		scope.inTransaction(session -> {
+			session.persist(one);
+			session.persist(many);
+		});
+		assertNotNull(one.many);
+		one.many = Hibernate.list().createDetachedInstance();
+		assertFalse(Hibernate.isInitialized(one.many));
+		scope.inTransaction(session -> {
+			One merged = (One) session.merge(one);
+			assertNotNull(merged.many);
+			assertTrue(Hibernate.isInitialized(merged.many));
+			assertEquals(1, merged.many.size());
+		});
+		scope.inTransaction(session -> {
+			One found = session.find(One.class, one.id);
+			Hibernate.initialize(found.many);
+			assertNotNull(found.many);
+			assertEquals(1, found.many.size());
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Many.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Many.java
index b176cc5cc9c0..aecaf0dbc38a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Many.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Many.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.detached;
 
@@ -14,10 +12,10 @@
 
 @Entity @Table(name="DCMany")
 public class Many {
-    @GeneratedValue
-    @Id
-    long id;
+	@GeneratedValue
+	@Id
+	long id;
 
-    @ManyToOne
-    One one;
+	@ManyToOne
+	One one;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/One.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/One.java
index cbe3dc73335f..e8c6e6a92c33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/One.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/One.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.detached;
 
@@ -10,8 +8,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
@@ -19,16 +15,15 @@
 
 @Entity @Table(name="DCOne")
 public class One {
-    @GeneratedValue
-    @Id
-    long id;
+	@GeneratedValue
+	@Id
+	long id;
 
-    @OneToMany(mappedBy = "one",
-            cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    List many;
+	@OneToMany(mappedBy = "one",
+			cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+	List many;
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Several.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Several.java
index 40b610a11bad..f4595245ef69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Several.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/detached/Several.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.detached;
 
@@ -17,10 +15,10 @@
 
 @Entity @Table(name="DCSeveral")
 public class Several {
-    @GeneratedValue
-    @Id
-    long id;
+	@GeneratedValue
+	@Id
+	long id;
 
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    Set many;
+	@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+	Set many;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java
index 44dcdef25414..129045a85048 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.idbag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdbagOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdbagOwner.java
index b03e84013c31..c944b949e497 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdbagOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdbagOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.idbag;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java
index 8eda157bf2b3..2e3287dd01df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.idbag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/BaseChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/BaseChild.java
index 7022b6156938..35e35f674f62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/BaseChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/BaseChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.lazynocascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Child.java
index cfea58ba29b1..6b24e0de5600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.lazynocascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java
index e5848d2addb4..7591f9160622 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.lazynocascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Parent.java
index f1275f2195ba..f1a5228c4ede 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.lazynocascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Child.java
index e5e0e6654871..7ed2eebcf81d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Child.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.list;
 
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java
index 02317ba1d753..65071106ca27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.list;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/LineItem.java
index ba77597d0483..bdb0a6a35513 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java
index 949cd00d9d62..73bb49cf0f71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java
index 148ca5536638..c9f0a9eacc1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListOwner.java
index a364d5fb6e1d..ed3ddabe7201 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Order.java
index 1ca30f9a6171..602a6e4ac44b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Parent.java
index f35007589cee..d26578d34bc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/Parent.java
@@ -1,13 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.list;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
 
 public class Parent {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java
index 58642b665caf..bdf48b6208a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.list;
 
@@ -45,7 +43,7 @@ public class PersistentListTest {
 	public void testInverseListIndex(SessionFactoryScope scope) {
 		// make sure no one changes the mapping
 		SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
-        final CollectionPersister collectionPersister = sessionFactory.getRuntimeMetamodels()
+		final CollectionPersister collectionPersister = sessionFactory.getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getCollectionDescriptor(ListOwner.class.getName() + ".children");
 		assertTrue( collectionPersister.isInverse() );
@@ -110,7 +108,7 @@ public void testInverseListIndex(SessionFactoryScope scope) {
 	public void testInverseListIndex2(SessionFactoryScope scope) {
 		// make sure no one changes the mapping
 		SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
-        final CollectionPersister collectionPersister = sessionFactory.getRuntimeMetamodels()
+		final CollectionPersister collectionPersister = sessionFactory.getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getCollectionDescriptor(Order.class.getName() + ".lineItems");
 		assertTrue( collectionPersister.isInverse() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Child.java
index c49e694d1d2f..6297171bb36a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java
index 1eb9f92c9946..f9d34715b287 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java
index 9f49acc4799a..6eeea5e2582f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java
index ccb4f580ed7f..d47bef8ed140 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java
index 26ded8d5b7c7..848fe38f95c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java
index 89190ccf0c05..342b1954badf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.map;
 
 import jakarta.persistence.*;
@@ -6,35 +10,35 @@
 @Table(name = "multilingual_parent")
 public class MultilingualStringParent {
 
-    @Id
-    @GeneratedValue
-    private long id;
-    @ManyToOne(fetch = FetchType.LAZY)
-    private MultilingualStringParent parent;
-    @ManyToOne(fetch = FetchType.LAZY)
-    private MultilingualString string;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public MultilingualStringParent getParent() {
-        return parent;
-    }
-
-    public void setParent(MultilingualStringParent parent) {
-        this.parent = parent;
-    }
-
-    public MultilingualString getString() {
-        return string;
-    }
-
-    public void setString(MultilingualString string) {
-        this.string = string;
-    }
+	@Id
+	@GeneratedValue
+	private long id;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private MultilingualStringParent parent;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private MultilingualString string;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public MultilingualStringParent getParent() {
+		return parent;
+	}
+
+	public void setParent(MultilingualStringParent parent) {
+		this.parent = parent;
+	}
+
+	public MultilingualString getString() {
+		return string;
+	}
+
+	public void setString(MultilingualString string) {
+		this.string = string;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Parent.java
index f7b01b79ea7e..19af3cb632f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java
index 54789abd6017..b43dc37474c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map;
 
@@ -223,15 +221,15 @@ public void testClearMap(SessionFactoryScope scope) {
 						session.getTransaction().begin();
 /*
 select
-        userdatas0_.userId as userid2_8_0_,
-        userdatas0_.id as id1_8_0_,
-        userdatas0_.name as name3_0_,
-        userdatas0_.id as id1_8_1_,
-        userdatas0_.userId as userid2_8_1_
-    from
-        UserData userdatas0_
-    where
-        userdatas0_.userId=1
+		userdatas0_.userId as userid2_8_0_,
+		userdatas0_.id as id1_8_0_,
+		userdatas0_.name as name3_0_,
+		userdatas0_.id as id1_8_1_,
+		userdatas0_.userId as userid2_8_1_
+	from
+		UserData userdatas0_
+	where
+		userdatas0_.userId=1
  */
 						assertEquals( 0, session.get( User.class, user.id ).userDatas.size() );
 						assertEquals( 0, session.createQuery( "FROM " + UserData.class.getName() ).list().size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java
index c6916f275ddb..2fbb146a3386 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map.hhh7557;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java
index 08b5147d1b06..e7f0a629c7b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map.hhh7557;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java
index 7230a3890252..289e1299da71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map.hhh7557;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java
index 71d562e73091..bca0847c9266 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.map.hhh7557;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
index ab4365d500df..6dbe7d74b9d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.multisession;
 
@@ -36,7 +17,6 @@
 import jakarta.persistence.OptimisticLockException;
 
 import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
 import org.hibernate.collection.spi.AbstractPersistentCollection;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.dialect.HSQLDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java
index d3ecbb368c90..db7ff0c8b85b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.multisession;
 
@@ -33,7 +14,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import org.hibernate.LockMode;
 import org.hibernate.collection.spi.AbstractPersistentCollection;
 import org.hibernate.collection.spi.PersistentSet;
 import org.hibernate.collection.spi.PersistentCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java
index 6f1589cd3a17..4d3de76aa600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.collection.nonInsertable;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java
index 76ef13681da0..fc60f57c5d8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.ordered.joinedInheritence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java
index 4400b00e8d5b..3af10071392d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.ordered.joinedInheritence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/OrderCollectionOfJoinedHierarchyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/OrderCollectionOfJoinedHierarchyTest.java
index a9a5530712cb..8c72e423d50d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/OrderCollectionOfJoinedHierarchyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/OrderCollectionOfJoinedHierarchyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.ordered.joinedInheritence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java
index df426ce10ba8..8dbd9a151519 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.ordered.joinedInheritence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java
index 2603e27dfdf9..3a5725deab15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.ordered.joinedInheritence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Animal.java
index 11ce1c708d43..fe7d0d3adb89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Animal.java
@@ -1,31 +1,29 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.original;
 
 
 public class Animal {
-    long id;
-    String name;
-    boolean boolvar;
-    Zoo zoo;
+	long id;
+	String name;
+	boolean boolvar;
+	Zoo zoo;
 
-    public long getId() {
-        return id;
-    }
-    public void setId( long id ) {
-        this.id = id;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName( String name ) {
-        this.name = name;
-    }
-    public boolean isBoolvar() {
+	public long getId() {
+		return id;
+	}
+	public void setId( long id ) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName( String name ) {
+		this.name = name;
+	}
+	public boolean isBoolvar() {
 		return boolvar;
 	}
 	public void setBoolvar(boolean boolvar) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java
index 25213c13a389..b918ff4f786c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.original;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java
index e406604ee54d..19b56a86ae44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Email.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.collection.original;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Mammal.java
index 14f79dcf1902..a96f64abdaa5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Mammal.java
@@ -1,16 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.original;
 
 
 public class Mammal extends Animal {
-    private String mammalName;
-    private String mammalName2;
-    private String mammalName3;
+	private String mammalName;
+	private String mammalName2;
+	private String mammalName3;
 
 	public String getMammalName() {
 		return mammalName;
@@ -35,7 +33,7 @@ public String getMammalName3() {
 	public void setMammalName3(String mammalName3) {
 		this.mammalName3 = mammalName3;
 	}
-	
-	
+
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java
index 19fb4cc263c9..b94656c5bea4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Permission.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.collection.original;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java
index d840b69d80df..8b9b4a1ba4e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.collection.original;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Zoo.java
index 7637948b0dfe..d0e6ec7611cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Zoo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Zoo.java
@@ -1,29 +1,27 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.original;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Zoo {
-    long id;
-    List animals = new ArrayList();
+	long id;
+	List animals = new ArrayList();
 
-    public long getId() {
-        return id;
-    }
-    public void setId( long id ) {
-        this.id = id;
-    }
+	public long getId() {
+		return id;
+	}
+	public void setId( long id ) {
+		this.id = id;
+	}
 	public List getAnimals() {
 		return animals;
 	}
 	public void setAnimals(List animals) {
 		this.animals = animals;
 	}
-    
-    
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/Mail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/Mail.java
index e6dcacfab15a..f4351c41e413 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/Mail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/Mail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java
index 4f312fca8374..e1682e7e740f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java
index 34d06d6e7d46..b0d2315047ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/User.java
index 0a95f5f4b73b..b4bd846f8b8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/User.java
@@ -1,16 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * User.java
- *
- * Created on May 3, 2005, 9:42 AM
- */
-
 package org.hibernate.orm.test.collection.propertyref;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/Mail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/Mail.java
index 643e6f6bf50e..da66b4678fe3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/Mail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/Mail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.propertyref.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java
index d9aa2dc19a06..ce097de5eef7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.propertyref.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/User.java
index e5caab188b8a..87a6466c182a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/User.java
@@ -1,16 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * User.java
- *
- * Created on May 3, 2005, 9:42 AM
- */
-
 package org.hibernate.orm.test.collection.propertyref.lazy;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Child.java
index ec579e621a1e..fed4cab47932 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Container.java
index db256de56edd..a3fad6d1d563 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Container.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Parent.java
index 7a9ca5bfd851..d64261081696 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetNonLazyTest.java
index 8b3ad8dc9aa2..b8ca4c613a85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetNonLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetNonLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 
@@ -12,7 +10,6 @@
  */
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java
index 7f6b3b22f580..7392b8690015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java
index 5c01a83fc2dc..16ce4209e278 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java
index 702c6c594497..d0bf68cf1d17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
@@ -26,7 +24,7 @@ public class ATable implements Serializable
 	private Integer firstId;
 
 	private List tablebs = new ArrayList();
-	
+
 	public ATable()
 	{
 	}
@@ -86,7 +84,7 @@ else if (!tablebs.equals(other.tablebs))
 		return true;
 	}
 
-	
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tablea")
 	public List getTablebs()
 	{
@@ -97,6 +95,6 @@ public void setTablebs(List tablebs)
 	{
 		this.tablebs = tablebs;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java
index 957a1ea1ba0a..ea1a5778050d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
index dea9c00451bb..8741b14a70fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java
index d6a0bd1716bb..6d2339033c83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
@@ -17,9 +15,9 @@ public class TableA
 {
 	@Id
 	private int id;
-	
+
 	private String test;
-	
+
 	private String test2;
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java
index 603b3546187f..267c20ae5eca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
@@ -28,7 +26,7 @@ public class TableB implements Serializable
 	private TableBId id;
 
 	private ATable tablea;
-	
+
 	public TableB() {
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java
index 2efb187edab2..87f727a3b6ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collectionalias;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
index 8cdf313ea5b6..01aa11f2d51c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.columntransformer;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java
index ee6f25f4f455..eb8dc592452a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.columntransformer;
 import java.util.List;
-import java.util.Set;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java
index b05a6630d05d..81d2dd575989 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.comments;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java
index f9382ffbd53b..46775d31fcbf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.comments;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java
index 9071b4270c8a..473b79f77ac9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.comments;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java
index 5ee2d9ea054d..2284778bea7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java
index dde0c749b8e6..c62835f33667 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java
index 4a2e604c40b4..377aa4e36fc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java
@@ -1,7 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
-import jakarta.persistence.AssociationOverride;
-import jakarta.persistence.AssociationOverrides;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
 import jakarta.persistence.Column;
@@ -9,9 +11,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 
-import org.hibernate.orm.test.array.B;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericExtendingSerializableMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericExtendingSerializableMappedSuperclassTest.java
index 9728f446c067..fbf9854a67db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericExtendingSerializableMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericExtendingSerializableMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclass2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclass2Test.java
index cd050fb277e0..d5f55ec721cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclass2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclass2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclassTest.java
index 8599c84c00ba..c3cd346cb9bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableAndGenericMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableExtendsMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableExtendsMappedSuperclassTest.java
index 61962d4c7fc0..6b0846f7cbef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableExtendsMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/EmbeddableExtendsMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java
index 1ddce2344251..5e579879c86e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentAssociationErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentAssociationErrorTest.java
index 7347be6785ff..7fd5040737da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentAssociationErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentAssociationErrorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.List;
@@ -20,7 +24,6 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentErrorTest.java
index 788045c824ef..15664c67a49a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentErrorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import org.hibernate.MappingException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
index 60f7237c6a2e..f92fc20ebc54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java
index d431896b30b9..a9cbb9594c06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import org.hibernate.Hibernate;
@@ -26,7 +30,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @BootstrapServiceRegistry(
 		// Clear the type cache, otherwise we might run into ORA-21700: object does not exist or is marked for delete
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java
index 91b86de8a619..ab4e5796acd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.Set;
@@ -18,11 +22,8 @@
 
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java
index 8a50c691b870..727fbba7fe2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java
index 91fb466fa1e2..54314f85c0c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java
index 4168d337d664..6e0cd25a1d85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.Set;
@@ -20,7 +24,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java
index d49f19263569..a900f2edb37a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.Set;
@@ -19,7 +23,6 @@
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToMany;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java
index c32a0dd5d570..a815aafb6889 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import org.hibernate.Hibernate;
@@ -21,7 +25,6 @@
 import jakarta.persistence.OneToOne;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @BootstrapServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java
index e5d8698b41a8..3aa9389252b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java
@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
-import java.util.List;
 
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Struct;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java
index 70020e6a78ae..686233e9706e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import org.hibernate.annotations.Struct;
 
-import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -12,8 +15,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.AttributeOverride;
-import jakarta.persistence.AttributeOverrides;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructNestedComponentAssociationErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructNestedComponentAssociationErrorTest.java
index df4c5b39770a..00e61692407b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructNestedComponentAssociationErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructNestedComponentAssociationErrorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.component;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
index a17570051f95..f82cee406284 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic;
 
@@ -94,7 +92,7 @@ public void testUpdateFalse() {
 
 		assertEquals( 1, sessionFactory().getStatistics().getEntityDeleteCount() );
 	}
-	
+
 
 	@Test
 	public void testComponent() {
@@ -214,7 +212,7 @@ public void testComponentFormulaQuery() {
 				}
 		);
 	}
-	
+
 	@Test
 	public void testCustomColumnReadAndWrite() {
 		inTransaction(
@@ -268,7 +266,7 @@ public void testCustomColumnReadAndWrite() {
 				}
 		);
 	}
-	
+
 	@Test
 	public void testNamedQuery() {
 		inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java
index 843cd7031df9..a78f9bfd3105 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java
index 4256c22b705e..a4de22e077ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.component.basic;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java
index 96e15dc65721..eed88a604fcc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 11345 2007-03-26 17:24:20Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.component.basic;
 import java.util.Date;
 
@@ -72,5 +68,5 @@ public double getHeightInches() {
 	}
 	public void setHeightInches(double heightInches) {
 		this.heightInches = heightInches;
-	}	
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java
index 1713aa88b1f0..a0df07066cf0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 11345 2007-03-26 17:24:20Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.component.basic;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java
index be41e4d1a280..3bc4c57fbf3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic2;
 
@@ -19,26 +17,26 @@
 @Entity
 public class Component {
 
-    @Id
+	@Id
 	private Long id;
-    
-    @Embedded
+
+	@Embedded
 	private Component.Emb emb;
 
-    @Access(AccessType.FIELD)
-    @Embeddable
-    public static class Emb {
+	@Access(AccessType.FIELD)
+	@Embeddable
+	public static class Emb {
 
-        @OneToMany(targetEntity = Stuff.class)
-        Set stuffs = new HashSet();
+		@OneToMany(targetEntity = Stuff.class)
+		Set stuffs = new HashSet();
 
-        @Entity
-        @Table(name = "stuff")
-        public static class Stuff {
-            @Id
-            private Long id;
-        }
-    }
+		@Entity
+		@Table(name = "stuff")
+		public static class Stuff {
+			@Id
+			private Long id;
+		}
+	}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java
index ebde0e1d714f..98e08fd17c01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java
index 2cd9723bf367..73fa6acac2d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic2;
 
@@ -15,8 +13,8 @@
  */
 @Embeddable
 public class Name implements Serializable {
-    private String firstName;
-    private String lastName;
+	private String firstName;
+	private String lastName;
 
 	public Name() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java
index 9f6939cd5721..04159fc805b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.basic2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java
index f00a08dc8757..0bfaf2c79ce8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java
index 8e5aa097a58a..6da48e3e3aed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.collection;
 import java.util.HashSet;
@@ -14,7 +12,7 @@
  * @author Steve Ebersole
  */
 public class Definition {
-    private Long id;
+	private Long id;
 	private Set values = new HashSet();
 
 	public Long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java
index a1ef5d19f384..a40071af2cf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.collection;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java
index 8838fc1fea3f..5eb41d7a7aef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java
index 155d9f12af89..65724baaaae0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java
index e1f9b293bdf8..5238c9eec783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java
index c2b4b89e3505..54018a021873 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java
index d8f3867569aa..4d4e5e564e02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java
index d641ccd712fb..c20edea38d87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.cascading.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java
index 0c56df920139..63aaba9815c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.empty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java
index 26e0317d221a..c45ec1e7f7de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.empty;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/EmbeddableGenericsAndInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/EmbeddableGenericsAndInterfaceTest.java
index 9ca94e60ef93..46478a42c8a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/EmbeddableGenericsAndInterfaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/EmbeddableGenericsAndInterfaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.genericinheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEmbedded.java
index 6aa169d54d76..0b45e8e62067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEmbedded.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.genericinheritance;
 
@@ -10,4 +8,4 @@
 
 @Embeddable
 public class ExampleEmbedded extends ExampleSuperClassEmbedded {
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEntity.java
index 1cd03bb27dfa..9104e2dc434c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.genericinheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleSuperClassEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleSuperClassEmbedded.java
index 73d50953aae5..1ad550072eb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleSuperClassEmbedded.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/ExampleSuperClassEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.genericinheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/UserEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/UserEntity.java
index b7f57764207f..76eb6c60339b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/UserEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/genericinheritance/UserEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.genericinheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java
index b4cd1a6ae913..420942b1476d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java
index a202f7784d56..69a841479c23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java
index e877517a53fe..b21c271e0757 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java
index 72de63c51f15..c07f8591d7a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.component.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java
index 98181b6d5bee..549828ef8653 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Child.java 6978 2005-06-01 03:29:27Z oneovthafew $
 package org.hibernate.orm.test.compositeelement;
 
 
@@ -67,7 +63,7 @@ public int hashCode() {
 	}
 	public boolean equals(Object other) {
 		Child c = (Child) other;
-		return c.parent.getId().equals(parent.getId()) 
+		return c.parent.getId().equals(parent.getId())
 			&& c.name.equals(name);
 	}
 	public int getBioLength() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
index 4d4887e6cfca..5ed092d07026 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositeelement;
 
@@ -141,4 +139,3 @@ public void testCustomColumnReadAndWrite() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.java
index b0dcfcb2743e..77dad2d45cf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Parent.java 4478 2004-09-02 02:30:28Z oneovthafew $
 package org.hibernate.orm.test.compositeelement;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java
index fc93a64dc3ae..fc80d6aa844d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java
index e9cf0260c381..c9ec07cf590b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java
index e6e0fa98444b..746bf65f4216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java
index b1b664cbb7e4..be2f3fb61ae0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKNotNullableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKNotNullableTest.java
index bdfba8aaa6a3..a3de9eac1c8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKNotNullableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKNotNullableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java
index 91223a0da3db..b2789209d34f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
@@ -18,7 +16,6 @@
 import jakarta.persistence.Table;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java
index 09a9c99e0839..580c7767ccef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
index f033a87c0191..4aeefc84a5fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java
index 675987881f57..63589b7abe07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyNestedEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericAttributeTest.java
index d90cac75d5c6..ed9a8f00b7c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericAttributeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericsTest.java
index 7f8328e27547..abd5e58bb300 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToOneEmbeddedIdWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.compositefk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java
index 8b0167fad54d..f9cd37616e4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderTransactionIsolationConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderTransactionIsolationConfigTest.java
index 5f61bf4fd807..94c1e1592660 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderTransactionIsolationConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderTransactionIsolationConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java
index e865b3b492e4..7b9d12b8980b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java
index 595451ef740d..455b72d6450e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/PropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/PropertiesTest.java
index 489c3feb08fc..383477819981 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/PropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/PropertiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connection;
 
@@ -86,8 +84,8 @@ public void testUsingJakartaJdbUrlSetting() {
 	/*
 		All the StandardServiceRegistryBuilder public constructors populate the settings reading from hibernate.properties file,
 		that sets the deprecated property AvailableSettings.URL
-	 	MyStandardServiceRegistryBuilder gives access to the StandardServiceRegistryBuilder protected constructor
-	 	that does not read the hibernate.properties,
+		MyStandardServiceRegistryBuilder gives access to the StandardServiceRegistryBuilder protected constructor
+		that does not read the hibernate.properties,
 	 */
 	public static class MyStandardServiceRegistryBuilder extends StandardServiceRegistryBuilder {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java
index b0bb9736dd16..c57a1ab2aed0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: AggressiveReleaseTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.connections;
 
 import java.sql.Connection;
@@ -153,7 +149,7 @@ public void testQueryScrolling() throws Throwable {
 		}
 
 		try (ScrollableResults sr = s.createQuery( "from Silly" ).scroll();
-			 ScrollableResults sr2 = s.createQuery( "from Silly where name = 'silly'" ).scroll()) {
+			ScrollableResults sr2 = s.createQuery( "from Silly where name = 'silly'" ).scroll()) {
 			assertTrue( sr.next() );
 			assertEquals( silly, sr.get() );
 			assertTrue( sr2.next() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BasicConnectionProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BasicConnectionProviderTest.java
index b7a4cb2a34d8..0340933bcfa6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BasicConnectionProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BasicConnectionProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java
index 2f5772c9cfcb..ef7960b3233d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.connections;
 
 import java.sql.Connection;
@@ -63,167 +60,166 @@
 @RunWith(CustomParameterized.class)
 public class BeforeCompletionReleaseTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Parameterized.Parameters(name = "{0}")
-    public static List params() {
-        return Arrays.asList( new Object[][] {
-                {
-                        "Setting connection handling mode from properties",
-                        PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION,
-                        null
-                },
-                {
-                        "Setting connection handling mode through SessionBuilder",
-                        PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT,
-                        PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION
-                }
-        } );
-    }
-
-    @Rule
-    public MockitoRule mockito = MockitoJUnit.rule().strictness( Strictness.STRICT_STUBS );
-    private final ConnectionProvider connectionProvider = spy(
-            new ConnectionProviderDelegate( ConnectionProviderBuilder.buildConnectionProvider() )
-    );
-
-    private final PhysicalConnectionHandlingMode connectionHandlingModeInProperties;
-    private final PhysicalConnectionHandlingMode connectionHandlingModeInSessionBuilder;
-
-    public BeforeCompletionReleaseTest(
-            String ignoredTestLabel, PhysicalConnectionHandlingMode connectionHandlingModeInProperties,
-            PhysicalConnectionHandlingMode connectionHandlingModeInSessionBuilder) {
-        this.connectionHandlingModeInProperties = connectionHandlingModeInProperties;
-        this.connectionHandlingModeInSessionBuilder = connectionHandlingModeInSessionBuilder;
-    }
-
-    @Override
-    protected Map getConfig() {
-        Map config = super.getConfig();
-        TestingJtaBootstrap.prepare( config );
-        config.put( AvailableSettings.CONNECTION_PROVIDER, connectionProvider );
-        if ( connectionHandlingModeInProperties != null ) {
-            config.put( AvailableSettings.CONNECTION_HANDLING, connectionHandlingModeInProperties );
-        }
-        return config;
-    }
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Thing.class };
-    }
-
-    @Test
-    @JiraKeyGroup( value = {
-            @JiraKey( value = "HHH-13976" ),
-            @JiraKey( value = "HHH-14326" )
-    } )
-    public void testResourcesReleasedThenConnectionClosedThenCommit() throws SQLException, XAException {
-        try (SessionImplementor s = (SessionImplementor) openSession()) {
-            XAResource transactionSpy = mock( XAResource.class );
-            Connection[] connections = new Connection[1];
-            Statement statementMock = Mockito.mock( Statement.class );
-
-            TransactionUtil2.inTransaction( s, session -> {
-                spyOnTransaction( transactionSpy );
-
-                Thing thing = new Thing();
-                thing.setId( 1 );
-                session.persist( thing );
-
-                LogicalConnectionImplementor logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
-                logicalConnection.getResourceRegistry().register( statementMock, true );
-                connections[0] = logicalConnection.getPhysicalConnection();
-            } );
-
-            // Note: all this must happen BEFORE the session is closed;
-            // it's particularly important when reusing the session.
-
-            Connection connection = connections[0];
-
-            // Must close the resources, then the connection, then commit
-            InOrder inOrder = inOrder( statementMock, connectionProvider, transactionSpy );
-            inOrder.verify( statementMock ).close();
-            inOrder.verify( connectionProvider ).closeConnection( connection );
-            inOrder.verify( transactionSpy ).commit( any(), anyBoolean() );
-        }
-    }
-
-    @Test
-    @JiraKey(value = "HHH-14557")
-    public void testResourcesReleasedThenConnectionClosedOnEachRollback() throws SQLException {
-        try (SessionImplementor s = (SessionImplementor) openSession()) {
-            Connection[] connections = new Connection[1];
-            Statement statementMock = Mockito.mock( Statement.class );
-            RuntimeException rollbackException = new RuntimeException("Rollback");
-
-            try {
-                TransactionUtil2.inTransaction( s, session -> {
-                    Thing thing = new Thing();
-                    thing.setId( 1 );
-                    session.persist( thing );
-
-                    LogicalConnectionImplementor logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
-                    logicalConnection.getResourceRegistry().register( statementMock, true );
-                    connections[0] = logicalConnection.getPhysicalConnection();
-
-                    throw rollbackException;
-                } );
-            }
-            catch (RuntimeException e) {
-                if ( e != rollbackException ) {
-                    throw e;
-                }
-                // Else: ignore, that was expected.
-            }
-
-            // Note: all this must happen BEFORE the session is closed;
-            // it's particularly important when reusing the session.
-
-            Connection connection = connections[0];
-
-            // Must close the resources, then the connection
-            InOrder inOrder = inOrder( statementMock, connectionProvider );
-            inOrder.verify( statementMock ).close();
-            inOrder.verify( connectionProvider ).closeConnection( connection );
-            // We don't check the relative ordering of the rollback here,
-            // because unfortunately we know it's wrong:
-            // we don't get a "before transaction completion" event for rollbacks,
-            // so in the case of rollbacks the closing always happen after transaction completion.
-        }
-    }
-
-    private void spyOnTransaction(XAResource xaResource) {
-        try {
-            TestingJtaPlatformImpl.transactionManager().getTransaction().enlistResource( xaResource );
-        }
-        catch (RollbackException | SystemException e) {
-            throw new IllegalStateException( e );
-        }
-    }
-
-    private Session openSession() {
-        return connectionHandlingModeInSessionBuilder == null
-                ? entityManagerFactory().openSession()
-                : entityManagerFactory().withOptions().connectionHandlingMode( connectionHandlingModeInSessionBuilder )
-                .openSession();
-    }
-
-    // --- //
-
-    @Entity(name = "Thing")
-    @Table(name = "Thing")
-    public static class Thing {
-
-        @Id
-        public Integer id;
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
+	@Parameterized.Parameters(name = "{0}")
+	public static List params() {
+		return Arrays.asList( new Object[][] {
+				{
+						"Setting connection handling mode from properties",
+						PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION,
+						null
+				},
+				{
+						"Setting connection handling mode through SessionBuilder",
+						PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT,
+						PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION
+				}
+		} );
+	}
+
+	@Rule
+	public MockitoRule mockito = MockitoJUnit.rule().strictness( Strictness.STRICT_STUBS );
+	private final ConnectionProvider connectionProvider = spy(
+			new ConnectionProviderDelegate( ConnectionProviderBuilder.buildConnectionProvider() )
+	);
+
+	private final PhysicalConnectionHandlingMode connectionHandlingModeInProperties;
+	private final PhysicalConnectionHandlingMode connectionHandlingModeInSessionBuilder;
+
+	public BeforeCompletionReleaseTest(
+			String ignoredTestLabel, PhysicalConnectionHandlingMode connectionHandlingModeInProperties,
+			PhysicalConnectionHandlingMode connectionHandlingModeInSessionBuilder) {
+		this.connectionHandlingModeInProperties = connectionHandlingModeInProperties;
+		this.connectionHandlingModeInSessionBuilder = connectionHandlingModeInSessionBuilder;
+	}
+
+	@Override
+	protected Map getConfig() {
+		Map config = super.getConfig();
+		TestingJtaBootstrap.prepare( config );
+		config.put( AvailableSettings.CONNECTION_PROVIDER, connectionProvider );
+		if ( connectionHandlingModeInProperties != null ) {
+			config.put( AvailableSettings.CONNECTION_HANDLING, connectionHandlingModeInProperties );
+		}
+		return config;
+	}
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Thing.class };
+	}
+
+	@Test
+	@JiraKeyGroup( value = {
+			@JiraKey( value = "HHH-13976" ),
+			@JiraKey( value = "HHH-14326" )
+	} )
+	public void testResourcesReleasedThenConnectionClosedThenCommit() throws SQLException, XAException {
+		try (SessionImplementor s = (SessionImplementor) openSession()) {
+			XAResource transactionSpy = mock( XAResource.class );
+			Connection[] connections = new Connection[1];
+			Statement statementMock = Mockito.mock( Statement.class );
+
+			TransactionUtil2.inTransaction( s, session -> {
+				spyOnTransaction( transactionSpy );
+
+				Thing thing = new Thing();
+				thing.setId( 1 );
+				session.persist( thing );
+
+				LogicalConnectionImplementor logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
+				logicalConnection.getResourceRegistry().register( statementMock, true );
+				connections[0] = logicalConnection.getPhysicalConnection();
+			} );
+
+			// Note: all this must happen BEFORE the session is closed;
+			// it's particularly important when reusing the session.
+
+			Connection connection = connections[0];
+
+			// Must close the resources, then the connection, then commit
+			InOrder inOrder = inOrder( statementMock, connectionProvider, transactionSpy );
+			inOrder.verify( statementMock ).close();
+			inOrder.verify( connectionProvider ).closeConnection( connection );
+			inOrder.verify( transactionSpy ).commit( any(), anyBoolean() );
+		}
+	}
+
+	@Test
+	@JiraKey(value = "HHH-14557")
+	public void testResourcesReleasedThenConnectionClosedOnEachRollback() throws SQLException {
+		try (SessionImplementor s = (SessionImplementor) openSession()) {
+			Connection[] connections = new Connection[1];
+			Statement statementMock = Mockito.mock( Statement.class );
+			RuntimeException rollbackException = new RuntimeException("Rollback");
+
+			try {
+				TransactionUtil2.inTransaction( s, session -> {
+					Thing thing = new Thing();
+					thing.setId( 1 );
+					session.persist( thing );
+
+					LogicalConnectionImplementor logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
+					logicalConnection.getResourceRegistry().register( statementMock, true );
+					connections[0] = logicalConnection.getPhysicalConnection();
+
+					throw rollbackException;
+				} );
+			}
+			catch (RuntimeException e) {
+				if ( e != rollbackException ) {
+					throw e;
+				}
+				// Else: ignore, that was expected.
+			}
+
+			// Note: all this must happen BEFORE the session is closed;
+			// it's particularly important when reusing the session.
+
+			Connection connection = connections[0];
+
+			// Must close the resources, then the connection
+			InOrder inOrder = inOrder( statementMock, connectionProvider );
+			inOrder.verify( statementMock ).close();
+			inOrder.verify( connectionProvider ).closeConnection( connection );
+			// We don't check the relative ordering of the rollback here,
+			// because unfortunately we know it's wrong:
+			// we don't get a "before transaction completion" event for rollbacks,
+			// so in the case of rollbacks the closing always happen after transaction completion.
+		}
+	}
+
+	private void spyOnTransaction(XAResource xaResource) {
+		try {
+			TestingJtaPlatformImpl.transactionManager().getTransaction().enlistResource( xaResource );
+		}
+		catch (RollbackException | SystemException e) {
+			throw new IllegalStateException( e );
+		}
+	}
+
+	private Session openSession() {
+		return connectionHandlingModeInSessionBuilder == null
+				? entityManagerFactory().openSession()
+				: entityManagerFactory().withOptions().connectionHandlingMode( connectionHandlingModeInSessionBuilder )
+				.openSession();
+	}
+
+	// --- //
+
+	@Entity(name = "Thing")
+	@Table(name = "Thing")
+	public static class Thing {
+
+		@Id
+		public Integer id;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionCloseAfterStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionCloseAfterStatementTest.java
index 5b557bdbcae4..5a13e92e526c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionCloseAfterStatementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionCloseAfterStatementTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.connections;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java
index 33281c55b097..54a8b0669c05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
@@ -15,7 +13,6 @@
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/CurrentSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/CurrentSessionConnectionTest.java
index 908ab6f06ed7..82c46e7caeb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/CurrentSessionConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/CurrentSessionConnectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ExplicitConnectionProviderInstanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ExplicitConnectionProviderInstanceTest.java
index e01d5064689a..1ac10f94d8a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ExplicitConnectionProviderInstanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ExplicitConnectionProviderInstanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/HibernateCreateBlobFailedCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/HibernateCreateBlobFailedCase.java
index e193f5d9fb11..0ef2ac1101fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/HibernateCreateBlobFailedCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/HibernateCreateBlobFailedCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
@@ -12,7 +10,6 @@
 
 import org.junit.Test;
 
-import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ImmediatAcqusitionAndHoldConnectionHandlingModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ImmediatAcqusitionAndHoldConnectionHandlingModeTest.java
index 2158c9d84011..83165c8db242 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ImmediatAcqusitionAndHoldConnectionHandlingModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ImmediatAcqusitionAndHoldConnectionHandlingModeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.connections;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java
index 3a51353f6216..db072dc2009b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Other.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Other.java
index f6305f9c5a4d..a0d5bcb429f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Other.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Other.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Silly.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Silly.java
index a743bb1483c7..8bff0bdb411f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Silly.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/Silly.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Silly.java 9595 2006-03-10 18:14:21Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.connections;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java
index f2ca157e2507..83f1a5198d4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.connections;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java
index 3f7371102ecf..17323c18887d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
index 9ff917e4d864..758a984da464 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.constraint;
 
@@ -32,20 +30,20 @@
  * @author Brett Meyer
  */
 public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase {
-	
+
 	private static final int MAX_NAME_LENGTH = 30;
-	
+
 	private static final String EXPLICIT_FK_NAME_NATIVE = "fk_explicit_native";
-	
+
 	private static final String EXPLICIT_FK_NAME_JPA = "fk_explicit_jpa";
-	
+
 	private static final String EXPLICIT_UK_NAME = "uk_explicit";
-	
+
 	@Override
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] { DataPoint.class, DataPoint2.class };
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7797" )
 	public void testUniqueConstraints() {
@@ -64,14 +62,14 @@ public void testUniqueConstraints() {
 		assertFalse( column.isNullable() );
 		assertTrue( column.isUnique() );
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-1904" )
 	public void testConstraintNameLength() {
 		int foundCount = 0;
 		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
 			for ( org.hibernate.mapping.Table table : namespace.getTables() ) {
-                Iterator fkItr = table.getForeignKeys().values().iterator();
+				Iterator fkItr = table.getForeignKeys().values().iterator();
 				while (fkItr.hasNext()) {
 					ForeignKey fk = (ForeignKey) fkItr.next();
 					assertTrue( fk.getName().length() <= MAX_NAME_LENGTH );
@@ -89,7 +87,7 @@ else if ( column.getName().equals( "explicit_jpa" ) ) {
 					}
 				}
 
-                Iterator ukItr = table.getUniqueKeys().values().iterator();
+				Iterator ukItr = table.getUniqueKeys().values().iterator();
 				while (ukItr.hasNext()) {
 					UniqueKey uk = (UniqueKey) ukItr.next();
 					assertTrue( uk.getName().length() <= MAX_NAME_LENGTH );
@@ -105,10 +103,10 @@ else if ( column.getName().equals( "explicit_jpa" ) ) {
 			}
 
 		}
-		
+
 		assertEquals("Could not find the necessary columns.", 3, foundCount);
 	}
-	
+
 	@Entity
 	@Table( name = "DataPoint", uniqueConstraints = {
 			@UniqueConstraint( name = EXPLICIT_UK_NAME, columnNames = { "explicit" } )
@@ -118,31 +116,31 @@ public static class DataPoint {
 		@GeneratedValue
 		@jakarta.persistence.Column( nullable = false, unique = true)
 		public long id;
-		
+
 		@jakarta.persistence.Column( nullable = false, unique = true)
 		public String foo1;
-		
+
 		@jakarta.persistence.Column( nullable = true, unique = true)
 		public String foo2;
-		
+
 		public String explicit;
 	}
-	
+
 	@Entity
 	@Table( name = "DataPoint2" )
 	public static class DataPoint2 {
 		@Id
 		@GeneratedValue
 		public long id;
-		
+
 		@OneToOne
 		public DataPoint dp;
-		
+
 		@OneToOne
 		@JoinColumn(name = "explicit_native",
 				foreignKey = @jakarta.persistence.ForeignKey(name = EXPLICIT_FK_NAME_NATIVE))
 		public DataPoint explicit_native;
-		
+
 		@OneToOne
 		@JoinColumn(name = "explicit_jpa", foreignKey = @jakarta.persistence.ForeignKey(name = EXPLICIT_FK_NAME_JPA))
 		public DataPoint explicit_jpa;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java
index 58e3834c1d96..b602c3b47592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.constraint;
 
@@ -90,7 +88,7 @@ public void testForeignKeyNameSetForMapsIdJoinColumn() {
 		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
 			for ( Table table : namespace.getTables() ) {
 				if ( table.getName().equals( "Post" ) ) {
-                    Iterator foreignKeyIterator = table.getForeignKeys().values().iterator();
+					Iterator foreignKeyIterator = table.getForeignKeys().values().iterator();
 					while ( foreignKeyIterator.hasNext() ) {
 						org.hibernate.mapping.ForeignKey foreignKey = foreignKeyIterator.next();
 						if ( foreignKey.getColumn( 0 ).getName().equals( "PD_ID" ) ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java
index b133f15afb5e..fd1c2ef54c15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.constraint;
 
@@ -180,7 +178,7 @@ private void assertForeignKey(DomainModelScope scope, String foreignKeyName, Str
 		Set columnSet = new LinkedHashSet<>( Arrays.asList( columns ) );
 		for ( Namespace namespace : scope.getDomainModel().getDatabase().getNamespaces() ) {
 			for ( org.hibernate.mapping.Table table : namespace.getTables() ) {
-                Iterator fkItr = table.getForeignKeys().values().iterator();
+				Iterator fkItr = table.getForeignKeys().values().iterator();
 				while ( fkItr.hasNext() ) {
 					org.hibernate.mapping.ForeignKey fk = fkItr.next();
 
@@ -202,7 +200,7 @@ private void assertForeignKey(DomainModelScope scope, String foreignKeyName, Str
 	private void assertNoForeignKey(DomainModelScope scope, String foreignKeyName, String... columns) {
 		for ( Namespace namespace : scope.getDomainModel().getDatabase().getNamespaces() ) {
 			for ( org.hibernate.mapping.Table table : namespace.getTables() ) {
-                Iterator fkItr = table.getForeignKeys().values().iterator();
+				Iterator fkItr = table.getForeignKeys().values().iterator();
 				while ( fkItr.hasNext() ) {
 					org.hibernate.mapping.ForeignKey fk = fkItr.next();
 					assertFalse(
@@ -219,7 +217,7 @@ public static class CreditCard {
 		@Id
 		public String number;
 	}
-	
+
 	@Entity(name = "Person")
 	@Inheritance( strategy = InheritanceType.JOINED )
 	public static class Person {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java
index 7f394ba0b030..42e4ef2c72d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.constraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java
index a5cc5cf2f10e..94dbdd6851d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.constraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Account.java
index d7e6cb188e2c..2dada4c93bf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Account.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Account.java 4592 2004-09-26 00:39:43Z oneovthafew $
 package org.hibernate.orm.test.cuk;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Address.java
index 20198b1ea0b6..1ab5a0e62657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 4592 2004-09-26 00:39:43Z oneovthafew $
 package org.hibernate.orm.test.cuk;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java
index d0a348f16ee5..563002141f24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cuk;
 
@@ -138,4 +136,3 @@ public void tearDown(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/JoinColumnOccursOutOfOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/JoinColumnOccursOutOfOrderTest.java
index 0ad643e86361..e7c9eb2cd1bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/JoinColumnOccursOutOfOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/JoinColumnOccursOutOfOrderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cuk;//package com.example.demo;
 
 import jakarta.persistence.*;
@@ -18,185 +22,185 @@
 
 @SessionFactory
 @DomainModel(annotatedClasses = {
-        JoinColumnOccursOutOfOrderTest.MasterEntity.class,
-        JoinColumnOccursOutOfOrderTest.ChildTwoEntity.class,
-        JoinColumnOccursOutOfOrderTest.ChildEntityOne.class,
-        JoinColumnOccursOutOfOrderTest.ChildEntityFour.class,
-        JoinColumnOccursOutOfOrderTest.ChildEntityThree.class,
+		JoinColumnOccursOutOfOrderTest.MasterEntity.class,
+		JoinColumnOccursOutOfOrderTest.ChildTwoEntity.class,
+		JoinColumnOccursOutOfOrderTest.ChildEntityOne.class,
+		JoinColumnOccursOutOfOrderTest.ChildEntityFour.class,
+		JoinColumnOccursOutOfOrderTest.ChildEntityThree.class,
 })
 @JiraKey("HHH-16263")
 public class JoinColumnOccursOutOfOrderTest {
 
-    @BeforeAll
-    public void setUp(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            var meta = new MasterEntity();
-            meta.setId(1l);
-            meta.column1 = "1";
-            meta.column2 = "2";
-            meta.column3 = "3";
-            session.persist( meta );
-        } );
-    }
-
-    @AfterAll
-    public void tearDown(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-        } );
-    }
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			var meta = new MasterEntity();
+			meta.setId(1l);
+			meta.column1 = "1";
+			meta.column2 = "2";
+			meta.column3 = "3";
+			session.persist( meta );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+		} );
+	}
 
-    @Test
-    public void testOutOffOrder(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            final var container = session.createQuery(
-                    "from MasterEntity container where container.id = :param ",
-                    MasterEntity.class
-            ).setParameter("param", 1).getSingleResult();
-        } );
-    }
+	@Test
+	public void testOutOffOrder(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var container = session.createQuery(
+					"from MasterEntity container where container.id = :param ",
+					MasterEntity.class
+			).setParameter("param", 1).getSingleResult();
+		} );
+	}
 
-    @Embeddable
-    public static class ChildOneId implements Serializable {
+	@Embeddable
+	public static class ChildOneId implements Serializable {
 
-        @Column(name = "COLUMN_1", nullable = false, length = 7)
-        private String column1;
+		@Column(name = "COLUMN_1", nullable = false, length = 7)
+		private String column1;
 
-        @Column(name = "COLUMN_2", nullable = false, length = 4)
-        private String column2;
+		@Column(name = "COLUMN_2", nullable = false, length = 4)
+		private String column2;
 
-        @Column(name = "COLUMN_3", nullable = false, length = 2)
-        private String column3;
-    }
+		@Column(name = "COLUMN_3", nullable = false, length = 2)
+		private String column3;
+	}
 
-    @Embeddable
-    public static class ChildTwoId implements Serializable {
-
-        @Column(name = "COLUMN_1", length = 7, nullable = false)
-        private String column1;
-        @Column(name = "COLUMN_2", length = 4, nullable = false)
-        private String column2;
-        @Column(name = "COLUMN_3", length = 2, nullable = false)
-        private String column3;
-
-    }
-
-    @Embeddable
-    public static class ChildThreeId implements Serializable {
-
-        @Column(name = "COLUMN_1", nullable = false, length = 7)
-        private String column1;
-
-        @Column(name = "COLUMN_2", nullable = false, length = 4)
-        private String column2;
-
-        @Column(name = "COLUMN_3", nullable = false, length = 2)
-        private String column3;
-
-        @Column(name = "COLUMN_4", nullable = false)
-        private LocalDateTime creation;
-
-    }
-
-    @Embeddable
-    public static class ChildFourId implements Serializable {
-
-        @Column(name = "COLUMN_1", length = 7, nullable = false)
-        private String column1;
-
-        @Column(name = "COLUMN_2", length = 4, nullable = false)
-        private String colum2;
-
-        @Column(name = "COLUMN_3", length = 2, nullable = false)
-        private String column3;
-
-        @Column(name = "NON_UNIQUE_ID", nullable = false)
-        private Long nonUNiqueId;
-
-        @Column(name = "COLUMN_4", nullable = false)
-        private LocalDateTime creation;
-
-    }
-
-    @Entity(name = "ChildEntityFour")
-    public static class ChildEntityFour {
-        @EmbeddedId
-        private ChildFourId id;
-    }
-
-    @Entity(name = "ChildEntityOne")
-    public static class ChildEntityOne {
-        @EmbeddedId
-        private ChildOneId id;
-    }
-
-    @Entity(name = "ChildTwoEntity")
-    @DynamicUpdate
-    public static class ChildTwoEntity {
-        @EmbeddedId
-        private ChildTwoId id;
-    }
-
-    @Entity(name = "ChildEntityThree")
-    public static class ChildEntityThree  {
-        @EmbeddedId
-        private ChildThreeId id;
-    }
-
-
-    @Entity(name = "MasterEntity")
-    public static class MasterEntity {
-
-        @Id
-        @Column(name = "ID", unique = true, nullable = false)
-        private Long id;
+	@Embeddable
+	public static class ChildTwoId implements Serializable {
+
+		@Column(name = "COLUMN_1", length = 7, nullable = false)
+		private String column1;
+		@Column(name = "COLUMN_2", length = 4, nullable = false)
+		private String column2;
+		@Column(name = "COLUMN_3", length = 2, nullable = false)
+		private String column3;
+
+	}
+
+	@Embeddable
+	public static class ChildThreeId implements Serializable {
+
+		@Column(name = "COLUMN_1", nullable = false, length = 7)
+		private String column1;
+
+		@Column(name = "COLUMN_2", nullable = false, length = 4)
+		private String column2;
+
+		@Column(name = "COLUMN_3", nullable = false, length = 2)
+		private String column3;
+
+		@Column(name = "COLUMN_4", nullable = false)
+		private LocalDateTime creation;
+
+	}
+
+	@Embeddable
+	public static class ChildFourId implements Serializable {
+
+		@Column(name = "COLUMN_1", length = 7, nullable = false)
+		private String column1;
+
+		@Column(name = "COLUMN_2", length = 4, nullable = false)
+		private String colum2;
+
+		@Column(name = "COLUMN_3", length = 2, nullable = false)
+		private String column3;
+
+		@Column(name = "NON_UNIQUE_ID", nullable = false)
+		private Long nonUNiqueId;
+
+		@Column(name = "COLUMN_4", nullable = false)
+		private LocalDateTime creation;
+
+	}
+
+	@Entity(name = "ChildEntityFour")
+	public static class ChildEntityFour {
+		@EmbeddedId
+		private ChildFourId id;
+	}
+
+	@Entity(name = "ChildEntityOne")
+	public static class ChildEntityOne {
+		@EmbeddedId
+		private ChildOneId id;
+	}
+
+	@Entity(name = "ChildTwoEntity")
+	@DynamicUpdate
+	public static class ChildTwoEntity {
+		@EmbeddedId
+		private ChildTwoId id;
+	}
+
+	@Entity(name = "ChildEntityThree")
+	public static class ChildEntityThree  {
+		@EmbeddedId
+		private ChildThreeId id;
+	}
+
+
+	@Entity(name = "MasterEntity")
+	public static class MasterEntity {
+
+		@Id
+		@Column(name = "ID", unique = true, nullable = false)
+		private Long id;
 
-        @Column(name = "COLUMN_1", nullable = false, length = 7)
-        private String column1;
+		@Column(name = "COLUMN_1", nullable = false, length = 7)
+		private String column1;
 
-        @Column(name = "COLUMN_2", nullable = false, length = 4)
-        private String column2;
+		@Column(name = "COLUMN_2", nullable = false, length = 4)
+		private String column2;
 
-        @Column(name = "COLUMN_3", nullable = false, length = 2)
-        private String column3;
+		@Column(name = "COLUMN_3", nullable = false, length = 2)
+		private String column3;
 
-        @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-        @JoinColumns(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), value = {
-                @JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false),
-                @JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false),
-                @JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
-        })
-        @NotFound(action = NotFoundAction.IGNORE)
-        private ChildEntityOne childEntityOne;
+		@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+		@JoinColumns(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), value = {
+				@JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false),
+				@JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false),
+				@JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
+		})
+		@NotFound(action = NotFoundAction.IGNORE)
+		private ChildEntityOne childEntityOne;
 
-        @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-        @JoinColumns(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), value = {
-                @JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false),
-                @JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false),
-                @JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
-        })
-        @NotFound(action = NotFoundAction.IGNORE)
-        private ChildTwoEntity childEntityTwo;
+		@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+		@JoinColumns(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), value = {
+				@JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false),
+				@JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false),
+				@JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
+		})
+		@NotFound(action = NotFoundAction.IGNORE)
+		private ChildTwoEntity childEntityTwo;
 
-        @OneToMany(fetch = FetchType.LAZY)
-        @JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false)
-        @JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false)
-        @JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
-        private List childEntityThree;
+		@OneToMany(fetch = FetchType.LAZY)
+		@JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false)
+		@JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false)
+		@JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
+		private List childEntityThree;
 
-        @OneToMany(fetch = FetchType.LAZY)
-        @JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false)
-        @JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false)
-        @JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
-        private List childEntityFour;
+		@OneToMany(fetch = FetchType.LAZY)
+		@JoinColumn(name = "COLUMN_1", referencedColumnName = "COLUMN_1", insertable = false, updatable = false)
+		@JoinColumn(name = "COLUMN_2", referencedColumnName = "COLUMN_2", insertable = false, updatable = false)
+		@JoinColumn(name = "COLUMN_3", referencedColumnName = "COLUMN_3", insertable = false, updatable = false)
+		private List childEntityFour;
 
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-    }
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Person.java
index 53a1807e9504..7ca067f34fab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 4592 2004-09-26 00:39:43Z oneovthafew $
 package org.hibernate.orm.test.cuk;
 import java.io.Serializable;
 import java.util.HashSet;
@@ -81,15 +77,15 @@ public Set getAccounts() {
 	public void setAccounts(Set accounts) {
 		this.accounts = accounts;
 	}
-	
+
 	public boolean isDeleted() {
 		return deleted;
 	}
-	
+
 	public void setDeleted(boolean deleted) {
 		this.deleted = deleted;
 	}
-	
+
 	public boolean equals(Object other) {
 		if (other instanceof Person) {
 			Person that = (Person) other;
@@ -99,7 +95,7 @@ public boolean equals(Object other) {
 			return false;
 		}
 	}
-	
+
 	public int hashCode() {
 		return userId.hashCode();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java
index 96393bb7c5d2..bdc887452ad7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlGeneratedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.customsql;
 
 import org.hibernate.annotations.Generated;
@@ -26,49 +30,48 @@
 @SessionFactory
 @DomainModel(annotatedClasses = CustomSqlGeneratedTest.Custom.class)
 public class CustomSqlGeneratedTest {
-    @Test
-    public void testCustomSqlWithGenerated(SessionFactoryScope scope) {
-        Custom c = new Custom();
-        c.name = "name";
-        c.text = "text";
-        scope.inTransaction(s->{
-            s.persist(c);
-            s.flush();
-            Custom cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "TEXT");
-            assertEquals(cc.name, "NAME");
-            cc.name = "eman";
-            cc.text = "more text";
-            s.flush();
-            cc = s.find(Custom.class, c.id);
-            assertThat(cc.text ).isEqualTo( "MORE TEXT");
-            assertThat( cc.name ).isEqualTo( "EMAN" );
-            s.remove(cc);
-            s.flush();
-            cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "DELETED");
-            assertEquals(cc.name, "DELETED");
-        });
-    }
-    @Entity
-    @Table(name = "CustomPrimary")
-    @SecondaryTable(name = "CustomSecondary")
-    @SQLInsert(sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)")
-    @SQLInsert(table = "CustomSecondary", sql="insert into CustomSecondary (text, id) values (upper(?),?)")
-    @SQLUpdate(sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?")
-    @SQLUpdate(table = "CustomSecondary", sql="update CustomSecondary set text = upper(?) where id = ?")
-    @SQLDelete(sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?")
-    @SQLDelete(table = "CustomSecondary", sql="update CustomSecondary set text = 'DELETED' where id = ?")
-    static class Custom {
-        @Id @GeneratedValue
-        Long id;
-        @Version @Column(name = "revision")
-        int version;
-        @Generated(event = { EventType.INSERT, EventType.UPDATE}, writable = true)
-        String name;
-        @Generated(event = { EventType.INSERT, EventType.UPDATE}, writable = true)
-        @Column(table = "CustomSecondary")
-        String text;
-    }
+	@Test
+	public void testCustomSqlWithGenerated(SessionFactoryScope scope) {
+		Custom c = new Custom();
+		c.name = "name";
+		c.text = "text";
+		scope.inTransaction(s->{
+			s.persist(c);
+			s.flush();
+			Custom cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "TEXT");
+			assertEquals(cc.name, "NAME");
+			cc.name = "eman";
+			cc.text = "more text";
+			s.flush();
+			cc = s.find(Custom.class, c.id);
+			assertThat(cc.text ).isEqualTo( "MORE TEXT");
+			assertThat( cc.name ).isEqualTo( "EMAN" );
+			s.remove(cc);
+			s.flush();
+			cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "DELETED");
+			assertEquals(cc.name, "DELETED");
+		});
+	}
+	@Entity
+	@Table(name = "CustomPrimary")
+	@SecondaryTable(name = "CustomSecondary")
+	@SQLInsert(sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)")
+	@SQLInsert(table = "CustomSecondary", sql="insert into CustomSecondary (text, id) values (upper(?),?)")
+	@SQLUpdate(sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?")
+	@SQLUpdate(table = "CustomSecondary", sql="update CustomSecondary set text = upper(?) where id = ?")
+	@SQLDelete(sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?")
+	@SQLDelete(table = "CustomSecondary", sql="update CustomSecondary set text = 'DELETED' where id = ?")
+	static class Custom {
+		@Id @GeneratedValue
+		Long id;
+		@Version @Column(name = "revision")
+		int version;
+		@Generated(event = { EventType.INSERT, EventType.UPDATE}, writable = true)
+		String name;
+		@Generated(event = { EventType.INSERT, EventType.UPDATE}, writable = true)
+		@Column(table = "CustomSecondary")
+		String text;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlOverrideTest.java
index 4547e31b1885..e90b477b5f65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlOverrideTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.customsql;
 
 import jakarta.persistence.Entity;
@@ -30,57 +34,56 @@
 @RequiresDialect(value = PostgreSQLDialect.class, majorVersion = 13)
 @RequiresDialect(SQLServerDialect.class)
 public class CustomSqlOverrideTest {
-    @Test
-    public void testCustomSql(SessionFactoryScope scope) {
-        Custom c = new Custom();
-        scope.inTransaction(s->{
-            s.persist(c);
-            c.whatever = "old value";
-            s.flush();
-            assertNotNull(c.id);
-            assertNotNull(c.uid);
-            s.clear();
-            Custom cc = s.find(Custom.class, c.id);
-            assertNotNull(cc.id);
-            assertNotNull(cc.uid);
-            assertEquals("old value", cc.whatever);
-            cc.whatever = "new value";
-            s.flush();
-            s.clear();
-            Custom ccc = s.find(Custom.class, c.id);
-            assertNotNull(cc.id);
-            assertNotNull(cc.uid);
-            assertEquals("new value", ccc.whatever);
-            assertEquals(cc.id, ccc.id);
-            assertNotEquals(cc.uid, ccc.uid);
-        });
-    }
-    @Entity
-    @Table(name = "CustomTable")
+	@Test
+	public void testCustomSql(SessionFactoryScope scope) {
+		Custom c = new Custom();
+		scope.inTransaction(s->{
+			s.persist(c);
+			c.whatever = "old value";
+			s.flush();
+			assertNotNull(c.id);
+			assertNotNull(c.uid);
+			s.clear();
+			Custom cc = s.find(Custom.class, c.id);
+			assertNotNull(cc.id);
+			assertNotNull(cc.uid);
+			assertEquals("old value", cc.whatever);
+			cc.whatever = "new value";
+			s.flush();
+			s.clear();
+			Custom ccc = s.find(Custom.class, c.id);
+			assertNotNull(cc.id);
+			assertNotNull(cc.uid);
+			assertEquals("new value", ccc.whatever);
+			assertEquals(cc.id, ccc.id);
+			assertNotEquals(cc.uid, ccc.uid);
+		});
+	}
+	@Entity
+	@Table(name = "CustomTable")
 //    @SQLInsert(sql="")
-    @DialectOverride.SQLInsert(dialect = H2Dialect.class,
-            override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (random_uuid(),?)"))
-    @DialectOverride.SQLInsert(dialect = MySQLDialect.class,
-            override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (uuid(),?)"))
-    @DialectOverride.SQLInsert(dialect = PostgreSQLDialect.class,
-            override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (gen_random_uuid(),?)"))
-    @DialectOverride.SQLInsert(dialect = SQLServerDialect.class,
-            override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (newid(),?)"))
+	@DialectOverride.SQLInsert(dialect = H2Dialect.class,
+			override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (random_uuid(),?)"))
+	@DialectOverride.SQLInsert(dialect = MySQLDialect.class,
+			override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (uuid(),?)"))
+	@DialectOverride.SQLInsert(dialect = PostgreSQLDialect.class,
+			override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (gen_random_uuid(),?)"))
+	@DialectOverride.SQLInsert(dialect = SQLServerDialect.class,
+			override = @SQLInsert(sql="insert into CustomTable (uid,whatever) values (newid(),?)"))
 //    @SQLUpdate(sql="")
-    @DialectOverride.SQLUpdate(dialect = H2Dialect.class,
-            override = @SQLUpdate(sql="update CustomTable set uid = random_uuid(), whatever = ? where id = ?"))
-    @DialectOverride.SQLUpdate(dialect = MySQLDialect.class,
-            override = @SQLUpdate(sql="update CustomTable set uid = uuid(), whatever = ? where id = ?"))
-    @DialectOverride.SQLUpdate(dialect = PostgreSQLDialect.class,
-            override = @SQLUpdate(sql="update CustomTable set uid = gen_random_uuid(), whatever = ? where id = ?"))
-    @DialectOverride.SQLUpdate(dialect = SQLServerDialect.class,
-            override = @SQLUpdate(sql="update CustomTable set uid = newid(), whatever = ? where id = ?"))
-    static class Custom {
-        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        Long id;
-        @Generated
-        String uid;
-        String whatever;
-    }
+	@DialectOverride.SQLUpdate(dialect = H2Dialect.class,
+			override = @SQLUpdate(sql="update CustomTable set uid = random_uuid(), whatever = ? where id = ?"))
+	@DialectOverride.SQLUpdate(dialect = MySQLDialect.class,
+			override = @SQLUpdate(sql="update CustomTable set uid = uuid(), whatever = ? where id = ?"))
+	@DialectOverride.SQLUpdate(dialect = PostgreSQLDialect.class,
+			override = @SQLUpdate(sql="update CustomTable set uid = gen_random_uuid(), whatever = ? where id = ?"))
+	@DialectOverride.SQLUpdate(dialect = SQLServerDialect.class,
+			override = @SQLUpdate(sql="update CustomTable set uid = newid(), whatever = ? where id = ?"))
+	static class Custom {
+		@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+		Long id;
+		@Generated
+		String uid;
+		String whatever;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlPrimaryTableExplicitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlPrimaryTableExplicitTest.java
index 37ebcd493f41..836534ffb7f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlPrimaryTableExplicitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlPrimaryTableExplicitTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.customsql;
 
 import jakarta.persistence.Column;
@@ -21,62 +25,61 @@
 @SessionFactory
 @DomainModel(annotatedClasses = CustomSqlPrimaryTableExplicitTest.Custom.class)
 public class CustomSqlPrimaryTableExplicitTest {
-    @Test
-    public void testCustomSql(SessionFactoryScope scope) {
-        Custom c = new Custom();
-        c.name = "name";
-        c.text = "text";
-        scope.inTransaction(s->{
-            s.persist(c);
-            s.flush();
-            s.clear();
-            Custom cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "TEXT");
-            assertEquals(cc.name, "NAME");
-            cc.name = "eman";
-            cc.text = "more text";
-            s.flush();
-            s.clear();
-            cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "MORE TEXT");
-            assertEquals(cc.name, "EMAN");
-            s.remove(cc);
-            s.flush();
-            s.clear();
-            cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "DELETED");
-            assertEquals(cc.name, "DELETED");
-        });
-    }
-    @Entity
-    @Table(name = "CustomPrimary")
-    @SecondaryTable(name = "CustomSecondary")
-    @SQLInsert(table = "CustomPrimary",
-            sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)",
-            verify = Expectation.RowCount.class)
-    @SQLInsert(table = "CustomSecondary",
-            sql="insert into CustomSecondary (text, id) values (upper(?),?)",
-            verify = Expectation.None.class)
-    @SQLUpdate(table = "CustomPrimary",
-            sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?",
-            verify = Expectation.RowCount.class)
-    @SQLUpdate(table = "CustomSecondary",
-            sql="update CustomSecondary set text = upper(?) where id = ?",
-            verify = Expectation.None.class)
-    @SQLDelete(table = "CustomPrimary",
-            sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?",
-            verify = Expectation.RowCount.class)
-    @SQLDelete(table = "CustomSecondary",
-            sql="update CustomSecondary set text = 'DELETED' where id = ?",
-            verify = Expectation.None.class)
-    static class Custom {
-        @Id @GeneratedValue
-        Long id;
-        @Version @Column(name = "revision")
-        int version;
-        String name;
-        @Column(table = "CustomSecondary")
-        String text;
-    }
+	@Test
+	public void testCustomSql(SessionFactoryScope scope) {
+		Custom c = new Custom();
+		c.name = "name";
+		c.text = "text";
+		scope.inTransaction(s->{
+			s.persist(c);
+			s.flush();
+			s.clear();
+			Custom cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "TEXT");
+			assertEquals(cc.name, "NAME");
+			cc.name = "eman";
+			cc.text = "more text";
+			s.flush();
+			s.clear();
+			cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "MORE TEXT");
+			assertEquals(cc.name, "EMAN");
+			s.remove(cc);
+			s.flush();
+			s.clear();
+			cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "DELETED");
+			assertEquals(cc.name, "DELETED");
+		});
+	}
+	@Entity
+	@Table(name = "CustomPrimary")
+	@SecondaryTable(name = "CustomSecondary")
+	@SQLInsert(table = "CustomPrimary",
+			sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)",
+			verify = Expectation.RowCount.class)
+	@SQLInsert(table = "CustomSecondary",
+			sql="insert into CustomSecondary (text, id) values (upper(?),?)",
+			verify = Expectation.None.class)
+	@SQLUpdate(table = "CustomPrimary",
+			sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?",
+			verify = Expectation.RowCount.class)
+	@SQLUpdate(table = "CustomSecondary",
+			sql="update CustomSecondary set text = upper(?) where id = ?",
+			verify = Expectation.None.class)
+	@SQLDelete(table = "CustomPrimary",
+			sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?",
+			verify = Expectation.RowCount.class)
+	@SQLDelete(table = "CustomSecondary",
+			sql="update CustomSecondary set text = 'DELETED' where id = ?",
+			verify = Expectation.None.class)
+	static class Custom {
+		@Id @GeneratedValue
+		Long id;
+		@Version @Column(name = "revision")
+		int version;
+		String name;
+		@Column(table = "CustomSecondary")
+		String text;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java
index ae081effddf6..fe9eff637ee3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.customsql;
 
 import org.hibernate.annotations.SQLDelete;
@@ -22,50 +26,49 @@
 @SessionFactory
 @DomainModel(annotatedClasses = CustomSqlTest.Custom.class)
 public class CustomSqlTest {
-    @Test
-    public void testCustomSql(SessionFactoryScope scope) {
-        Custom c = new Custom();
-        c.name = "name";
-        c.text = "text";
-        scope.inTransaction(s->{
-            s.persist(c);
-            s.flush();
-            s.clear();
-            Custom cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "TEXT");
-            assertEquals(cc.name, "NAME");
-            cc.name = "eman";
-            cc.text = "more text";
-            s.flush();
-            s.clear();
-            cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "MORE TEXT");
-            assertEquals(cc.name, "EMAN");
-            s.remove(cc);
-            s.flush();
-            s.clear();
-            cc = s.find(Custom.class, c.id);
-            assertEquals(cc.text, "DELETED");
-            assertEquals(cc.name, "DELETED");
-        });
-    }
-    @Entity
-    @Table(name = "CustomPrimary")
-    @SecondaryTable(name = "CustomSecondary")
-    @SQLInsert(sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)")
-    @SQLInsert(table = "CustomSecondary", sql="insert into CustomSecondary (text, id) values (upper(?),?)")
-    @SQLUpdate(sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?")
-    @SQLUpdate(table = "CustomSecondary", sql="update CustomSecondary set text = upper(?) where id = ?")
-    @SQLDelete(sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?")
-    @SQLDelete(table = "CustomSecondary", sql="update CustomSecondary set text = 'DELETED' where id = ?")
-    static class Custom {
-        @Id @GeneratedValue
-        Long id;
-        @Version @Column(name = "revision")
-        int version;
-        String name;
-        @Column(table = "CustomSecondary")
-        String text;
-    }
+	@Test
+	public void testCustomSql(SessionFactoryScope scope) {
+		Custom c = new Custom();
+		c.name = "name";
+		c.text = "text";
+		scope.inTransaction(s->{
+			s.persist(c);
+			s.flush();
+			s.clear();
+			Custom cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "TEXT");
+			assertEquals(cc.name, "NAME");
+			cc.name = "eman";
+			cc.text = "more text";
+			s.flush();
+			s.clear();
+			cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "MORE TEXT");
+			assertEquals(cc.name, "EMAN");
+			s.remove(cc);
+			s.flush();
+			s.clear();
+			cc = s.find(Custom.class, c.id);
+			assertEquals(cc.text, "DELETED");
+			assertEquals(cc.name, "DELETED");
+		});
+	}
+	@Entity
+	@Table(name = "CustomPrimary")
+	@SecondaryTable(name = "CustomSecondary")
+	@SQLInsert(sql="insert into CustomPrimary (name, revision, id) values (upper(?),?,?)")
+	@SQLInsert(table = "CustomSecondary", sql="insert into CustomSecondary (text, id) values (upper(?),?)")
+	@SQLUpdate(sql="update CustomPrimary set name = upper(?), revision = ? where id = ? and revision = ?")
+	@SQLUpdate(table = "CustomSecondary", sql="update CustomSecondary set text = upper(?) where id = ?")
+	@SQLDelete(sql="update CustomPrimary set name = 'DELETED' where id = ? and revision = ?")
+	@SQLDelete(table = "CustomSecondary", sql="update CustomSecondary set text = 'DELETED' where id = ?")
+	static class Custom {
+		@Id @GeneratedValue
+		Long id;
+		@Version @Column(name = "revision")
+		int version;
+		String name;
+		@Column(table = "CustomSecondary")
+		String text;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/IdentityMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/IdentityMapTest.java
index ef79232c74df..632af0b19d7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/IdentityMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/IdentityMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.customstructures;
 
@@ -16,62 +14,62 @@
 
 public class IdentityMapTest {
 
-    @Test
-    public void basicIdentityMapFunctionality() {
-        final IdentityMap map = IdentityMap.instantiateSequenced( 10 );
-        Holder k1 = new Holder( "k", 1 );
-        Holder s2 = new Holder( "s", 2 );
-        map.put( k1, "k1"  );
-        map.put( s2, "s2" );
-        map.put( k1, "K1!" );
-        Assert.assertEquals( 2, map.size() );
-        k1.name = "p";
-        Assert.assertEquals( 2, map.size() );
-        Assert.assertEquals( "K1!", map.get( k1 ) );
-        Holder k1similar = new Holder( "p", 1 );
-        map.put( k1similar, "notk1" );
-        Assert.assertEquals( "K1!", map.get( k1 ) );
+	@Test
+	public void basicIdentityMapFunctionality() {
+		final IdentityMap map = IdentityMap.instantiateSequenced( 10 );
+		Holder k1 = new Holder( "k", 1 );
+		Holder s2 = new Holder( "s", 2 );
+		map.put( k1, "k1"  );
+		map.put( s2, "s2" );
+		map.put( k1, "K1!" );
+		Assert.assertEquals( 2, map.size() );
+		k1.name = "p";
+		Assert.assertEquals( 2, map.size() );
+		Assert.assertEquals( "K1!", map.get( k1 ) );
+		Holder k1similar = new Holder( "p", 1 );
+		map.put( k1similar, "notk1" );
+		Assert.assertEquals( "K1!", map.get( k1 ) );
 
-        IdentityMap.onEachKey( map, k -> k.value = 10 );
+		IdentityMap.onEachKey( map, k -> k.value = 10 );
 
-        final Iterator keyIterator = map.keyIterator();
-        int count = 0;
-        while ( keyIterator.hasNext() ) {
-            final Holder key = keyIterator.next();
-            Assert.assertNotNull( key );
-            count++;
-            Assert.assertEquals( 10, key.value );
-        }
-        Assert.assertEquals( 3, count );
-    }
+		final Iterator keyIterator = map.keyIterator();
+		int count = 0;
+		while ( keyIterator.hasNext() ) {
+			final Holder key = keyIterator.next();
+			Assert.assertNotNull( key );
+			count++;
+			Assert.assertEquals( 10, key.value );
+		}
+		Assert.assertEquals( 3, count );
+	}
 
-    private static class Holder {
+	private static class Holder {
 
-        //Evil: mutable keys!
-        private String name;
-        private int value;
+		//Evil: mutable keys!
+		private String name;
+		private int value;
 
-        public Holder(String name, int value) {
-            this.name = name;
-            this.value = value;
-        }
+		public Holder(String name, int value) {
+			this.name = name;
+			this.value = value;
+		}
 
-        @Override
-        public boolean equals(Object o) {
-            if ( this == o ) {
-                return true;
-            }
-            if ( o == null || getClass() != o.getClass() ) {
-                return false;
-            }
-            Holder holder = (Holder) o;
-            return value == holder.value &&
-                    name.equals( holder.name );
-        }
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+			Holder holder = (Holder) o;
+			return value == holder.value &&
+					name.equals( holder.name );
+		}
 
-        @Override
-        public int hashCode() {
-            return Objects.hash( name, value );
-        }
-    }
+		@Override
+		public int hashCode() {
+			return Objects.hash( name, value );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/JdbcParameterListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/JdbcParameterListTest.java
index b4b1e0c94401..182969429743 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/JdbcParameterListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/JdbcParameterListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.customstructures;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTime.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTime.java
index b89dd8fa8282..20d27c5db91b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTime.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTime.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTimeUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTimeUserType.java
index baf1e236b5c6..3d3776b6d077 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTimeUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeDateTimeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java
index a163e55248f5..a4001130881f 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java
index 0d85adf88b1a..824a491b3e20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmount.java
index 61b1fe0a6ef2..8f828afe02ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmount.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmountUserType.java
index 1a1206b88178..2fc66abe6b90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmountUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableMonetoryAmountUserType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmount.java
index 73c48f49da9a..54270c660805 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: MonetoryAmount.java 6234 2005-03-29 03:07:30Z oneovthafew $
 package org.hibernate.orm.test.cut;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -18,16 +14,16 @@ public class MonetoryAmount implements Serializable {
 
 	private BigDecimal amount;
 	private Currency currency;
-	
+
 	public MonetoryAmount(BigDecimal amount, Currency currency) {
 		this.amount = amount;
 		this.currency = currency;
 	}
-	
+
 	public BigDecimal getAmount() {
 		return amount;
 	}
-	
+
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmountUserType.java
index 0e622238d60d..d0e8cf00972c 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmountUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MonetoryAmountUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MutualFund.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MutualFund.java
index 5fba3316864e..5494115f576b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MutualFund.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/MutualFund.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.cut;
 
@@ -12,14 +10,14 @@
  *
  */
 public class MutualFund {
-	
+
 	private Long id;
 	private MonetoryAmount holdings;
-	
+
 	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/Transaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/Transaction.java
index b82f649cb615..3df4ba058820 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/Transaction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/Transaction.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Transaction.java 6234 2005-03-29 03:07:30Z oneovthafew $
 package org.hibernate.orm.test.cut;
 
 
@@ -22,23 +18,23 @@ public class Transaction {
 	public String getDescription() {
 		return description;
 	}
-	
+
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	
+
 	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	public MonetoryAmount getValue() {
 		return value;
 	}
-	
+
 	public void setValue(MonetoryAmount value) {
 		this.value = value;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholder.java
index 13c704fd3889..aef5a232f018 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholder.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut.generic;
 
 public class EnumPlaceholder, R extends Enum> {
@@ -16,4 +20,4 @@ public T getFirstEnum() {
 	public R getSecondEnum() {
 		return secondEnum;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholderUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholderUserType.java
index 36b0c03bc356..51342a8eba32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholderUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/EnumPlaceholderUserType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut.generic;
 
 import java.io.Serializable;
@@ -10,88 +14,88 @@
 
 public class EnumPlaceholderUserType implements CompositeUserType {
 
-    @Override
-    public Object getPropertyValue(EnumPlaceholder component, int property) throws HibernateException {
-        switch ( property ) {
-            case 0:
-                return component.getFirstEnum().getClass();
-            case 1:
-                return component.getFirstEnum().name();
-            case 2:
-                return component.getSecondEnum().getClass();
-            case 3:
-                return component.getSecondEnum().name();
-            default:
-                throw new RuntimeException();
-        }
-    }
-
-    @Override
-    public EnumPlaceholder instantiate(ValueAccess values, SessionFactoryImplementor sessionFactory) {
-        Class firstEnumClass = values.getValue( 0, Class.class );
-        String firstEnumValue = values.getValue( 1, String.class );
-        Class secondEnumClass = values.getValue( 2, Class.class );
-        String secondEnumValue = values.getValue( 3, String.class );
-
-        Enum firstEnum = Enum.valueOf( firstEnumClass, firstEnumValue );
-        Enum secondEnum = Enum.valueOf( secondEnumClass, secondEnumValue );
-
-        return new EnumPlaceholder( firstEnum, secondEnum );
-    }
-
-    @Override
-    public Class embeddable() {
-        return EmbeddableMapper.class;
-    }
-
-    @Override
-    public Class returnedClass() {
-        return EnumPlaceholder.class;
-    }
-
-    @Override
-    public boolean equals(EnumPlaceholder x, EnumPlaceholder y) {
-        return Objects.equals( x, y );
-    }
-
-    @Override
-    public int hashCode(EnumPlaceholder x) {
-        return Objects.hashCode( x );
-    }
-
-    @Override
-    public EnumPlaceholder deepCopy(EnumPlaceholder value) {
-        return new EnumPlaceholder<>( value.getFirstEnum(), value.getSecondEnum() );
-    }
-
-    @Override
-    public boolean isMutable() {
-        return false;
-    }
-
-    @Override
-    public Serializable disassemble(EnumPlaceholder value) {
-        return (Serializable) value;
-    }
-
-    @Override
-    public EnumPlaceholder assemble(Serializable cached, Object owner) {
-        return (EnumPlaceholder) cached;
-    }
-
-    @Override
-    public EnumPlaceholder replace(EnumPlaceholder detached, EnumPlaceholder managed, Object owner) {
-        return detached;
-    }
-
-    public static class EmbeddableMapper {
-        Class firstEnumClass;
-
-        String firstEnumValue;
-
-        Class secondEnumClass;
-
-        String secondEnumValue;
-    }
+	@Override
+	public Object getPropertyValue(EnumPlaceholder component, int property) throws HibernateException {
+		switch ( property ) {
+			case 0:
+				return component.getFirstEnum().getClass();
+			case 1:
+				return component.getFirstEnum().name();
+			case 2:
+				return component.getSecondEnum().getClass();
+			case 3:
+				return component.getSecondEnum().name();
+			default:
+				throw new RuntimeException();
+		}
+	}
+
+	@Override
+	public EnumPlaceholder instantiate(ValueAccess values, SessionFactoryImplementor sessionFactory) {
+		Class firstEnumClass = values.getValue( 0, Class.class );
+		String firstEnumValue = values.getValue( 1, String.class );
+		Class secondEnumClass = values.getValue( 2, Class.class );
+		String secondEnumValue = values.getValue( 3, String.class );
+
+		Enum firstEnum = Enum.valueOf( firstEnumClass, firstEnumValue );
+		Enum secondEnum = Enum.valueOf( secondEnumClass, secondEnumValue );
+
+		return new EnumPlaceholder( firstEnum, secondEnum );
+	}
+
+	@Override
+	public Class embeddable() {
+		return EmbeddableMapper.class;
+	}
+
+	@Override
+	public Class returnedClass() {
+		return EnumPlaceholder.class;
+	}
+
+	@Override
+	public boolean equals(EnumPlaceholder x, EnumPlaceholder y) {
+		return Objects.equals( x, y );
+	}
+
+	@Override
+	public int hashCode(EnumPlaceholder x) {
+		return Objects.hashCode( x );
+	}
+
+	@Override
+	public EnumPlaceholder deepCopy(EnumPlaceholder value) {
+		return new EnumPlaceholder<>( value.getFirstEnum(), value.getSecondEnum() );
+	}
+
+	@Override
+	public boolean isMutable() {
+		return false;
+	}
+
+	@Override
+	public Serializable disassemble(EnumPlaceholder value) {
+		return (Serializable) value;
+	}
+
+	@Override
+	public EnumPlaceholder assemble(Serializable cached, Object owner) {
+		return (EnumPlaceholder) cached;
+	}
+
+	@Override
+	public EnumPlaceholder replace(EnumPlaceholder detached, EnumPlaceholder managed, Object owner) {
+		return detached;
+	}
+
+	public static class EmbeddableMapper {
+		Class firstEnumClass;
+
+		String firstEnumValue;
+
+		Class secondEnumClass;
+
+		String secondEnumValue;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeEntity.java
index b003e8bf0ed6..889fa585fc3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut.generic;
 
 import org.hibernate.annotations.CompositeType;
@@ -8,7 +12,6 @@
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.Lob;
 
 @Entity
 public class GenericCompositeUserTypeEntity {
@@ -26,4 +29,4 @@ public GenericCompositeUserTypeEntity(EnumPlaceholder placeholder) {
 		this.id = System.currentTimeMillis();
 		this.placeholder = placeholder;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java
index c796495059df..e0ca57756dc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut.generic;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/Weekdays.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/Weekdays.java
index bcf87af0f789..3daccabd2764 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/Weekdays.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/Weekdays.java
@@ -1,10 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.cut.generic;
 
 public enum Weekdays {
-    MONDAY,
-    TUESDAY,
-    WEDNESDAY,
-    THURSDAY,
-    SATURDAY,
-    SUNDAY
+	MONDAY,
+	TUESDAY,
+	WEDNESDAY,
+	THURSDAY,
+	SATURDAY,
+	SUNDAY
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/SessionDelegatorBaseImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/SessionDelegatorBaseImplTest.java
index 699d3b0e149e..5075f3deb302 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/SessionDelegatorBaseImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/SessionDelegatorBaseImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilder.java
index 3c6bae05664b..417167a238ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilderImplementor.java
index ec4cc454cb55..5ecf8ca97d04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilderImplementor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSessionBuilderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSharedSessionBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSharedSessionBuilder.java
index 8797be466acb..083d9dc9abd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSharedSessionBuilder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/TestDelegatingSharedSessionBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.delegation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/package-info.java
index 2e74f7253168..1715253cb817 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/delegation/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Tests for various delegations used by non-ORM Hibernate projects
  */
-package org.hibernate.orm.test.delegation;
\ No newline at end of file
+package org.hibernate.orm.test.delegation;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
index c7f771607db9..7a82d97657d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.deletedetached;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java
index fca2597b8c4f..ea138b1b64df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.deletetransient;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java
index cd324d784824..96380b4b1d37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.deletetransient;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java
index 2702780b8d85..393349c0254a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.deletetransient;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java
index e062354e8b9d..ea132f4d2cf0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.deletetransient;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java
index b6c3cfcef2cc..e9f66f18e0a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.deletetransient;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Child.java
index 39b4d2c6f46c..0ce6e08cff5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Child.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.deleteunloaded;
 
 import jakarta.persistence.Entity;
@@ -7,21 +11,21 @@
 
 @Entity
 public class Child {
-    @GeneratedValue
-    @Id
-    private long id;
-    @ManyToOne
-    private Parent parent;
+	@GeneratedValue
+	@Id
+	private long id;
+	@ManyToOne
+	private Parent parent;
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 
-    public Parent getParent() {
-        return parent;
-    }
+	public Parent getParent() {
+		return parent;
+	}
 
-    public void setParent(Parent parent) {
-        this.parent = parent;
-    }
+	public void setParent(Parent parent) {
+		this.parent = parent;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/DeleteUnloadedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/DeleteUnloadedProxyTest.java
index afcb8e350796..9953870d6a06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/DeleteUnloadedProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/DeleteUnloadedProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.deleteunloaded;
 
 import org.hibernate.Transaction;
@@ -23,124 +27,124 @@
 //)
 public class DeleteUnloadedProxyTest {
 
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            session.createMutationQuery( "delete from ParentSub" ).executeUpdate();
-            session.createMutationQuery( "delete from Child" ).executeUpdate();
-            session.createMutationQuery( "delete from Parent" ).executeUpdate();
-        } );
-    }
-    @Test
-    public void testAttached(SessionFactoryScope scope) {
-        Parent p = new Parent();
-        Child c = new Child();
-        scope.inSession( em -> {
-            Transaction tx = em.beginTransaction();
-            c.setParent(p);
-            p.getChildren().add(c);
-            p.getWords().add("hello");
-            p.getWords().add("world");
-            em.persist(p);
-            tx.commit();
-        } );
-        scope.inSession( em -> {
-            Transaction tx = em.beginTransaction();
-            Child child = em.getReference( Child.class, c.getId() );
-            assertFalse( isInitialized(child) );
-            em.remove(child);
-            Parent parent = em.getReference( Parent.class, p.getId() );
-            assertFalse( isInitialized(parent) );
-            em.remove(parent);
-            tx.commit();
-            assertFalse( isInitialized(child) );
-            assertFalse( isInitialized(parent) );
-        } );
-        scope.inSession( em -> {
-            assertNull( em.find( Parent.class, p.getId() ) );
-            assertNull( em.find( Child.class, c.getId() ) );
-        } );
-    }
-    @Test
-    public void testDetached(SessionFactoryScope scope) {
-        Parent p = new Parent();
-        Child c = new Child();
-        scope.inSession( em -> {
-            Transaction tx = em.beginTransaction();
-            c.setParent(p);
-            p.getChildren().add(c);
-            p.getWords().add("hello");
-            p.getWords().add("world");
-            em.persist(p);
-            tx.commit();
-        } );
-        Child cc = scope.fromSession( em -> {
-            Transaction tx = em.beginTransaction();
-            Child child = em.getReference( Child.class, c.getId() );
-            assertFalse( isInitialized(child) );
-            return child;
-        } );
-        Parent pp = scope.fromSession( em -> {
-            Transaction tx = em.beginTransaction();
-            Parent parent = em.getReference( Parent.class, p.getId() );
-            assertFalse( isInitialized(parent) );
-            return parent;
-        } );
-        scope.inSession( em -> {
-            Transaction tx = em.beginTransaction();
-            em.remove(cc);
-            em.remove(pp);
-            tx.commit();
-            assertFalse( isInitialized(cc) );
-            assertFalse( isInitialized(pp) );
-        } );
-        scope.inSession( em -> {
-            assertNull( em.find( Parent.class, p.getId() ) );
-            assertNull( em.find( Child.class, c.getId() ) );
-        } );
-    }
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createMutationQuery( "delete from ParentSub" ).executeUpdate();
+			session.createMutationQuery( "delete from Child" ).executeUpdate();
+			session.createMutationQuery( "delete from Parent" ).executeUpdate();
+		} );
+	}
+	@Test
+	public void testAttached(SessionFactoryScope scope) {
+		Parent p = new Parent();
+		Child c = new Child();
+		scope.inSession( em -> {
+			Transaction tx = em.beginTransaction();
+			c.setParent(p);
+			p.getChildren().add(c);
+			p.getWords().add("hello");
+			p.getWords().add("world");
+			em.persist(p);
+			tx.commit();
+		} );
+		scope.inSession( em -> {
+			Transaction tx = em.beginTransaction();
+			Child child = em.getReference( Child.class, c.getId() );
+			assertFalse( isInitialized(child) );
+			em.remove(child);
+			Parent parent = em.getReference( Parent.class, p.getId() );
+			assertFalse( isInitialized(parent) );
+			em.remove(parent);
+			tx.commit();
+			assertFalse( isInitialized(child) );
+			assertFalse( isInitialized(parent) );
+		} );
+		scope.inSession( em -> {
+			assertNull( em.find( Parent.class, p.getId() ) );
+			assertNull( em.find( Child.class, c.getId() ) );
+		} );
+	}
+	@Test
+	public void testDetached(SessionFactoryScope scope) {
+		Parent p = new Parent();
+		Child c = new Child();
+		scope.inSession( em -> {
+			Transaction tx = em.beginTransaction();
+			c.setParent(p);
+			p.getChildren().add(c);
+			p.getWords().add("hello");
+			p.getWords().add("world");
+			em.persist(p);
+			tx.commit();
+		} );
+		Child cc = scope.fromSession( em -> {
+			Transaction tx = em.beginTransaction();
+			Child child = em.getReference( Child.class, c.getId() );
+			assertFalse( isInitialized(child) );
+			return child;
+		} );
+		Parent pp = scope.fromSession( em -> {
+			Transaction tx = em.beginTransaction();
+			Parent parent = em.getReference( Parent.class, p.getId() );
+			assertFalse( isInitialized(parent) );
+			return parent;
+		} );
+		scope.inSession( em -> {
+			Transaction tx = em.beginTransaction();
+			em.remove(cc);
+			em.remove(pp);
+			tx.commit();
+			assertFalse( isInitialized(cc) );
+			assertFalse( isInitialized(pp) );
+		} );
+		scope.inSession( em -> {
+			assertNull( em.find( Parent.class, p.getId() ) );
+			assertNull( em.find( Child.class, c.getId() ) );
+		} );
+	}
 
-    @Test
-    @JiraKey( "HHH-16690" )
-    public void testRePersist(SessionFactoryScope scope) {
-        Parent p = new Parent();
-        ParentSub ps = new ParentSub( 1L, "abc", p );
-        scope.inTransaction( em -> {
-            em.persist( p );
-            em.persist( ps );
-        } );
-        scope.inTransaction( em -> {
-            ParentSub sub = em.getReference( ParentSub.class, 1L );
-            assertFalse( isInitialized( sub ) );
-            em.remove( sub );
-            em.persist( new ParentSub( 1L, "def", p ) );
-        } );
-        scope.inSession( em -> {
-            ParentSub sub = em.find( ParentSub.class, 1L );
-            assertNotNull( sub );
-            assertEquals( "def", sub.getData() );
-        } );
-    }
+	@Test
+	@JiraKey( "HHH-16690" )
+	public void testRePersist(SessionFactoryScope scope) {
+		Parent p = new Parent();
+		ParentSub ps = new ParentSub( 1L, "abc", p );
+		scope.inTransaction( em -> {
+			em.persist( p );
+			em.persist( ps );
+		} );
+		scope.inTransaction( em -> {
+			ParentSub sub = em.getReference( ParentSub.class, 1L );
+			assertFalse( isInitialized( sub ) );
+			em.remove( sub );
+			em.persist( new ParentSub( 1L, "def", p ) );
+		} );
+		scope.inSession( em -> {
+			ParentSub sub = em.find( ParentSub.class, 1L );
+			assertNotNull( sub );
+			assertEquals( "def", sub.getData() );
+		} );
+	}
 
-    @Test
-    @JiraKey( "HHH-16690" )
-    public void testReMerge(SessionFactoryScope scope) {
-        Parent p = new Parent();
-        ParentSub ps = new ParentSub( 1L, "abc", p );
-        scope.inTransaction( em -> {
-            em.persist( p );
-            em.persist( ps );
-        } );
-        scope.inTransaction( em -> {
-            ParentSub sub = em.getReference( ParentSub.class, 1L );
-            assertFalse( isInitialized( sub ) );
-            em.remove( sub );
-            em.merge( new ParentSub( 1L, "def", p ) );
-        } );
-        scope.inSession( em -> {
-            ParentSub sub = em.find( ParentSub.class, 1L );
-            assertNotNull( sub );
-            assertEquals( "def", sub.getData() );
-        } );
-    }
+	@Test
+	@JiraKey( "HHH-16690" )
+	public void testReMerge(SessionFactoryScope scope) {
+		Parent p = new Parent();
+		ParentSub ps = new ParentSub( 1L, "abc", p );
+		scope.inTransaction( em -> {
+			em.persist( p );
+			em.persist( ps );
+		} );
+		scope.inTransaction( em -> {
+			ParentSub sub = em.getReference( ParentSub.class, 1L );
+			assertFalse( isInitialized( sub ) );
+			em.remove( sub );
+			em.merge( new ParentSub( 1L, "def", p ) );
+		} );
+		scope.inSession( em -> {
+			ParentSub sub = em.find( ParentSub.class, 1L );
+			assertNotNull( sub );
+			assertEquals( "def", sub.getData() );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Parent.java
index af89bc94d065..2434b1b7a955 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/Parent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.deleteunloaded;
 
 import jakarta.persistence.CascadeType;
@@ -15,27 +19,27 @@
 
 @Entity
 public class Parent {
-    @GeneratedValue
-    @Id
-    private long id;
-    @Version
-    private int version;
+	@GeneratedValue
+	@Id
+	private long id;
+	@Version
+	private int version;
 
-    @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
-    private Set children = new HashSet<>();
+	@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
+	private Set children = new HashSet<>();
 
-    @ElementCollection
-    private List words = new ArrayList<>();
+	@ElementCollection
+	private List words = new ArrayList<>();
 
-    public Set getChildren() {
-        return children;
-    }
+	public Set getChildren() {
+		return children;
+	}
 
-    public List getWords() {
-        return words;
-    }
+	public List getWords() {
+		return words;
+	}
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/ParentSub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/ParentSub.java
index f93f0f839330..ccb94bac1815 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/ParentSub.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deleteunloaded/ParentSub.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.deleteunloaded;
 
 import jakarta.persistence.Entity;
@@ -7,42 +11,42 @@
 
 @Entity
 public class ParentSub {
-    @Id
-    private long id;
-    private String data;
-    @OneToOne(fetch = FetchType.LAZY)
-    private Parent parent;
-
-    public ParentSub() {
-    }
-
-    public ParentSub(long id, String data, Parent parent) {
-        this.id = id;
-        this.data = data;
-        this.parent = parent;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public Parent getParent() {
-        return parent;
-    }
-
-    public void setParent(Parent parent) {
-        this.parent = parent;
-    }
+	@Id
+	private long id;
+	private String data;
+	@OneToOne(fetch = FetchType.LAZY)
+	private Parent parent;
+
+	public ParentSub() {
+	}
+
+	public ParentSub(long id, String data, Parent parent) {
+		this.id = id;
+		this.data = data;
+		this.parent = parent;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getData() {
+		return data;
+	}
+
+	public void setData(String data) {
+		this.data = data;
+	}
+
+	public Parent getParent() {
+		return parent;
+	}
+
+	public void setParent(Parent parent) {
+		this.parent = parent;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
index 58fb19ea61c4..0e24c910d7f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java
index 67becea41a1a..3c2ec0da38b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
index eaf8cac36c3f..ed9c0d450344 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
index 497fe42dbb06..c29ed3c5d011 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java
index 1a35c0a44e1e..7db3c7f6204d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.dialect;
 
 import org.hibernate.dialect.DB2iDialect;
@@ -14,10 +18,10 @@
 @RequiresDialect(DB2iDialect.class)
 public class DB2iDialectInitTestCase {
 
-    @Test
-    public void testInitUniqueDelegate() {
-        final var db2iDialect = new DB2iDialect();
-        assertNotNull(db2iDialect);
-    }
+	@Test
+	public void testInitUniqueDelegate() {
+		final var db2iDialect = new DB2iDialect();
+		assertNotNull(db2iDialect);
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java
index 8a56081e5607..ce15d82210ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.dialect;
 
 import org.hibernate.dialect.DB2zDialect;
@@ -14,12 +18,12 @@
 @RequiresDialect(DB2zDialect.class)
 public class DB2zDialectInitTestCase {
 
-    static class DB2zDialectWithExplicitTimezoneSupport extends DB2zDialect {
+	static class DB2zDialectWithExplicitTimezoneSupport extends DB2zDialect {
 	}
 
-    @Test
-    public void testInitWithTimezoneSupport() {
-        final var db2zDialect = new DB2zDialectWithExplicitTimezoneSupport();
-        assertNotNull(db2zDialect);
-    }
+	@Test
+	public void testInitWithTimezoneSupport() {
+		final var db2zDialect = new DB2zDialectWithExplicitTimezoneSupport();
+		assertNotNull(db2zDialect);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java
index a87d5f7c0d47..85b5ff1e7c01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
-import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SimpleDatabaseVersion;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java
index d9478a8bb6d6..ea751c5edec3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java
index 79d5a627b435..200ec284b477 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
@@ -64,8 +62,8 @@ public void testSqlGeneratedForIdentityInsertNoColumns() {
 	@Entity( name = "EntityWithIdentity" )
 	@Table( name = "EntityWithIdentity" )
 	public static class EntityWithIdentity {
-	    @Id @GeneratedValue( strategy = GenerationType.IDENTITY )
-	    private Integer id;
+		@Id @GeneratedValue( strategy = GenerationType.IDENTITY )
+		private Integer id;
 
 		private EntityWithIdentity() {
 			// for use by Hibernate
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/LimitLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/LimitLimitHandlerTest.java
index c1eb39b6822f..8272da253a37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/LimitLimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/LimitLimitHandlerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java
index c4b717b7fcc8..daf9f492dd74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
index f6cecb3b3a4c..8689ac3bef3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java
index bdac44a5fb00..ee2d56d8f74e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
index 4866397852f1..cfff4683615d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java
index af35aeea2f3a..5856b9a3d67a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/TestingDialects.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/TestingDialects.java
index 16b6c0d7e63d..77b09c33176a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/TestingDialects.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/TestingDialects.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java
index 38bea21f744c..2f30c97b3c3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 
@@ -32,7 +30,6 @@
 import org.hibernate.type.internal.BasicTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.junit.jupiter.api.Test;
@@ -53,7 +50,7 @@ public class AnsiTrimEmulationFunctionTest  {
 	private static final String TRAILING = "substring(?1,1,len(?1+'x')-1-patindex('%[^'+?2+']%',reverse(?1))+1)";
 	private static final String BOTH = "substring(?1,patindex('%[^'+?2+']%',?1),len(?1+'x')-1-patindex('%[^'+?2+']%',?1)-patindex('%[^'+?2+']%',reverse(?1))+2)";
 
-    @Test
+	@Test
 //	@RequiresDialect( SQLServerDialect.class )
 	public void testBasicSqlServerProcessing(ServiceRegistryScope scope) {
 		Dialect dialect = new SQLServerDialect();
@@ -77,7 +74,7 @@ public void testBasicSqlServerProcessing(ServiceRegistryScope scope) {
 		assertEquals( expected, rendered );
 	}
 
-    @Test
+	@Test
 //	@RequiresDialect( SybaseDialect.class )
 	public void testBasicSybaseProcessing(ServiceRegistryScope scope) {
 		Dialect dialect = new SybaseDialect();
@@ -146,7 +143,7 @@ public JdbcMappingContainer getExpressionType() {
 				return null;
 			}
 		} );
-    	function.render( walker, sqlAstArguments, (ReturnableType) null, walker );
+		function.render( walker, sqlAstArguments, (ReturnableType) null, walker );
 		return walker.getSql();
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java
index 1fae505418ce..f5ad25110074 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java
index f0a077a91701..91945cc7e32e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 
@@ -19,7 +17,7 @@
 import static org.junit.Assert.assertEquals;
 
 /**
-  @author Vlad Mihalcea
+@author Vlad Mihalcea
  */
 @RequiresDialect( HSQLDialect.class )
 public class HSQLTruncFunctionTest extends BaseEntityManagerFunctionalTestCase {
@@ -61,7 +59,7 @@ public void testTruncateAndTruncFunctions(){
 
 			assertEquals( 99.5d, score, 0.01 );
 		} );
-		
+
 	}
 
 	@Entity(name = "Person")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java
index 3f1f07ed6172..4093fcf2ed15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 import java.math.BigDecimal;
@@ -19,7 +17,7 @@
 import static org.junit.Assert.assertEquals;
 
 /**
-  @author Strong Liu
+@author Strong Liu
  */
 @RequiresDialect( MySQLDialect.class )
 public class MySQLRoundFunctionTest extends BaseCoreFunctionalTestCase {
@@ -52,7 +50,7 @@ public void testRoundFunction(){
 		assertEquals( BigDecimal.valueOf( 1.3 ) , o );
 		tx.commit();
 		s.close();
-		
+
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
index b1d5432059cf..66a31293e0bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java
index 3cfdbd201706..6a8787906275 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java
@@ -1,15 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 
+ *
  * @author Strong Liu
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java
index a993da692199..400bdd3ad72e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.function;
 
@@ -44,7 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * 
+ *
  * @author Richard H. Tingstad
  */
 @DomainModel(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java
index 3f59ff897edc..f5e91ce2ea51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/CockroachDBQueryHintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/CockroachDBQueryHintsTest.java
index 12d1a0567e35..8992528d184a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/CockroachDBQueryHintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/CockroachDBQueryHintsTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.dialect.functional;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java
index 04e6bf69bd40..a06bbbbcc2ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java
index 8cb81ff221de..50f00274a9a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java
index 1a63f6f7d576..d3fce56b1657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -28,7 +26,7 @@
  * Tests the correctness of the parameter hibernate.dialect.hana.use_legacy_boolean_type which controls the mapping of
  * boolean types to be either TINYINT (parameter is set to true) or BOOLEAN (default behavior or parameter is set to
  * false)
- * 
+ *
  * @author Jonathan Bregler
  */
 @RequiresDialect(HANADialect.class)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java
index 2c3c6f0998fe..07238be1215f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java
index 297d9fce2b82..e9e273132da1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -28,7 +26,7 @@
  * Tests the correctness of the parameter hibernate.dialect.hana.treat_double_typed_fields_as_decimal which controls the
  * handling of double types as either {@link BigDecimal} (parameter is set to true) or {@link Double} (default behavior
  * or parameter is set to false)
- * 
+ *
  * @author Jonathan Bregler
  */
 @RequiresDialect(HANADialect.class)
@@ -81,7 +79,7 @@ public void testDecimalTypeTrue() throws Exception {
 		entity.decimalDouble = BigDecimal.valueOf( 1.19d );
 
 		s.persist( entity );
-		
+
 		DecimalEntity entity2 = new DecimalEntity();
 		entity2.key = Integer.valueOf( 2 );
 		entity2.doubleDouble = 0.3d;
@@ -109,7 +107,7 @@ public void testDecimalTypeTrue() throws Exception {
 		assertEquals( new BigDecimal( "1.190000000000000" ), retrievedEntity.decimalDecimal );
 		assertEquals( 1.19d, retrievedEntity.doubleDecimal, 0 );
 		assertEquals( new BigDecimal( "1.19" ), retrievedEntity.decimalDouble );
-		
+
 		retrievedEntity = retrievedEntities.get( 1 );
 		assertEquals( Integer.valueOf( 2 ), retrievedEntity.key );
 		assertEquals( 0.3d, retrievedEntity.doubleDouble, 0 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java
index 936324e114af..16fe1366a3b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -31,7 +29,7 @@
 
 /**
  * Tests the correctness of the SAP HANA fulltext-search functions.
- * 
+ *
  * @author Jonathan Bregler
  */
 @DomainModel(
@@ -50,7 +48,7 @@ protected void prepareTest(SessionFactoryScope scope) throws Exception {
 				session -> session.doWork(
 						connection -> {
 							try (PreparedStatement ps = connection.prepareStatement( "CREATE COLUMN TABLE " + ENTITY_NAME
-																							 + " (key INTEGER, t TEXT, c NVARCHAR(255), PRIMARY KEY (key))" )) {
+																							+ " (key INTEGER, t TEXT, c NVARCHAR(255), PRIMARY KEY (key))" )) {
 								ps.execute();
 							}
 							try (PreparedStatement ps = connection
@@ -99,7 +97,7 @@ public void testTextType(SessionFactoryScope scope) {
 					session.flush();
 
 					Query legacyQuery = session.createQuery( "select b, snippets(t), highlighted(t), score() from "
-																		 + ENTITY_NAME + " b where contains(b.t, 'text')", Object[].class );
+																		+ ENTITY_NAME + " b where contains(b.t, 'text')", Object[].class );
 
 					Object[] result = legacyQuery.getSingleResult();
 					SearchEntity retrievedEntity = (SearchEntity) result[0];
@@ -131,7 +129,7 @@ public void testTextTypeFalse(SessionFactoryScope scope) {
 					session.flush();
 
 					Query legacyQuery = session.createQuery( "select b, snippets(t), highlighted(t), score() from " + ENTITY_NAME
-																		 + " b where not contains(b.t, 'string')", Object[].class );
+																		+ " b where not contains(b.t, 'string')", Object[].class );
 
 					Object[] result = legacyQuery.getSingleResult();
 					SearchEntity retrievedEntity = (SearchEntity) result[0];
@@ -241,7 +239,7 @@ public void testFuzzy(SessionFactoryScope scope) {
 					session.beginTransaction();
 
 					Query legacyQuery = session.createQuery( "select b, snippets(c), highlighted(c), score() from " + ENTITY_NAME
-																		 + " b where contains(b.c, 'string', FUZZY(0.7))", Object[].class );
+																		+ " b where contains(b.c, 'string', FUZZY(0.7))", Object[].class );
 
 					Object[] result = legacyQuery.getSingleResult();
 					SearchEntity retrievedEntity = (SearchEntity) result[0];
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java
index 9bd5535a71c1..43c8c9e4db43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.dialect.functional;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java
index 0a2e8682f5b1..53ca68d2fa71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.dialect.functional;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java
index e74a8a07699d..3a04c2e37977 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -108,4 +106,4 @@ public JdbcEnvironment getJdbcEnvironment() {
 				}
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java
index 0d1930da713b..026318b2c9bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -33,8 +31,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.QueryHint;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -211,7 +207,7 @@ public void testPessimisticLockWithFirstResultWhileExplicitlyDisablingFollowOnLo
 
 		List products = session.createQuery( "select p from Product p", Product.class )
 				.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-										 .setFollowOnLocking( false ) )
+										.setFollowOnLocking( false ) )
 				.setFirstResult( 40 )
 				.setMaxResults( 10 )
 				.getResultList();
@@ -236,7 +232,7 @@ public void testPessimisticLockWithFirstResultAndJoinWhileExplicitlyDisablingFol
 					session.createQuery(
 									"select p from Product p left join p.vehicle v on v.id is null", Product.class )
 							.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-													 .setFollowOnLocking( false ) )
+													.setFollowOnLocking( false ) )
 							.setFirstResult( 40 )
 							.setMaxResults( 10 )
 							.getResultList();
@@ -266,7 +262,7 @@ public void testPessimisticLockWithFirstResultsWhileExplicitlyEnablingFollowOnLo
 				session.createQuery(
 						"select p from Product p", Product.class )
 						.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-												 .setFollowOnLocking( true ) )
+												.setFollowOnLocking( true ) )
 						.setFirstResult( 40 )
 						.setMaxResults( 10 )
 						.getResultList();
@@ -337,7 +333,7 @@ public void testPessimisticLockWithMaxResultsAndOrderByWhileExplicitlyDisablingF
 						Product.class
 				)
 						.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-												 .setFollowOnLocking( false ) )
+												.setFollowOnLocking( false ) )
 						.setMaxResults( 10 )
 						.getResultList();
 		assertEquals( 10, products.size() );
@@ -356,7 +352,7 @@ public void testPessimisticLockWithMaxResultsAndOrderByWhileExplicitlyEnablingFo
 				session.createQuery(
 						"select p from Product p order by p.id", Product.class )
 						.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-												 .setFollowOnLocking( true ) )
+												.setFollowOnLocking( true ) )
 						.setMaxResults( 10 )
 						.getResultList();
 
@@ -405,7 +401,7 @@ public void testPessimisticLockWithDistinctWhileExplicitlyDisablingFollowOnLocki
 							Product.class
 					)
 							.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-													 .setFollowOnLocking( false ) )
+													.setFollowOnLocking( false ) )
 							.getResultList();
 			fail( "Should throw exception since Oracle does not support DISTINCT if follow on locking is disabled" );
 		}
@@ -434,7 +430,7 @@ public void testPessimisticLockWithDistinctWhileExplicitlyEnablingFollowOnLockin
 				session.createQuery(
 						"select distinct p from Product p where p.id > 40" )
 						.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-												 .setFollowOnLocking( true ) )
+												.setFollowOnLocking( true ) )
 						.setMaxResults( 10 )
 						.getResultList();
 
@@ -483,7 +479,7 @@ public void testPessimisticLockWithGroupByWhileExplicitlyDisablingFollowOnLockin
 									"from Product p " +
 									"group by p.id, p.name, p.vehicle.id " )
 							.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-													 .setFollowOnLocking( false ) )
+													.setFollowOnLocking( false ) )
 							.getResultList();
 			fail( "Should throw exception since Oracle does not support GROUP BY if follow on locking is disabled" );
 		}
@@ -514,7 +510,7 @@ public void testPessimisticLockWithGroupByWhileExplicitlyEnablingFollowOnLocking
 								"from Product p " +
 								"group by p.id, p.name, p.vehicle.id " )
 						.setLockOptions( new LockOptions( LockMode.PESSIMISTIC_WRITE )
-												 .setFollowOnLocking( true ) )
+												.setFollowOnLocking( true ) )
 						.getResultList();
 
 		assertEquals( 50, products.size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java
index c3d7dd3be97a..549b5a009634 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java
index 6d90d5a7c534..82839f1a9e4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.dialect.functional;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java
index a5f817377783..70c30b5876ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java
index 5a38fbb1e375..c3a8d2c2b5de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java
index f883fa116ecc..3de5d66cde8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java
index ee74fde7a83f..2d2529a96c9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java
index 3b21e1d0745d..4009391a701d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java
index c1b851466260..2d03efca1f3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -73,31 +71,31 @@ public void init() {
 			catch (SQLException e) {
 			}
 			statement.execute( "CREATE TABLE `TBL_BOOK` ( " +
-							   "  `ID` int(11) NOT NULL, " +
-							   "  `TITLE` varchar(255) DEFAULT NULL, " +
-							   "   PRIMARY KEY (`ID`) " +
-							   ") ENGINE=InnoDB" );
+							"  `ID` int(11) NOT NULL, " +
+							"  `TITLE` varchar(255) DEFAULT NULL, " +
+							"   PRIMARY KEY (`ID`) " +
+							") ENGINE=InnoDB" );
 
 			statement.execute( "CREATE TABLE `TBL_AUTHOR` ( " +
-									   "  `ID` int(11) NOT NULL, " +
-									   "  `firstName` varchar(255) DEFAULT NULL, " +
-									   "  `lastName` varchar(255) DEFAULT NULL, " +
-									   "   PRIMARY KEY (`ID`) " +
-									   ") ENGINE=InnoDB" );
+									"  `ID` int(11) NOT NULL, " +
+									"  `firstName` varchar(255) DEFAULT NULL, " +
+									"  `lastName` varchar(255) DEFAULT NULL, " +
+									"   PRIMARY KEY (`ID`) " +
+									") ENGINE=InnoDB" );
 
 			statement.execute( "CREATE SEQUENCE book_sequence " +
-							   "  START WITH 1 " +
-							   "  INCREMENT BY 1 " +
-							   "  MAXVALUE 2999999999 " +
-							   "  MINVALUE 0 " +
-							   "  CACHE 10" );
+							"  START WITH 1 " +
+							"  INCREMENT BY 1 " +
+							"  MAXVALUE 2999999999 " +
+							"  MINVALUE 0 " +
+							"  CACHE 10" );
 
 			statement.execute( "CREATE SEQUENCE author_sequence " +
-							   "  START WITH 1 " +
-							   "  INCREMENT BY 1 " +
-							   "  MAXVALUE 2999999999 " +
-							   "  MINVALUE 0 " +
-							   "  CACHE 10" );
+							"  START WITH 1 " +
+							"  INCREMENT BY 1 " +
+							"  MAXVALUE 2999999999 " +
+							"  MINVALUE 0 " +
+							"  CACHE 10" );
 		}
 		catch (SQLException e) {
 			fail(e.getMessage());
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
index 28bafc5ba376..9a75ffa84c3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SqlServerDistinctFetchOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SqlServerDistinctFetchOffsetTest.java
index c41a9284b0ee..e55b796aea60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SqlServerDistinctFetchOffsetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SqlServerDistinctFetchOffsetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.functional;
 
@@ -203,4 +201,3 @@ public void setName(String name) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectFactoryTest.java
index 27583262c16c..01d1de2341d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectFactoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java
index db425a507abc..8cacbba7b17f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectSpecificConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectSpecificConfigTest.java
index 8c130236f00e..3e98f5c8bcf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectSpecificConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectSpecificConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DiscoveredDialectResolverTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DiscoveredDialectResolverTests.java
index d7790298af9d..6fb9e4474037 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DiscoveredDialectResolverTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DiscoveredDialectResolverTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/StandardDialectResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/StandardDialectResolverTest.java
index 812a6a1b01aa..a580da8e7e90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/StandardDialectResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/StandardDialectResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
@@ -12,7 +10,6 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
-import org.hibernate.orm.test.dialect.resolver.TestingDialectResolutionInfo;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
@@ -22,7 +19,7 @@
 
 /**
  * Unit test of the {@link StandardDialectResolver} class.
- * 
+ *
  * @author Bryan Turner
  */
 public class StandardDialectResolverTest extends BaseUnitTestCase {
@@ -190,8 +187,8 @@ private static void runDialectTest(
 		// Make sure to test that the actual dialect class is as expected
 		// (not just an instance of the expected dialect.
 		assertEquals( "Dialect for " + dbms + " should be " + expectedDialect.getSimpleName(),
-					  expectedDialect,
-					  dialect.getClass()
+					expectedDialect,
+					dialect.getClass()
 		);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/TestingDialectResolutionInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/TestingDialectResolutionInfo.java
index 266c23d1512d..9179e0aaa875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/TestingDialectResolutionInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/TestingDialectResolutionInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.resolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectParseJoinExpression.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectParseJoinExpression.java
index d409e171c3ad..c1f4dbc66483 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectParseJoinExpression.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectParseJoinExpression.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.dialect.unit;
 
 import java.util.regex.Matcher;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
index 6fb688c7b1be..cb63ae8d29bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/DialectTempTableNoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/DialectTempTableNoCommitTest.java
index d10c92208ae5..d23109a2e546 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/DialectTempTableNoCommitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/DialectTempTableNoCommitTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit;
 
-import org.hibernate.dialect.H2Dialect;
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableStrategy;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -17,7 +14,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java
index fde443124d21..57afb95ae0b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.lockhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
index e400b1c44af3..74128083dbad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.lockhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
index c7f9bcc821c6..a4e80eccf9ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.lockhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
index 594e144098e8..f85147f60e3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.lockhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
index 43734b8a1b4e..b2f7c4bae30c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.locktimeout;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
index d4f6676df96b..4daa34883480 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.locktimeout;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/OracleLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/OracleLockTimeoutTest.java
index f69716affe35..33394ba46f26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/OracleLockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/OracleLockTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.locktimeout;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
index e16658db1fec..73bc1612da1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.locktimeout;
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java
index a5634bc4e029..0937ef79a531 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.sequence;
 
@@ -11,14 +9,12 @@
 import jakarta.persistence.Table;
 
 import org.hibernate.dialect.Dialect;
-import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
 import org.junit.Test;
 
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.assertThat;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
index 8700aab3fde6..daaadb1df0e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
index d16c8817cf89..5e4fadb1a758 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dialect.unit.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java
index 7785a5907301..7f776c6d1592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dirtiness;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java
index 55261a2669eb..2efb68998abc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dirtiness;
 
@@ -45,7 +43,7 @@ public void setId(Long id) {
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		// intentionally simple dirty tracking (i.e. no checking against previous state)
 		changedValues.put( "name", this.name );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java
index 7a42ce8122bc..6c6ea9afbc55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java
@@ -1,10 +1,13 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.discriminatedcollections;
 
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
@@ -12,94 +15,94 @@
 @DiscriminatorColumn(name = "account_type")
 abstract class Account {
 
-    @Id
-    private Integer id;
-    private double amount;
-    private Double rate;
+	@Id
+	private Integer id;
+	private double amount;
+	private Double rate;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Client client;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Client client;
 
-    Account() {}
+	Account() {}
 
-    public Account(Integer id, double amount, Double rate, Client client) {
-        this.id = id;
-        this.amount = amount;
-        this.rate = rate;
-        this.client = client;
-    }
+	public Account(Integer id, double amount, Double rate, Client client) {
+		this.id = id;
+		this.amount = amount;
+		this.rate = rate;
+		this.client = client;
+	}
 
-    public Account(Integer id, Client client) {
-        this( id, 0.0, 12.0, client );
-    }
+	public Account(Integer id, Client client) {
+		this( id, 0.0, 12.0, client );
+	}
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public Client getClient() {
-        return client;
-    }
+	public Client getClient() {
+		return client;
+	}
 
 
-    public double getAmount() {
-        return amount;
-    }
+	public double getAmount() {
+		return amount;
+	}
 
-    public void setAmount(double amount) {
-        this.amount = amount;
-    }
+	public void setAmount(double amount) {
+		this.amount = amount;
+	}
 
 
-    public Double getRate() {
-        return rate;
-    }
+	public Double getRate() {
+		return rate;
+	}
 
-    public void setRate(Double rate) {
-        this.rate = rate;
-    }
+	public void setRate(Double rate) {
+		this.rate = rate;
+	}
 
-    public abstract AccountType getType();
+	public abstract AccountType getType();
 }
 
 @Entity
 @DiscriminatorValue("D")
 class DebitAccount extends Account {
 
-    DebitAccount() {
-    }
+	DebitAccount() {
+	}
 
-    public DebitAccount(Integer id, double amount, Double rate, Client client) {
-        super( id, amount, rate, client );
-    }
+	public DebitAccount(Integer id, double amount, Double rate, Client client) {
+		super( id, amount, rate, client );
+	}
 
-    public DebitAccount(Integer id, Client client) {
-        super( id, client );
-    }
+	public DebitAccount(Integer id, Client client) {
+		super( id, client );
+	}
 
-    @Override
-    public AccountType getType() {
-        return AccountType.DEBIT;
-    }
+	@Override
+	public AccountType getType() {
+		return AccountType.DEBIT;
+	}
 }
 
 @Entity
 @DiscriminatorValue("C")
 class CreditAccount extends Account {
 
-    CreditAccount() {
-    }
+	CreditAccount() {
+	}
 
-    public CreditAccount(Integer id, double amount, Double rate, Client client) {
-        super( id, amount, rate, client );
-    }
+	public CreditAccount(Integer id, double amount, Double rate, Client client) {
+		super( id, amount, rate, client );
+	}
 
-    public CreditAccount(Integer id, Client client) {
-        super( id, client );
-    }
+	public CreditAccount(Integer id, Client client) {
+		super( id, client );
+	}
 
-    @Override
-    public AccountType getType() {
-        return AccountType.CREDIT;
-    }
+	@Override
+	public AccountType getType() {
+		return AccountType.CREDIT;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/AccountType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/AccountType.java
index b5e4a2e440bb..27c6d42ddf10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/AccountType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/AccountType.java
@@ -1,6 +1,10 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.discriminatedcollections;
 
 public enum AccountType {
-    DEBIT,
-    CREDIT
-}
\ No newline at end of file
+	DEBIT,
+	CREDIT
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java
index b530d1c23ffe..a7ecf18445ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.discriminatedcollections;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import java.util.HashSet;
@@ -11,38 +14,37 @@
 
 @Entity
 class Client {
-    @Id
-    private Integer id;
-    private String name;
+	@Id
+	private Integer id;
+	private String name;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "client", fetch = FetchType.LAZY)
-    private Set debitAccounts = new HashSet<>();
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "client", fetch = FetchType.LAZY)
+	private Set debitAccounts = new HashSet<>();
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "client", fetch = FetchType.LAZY)
-    private Set creditAccounts = new HashSet<>();
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "client", fetch = FetchType.LAZY)
+	private Set creditAccounts = new HashSet<>();
 
-    Client() {}
+	Client() {}
 
-    public Client(Integer id, String name) {
-        this.id = id;
-        this.name = name;
-    }
+	public Client(Integer id, String name) {
+		this.id = id;
+		this.name = name;
+	}
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
 
-    public Set getCreditAccounts() {
-        return creditAccounts;
-    }
+	public Set getCreditAccounts() {
+		return creditAccounts;
+	}
 
-    public Set getDebitAccounts() {
-        return debitAccounts;
-    }
+	public Set getDebitAccounts() {
+		return debitAccounts;
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java
index a21649f32abb..02ed643bb865 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.discriminatedcollections;
 
@@ -156,4 +154,3 @@ public void hqlSelectAccountTest(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java
index f093b5ff56ad..91ee7a5f1e9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.distinct;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/CustomEntityNameResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/CustomEntityNameResolverTest.java
index 744674c5d945..98a31f81e83e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/CustomEntityNameResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/CustomEntityNameResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dynamicmap;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java
index 274763fabfd6..a06c975dfd91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.dynamicmap;
 
@@ -59,4 +57,3 @@ public void bootstrappingTest(SessionFactoryScope scope) {
 		} );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java
index cf08546c8d37..09440358b77b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ecid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java
index a7070213038b..3956fa2f51e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Course.java 6913 2005-05-25 17:37:51Z oneovthafew $
 package org.hibernate.orm.test.ecid;
 import java.io.Serializable;
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Course implements Serializable {
-	
+
 	private String courseCode;
 	private String org;
 	private String description;
@@ -24,19 +20,19 @@ public class Course implements Serializable {
 		this.org = org;
 		this.description = description;
 	}
-	
+
 	public String getDescription() {
 		return description;
 	}
-	
+
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	
+
 	public String getCourseCode() {
 		return courseCode;
 	}
-	
+
 	public String getOrg() {
 		return org;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java
index f3ece684598a..b9716ef489f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ecid;
 
@@ -169,4 +167,3 @@ public void testPolymorphism(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java
index 31535389e881..bb401c766cd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ecid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java
index 597c51837982..291cfebc1ef4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: UniversityCourse.java 6913 2005-05-25 17:37:51Z oneovthafew $
 package org.hibernate.orm.test.ecid;
 
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class UniversityCourse extends Course {
-	
+
 	private int semester;
 
 	UniversityCourse() {}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java
index a77c6693148a..e00e18db7d80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllNonOptionalPropertyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllNonOptionalPropertyUpdateTest.java
index 57a292325519..244063885651 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllNonOptionalPropertyUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllNonOptionalPropertyUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllPrimitivePropertyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllPrimitivePropertyUpdateTest.java
index 8fa572ac4bf8..3fc57d3cb8c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllPrimitivePropertyUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionAllPrimitivePropertyUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionInitializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionInitializationTest.java
index 290c92002de1..531909a8ab3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionInitializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionInitializationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionLazyToOneTest.java
index 73edcb8bfd86..ae069c88f982 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionLazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionLazyToOneTest.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.List;
 
-import org.hibernate.jpa.SpecHints;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -17,10 +20,6 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionNonOptionalPropertyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionNonOptionalPropertyUpdateTest.java
index f85f8ce1a5bf..a4b23b42d7e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionNonOptionalPropertyUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionNonOptionalPropertyUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionOptionalPropertyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionOptionalPropertyUpdateTest.java
index 508da3d99178..0ba2f31c09d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionOptionalPropertyUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/ElementCollectionOptionalPropertyUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java
index 25889daa3852..28b468b1b420 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionWithUpdatableFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionWithUpdatableFalseTest.java
index 1e3bcd24e3b5..3e4def8880f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionWithUpdatableFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionWithUpdatableFalseTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsOrderedElementCollectionWithUpdatableFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsOrderedElementCollectionWithUpdatableFalseTest.java
index b9bdf6ceecfb..dcf800d63b8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsOrderedElementCollectionWithUpdatableFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsOrderedElementCollectionWithUpdatableFalseTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAscDescQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAscDescQueryTest.java
index 97532a4ef26f..1e48d62daa3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAscDescQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAscDescQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java
index 0eecbbf3f12a..c807f11e5b04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.embeddable;
 
@@ -270,4 +268,4 @@ public String getCode() {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java
index 5a575e84629f..e76e1a5a5fef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritance2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritance2Test.java
index cd7a89544985..a02633554608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritance2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritance2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import org.hibernate.Hibernate;
@@ -154,4 +158,4 @@ public void setIntensity(Integer intensity) {
 			this.intensity = intensity;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritanceTest.java
index 5a9d6a98c982..2f4bd21cec63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import org.hibernate.Hibernate;
@@ -139,4 +143,4 @@ public void setName(String name) {
 			this.name = name;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/LazyToOneMappedByInDoubleEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/LazyToOneMappedByInDoubleEmbeddedTest.java
index 6f25108a2747..064828635fda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/LazyToOneMappedByInDoubleEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/LazyToOneMappedByInDoubleEmbeddedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java
index 7544a4631c60..f7e0bb39bbab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddableWithLockingDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddableWithLockingDeletionTest.java
index c088fcff35e0..ae7ef9d3ca1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddableWithLockingDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddableWithLockingDeletionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddedWitnNotOptionalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddedWitnNotOptionalManyToOneTest.java
index 19f82e4683e0..0a342544d721 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddedWitnNotOptionalManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NestedEmbeddedWitnNotOptionalManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NullEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NullEmbeddableTest.java
index e99c17ca3632..59b4e2cc5586 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NullEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/NullEmbeddableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OneToManyInEmbeddedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OneToManyInEmbeddedQueryTest.java
index 0f3bd038a21d..00fe3ae4715c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OneToManyInEmbeddedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OneToManyInEmbeddedQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.embeddable;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java
index b9bf1223f5c8..4d0817da7630 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java
index ab405bda20b3..2cd0a7c99b98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/NonSortedExecutableListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/NonSortedExecutableListTest.java
index 05fa4aeed9ea..126e240a7b08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/NonSortedExecutableListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/NonSortedExecutableListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.engine.action;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/SortedExecutableListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/SortedExecutableListTest.java
index 88df6b919eb5..cfa9d9709cf3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/SortedExecutableListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/SortedExecutableListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.engine.action;
 
@@ -145,7 +143,7 @@ public void testAdd() {
 		assertThat( actionList ).element( 0 ).isSameAs( action1 );
 		assertThat( actionList ).element( 1 ).isSameAs( action3 );
 	}
-	
+
 	@Test
 	public void testClear() {
 		assertThat( actionList ).isEmpty();
@@ -160,7 +158,7 @@ public void testClear() {
 
 		assertThat( actionList ).isEmpty();
 	}
-	
+
 	@Test
 	public void testIterator() {
 		actionList.add( action1 );
@@ -248,7 +246,7 @@ public void testSort() {
 		assertThat( actionList ).element( 2 ).isSameAs( action3 );
 		assertThat( actionList ).element( 3 ).isSameAs( action4 );
 	}
-	
+
 	@Test
 	public void testSerializeDeserialize() throws IOException, ClassNotFoundException {
 		actionList.add( action4 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/package-info.java
index 66207fd43dbb..9343f2d6ca0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/action/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Tests related to Hibernate's ActionQueue
  */
-package org.hibernate.orm.test.engine.action;
\ No newline at end of file
+package org.hibernate.orm.test.engine.action;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/EntityEntryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/EntityEntryTest.java
index 1bb3a62b0ce9..8a42dc590048 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/EntityEntryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/EntityEntryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.engine.spi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java
index 03b6da38aef0..e27f74b9f97c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.engine.spi;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/LoadQueryInfluencersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/LoadQueryInfluencersTest.java
index d5379c597b3e..d577170559af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/LoadQueryInfluencersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/LoadQueryInfluencersTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.engine.spi;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/DiscriminatorColumnFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/DiscriminatorColumnFetchGraphTest.java
index ca1df0e854f1..5cca2ad0fbd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/DiscriminatorColumnFetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/DiscriminatorColumnFetchGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAndJoinTest.java
index da51fd01a356..fd8e967a4466 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAndJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAndJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
@@ -67,7 +65,7 @@ public void testHqlJoin(SessionFactoryScope scope) {
 	public void testHqlLeftJoin(SessionFactoryScope scope) {
 		executeQuery( scope, false, true, false );
 	}
-	
+
 	@Test
 	public void testCriteriaJoin(SessionFactoryScope scope) {
 		executeQuery( scope, true, false, false );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
index 108f0af99bf9..a0a3b8a4f9f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.math.BigInteger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphEmbeddedAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphEmbeddedAttributesTest.java
index 743de7263e3d..409734b40dec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphEmbeddedAttributesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphEmbeddedAttributesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java
index 2f7f67fb83e9..287927500120 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java
index d2e0eb0a49aa..a8b43d0865f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
@@ -142,8 +140,8 @@ void testNativeQueryFetchGraph(SessionFactoryScope scope) {
 		);
 	}
 
-    @Entity(name = "Foo")
-    public static class Foo {
+	@Entity(name = "Foo")
+	public static class Foo {
 
 		@Id
 		@GeneratedValue
@@ -163,19 +161,19 @@ public static class Bar {
 		@GeneratedValue
 		public Integer id;
 
-        @OneToMany(mappedBy = "bar")
-        public Set foos = new HashSet<>();
+		@OneToMany(mappedBy = "bar")
+		public Set foos = new HashSet<>();
 	}
 
 	@Entity(name = "Baz")
-    public static class Baz {
+	public static class Baz {
 
 		@Id
 		@GeneratedValue
-        public Integer id;
+		public Integer id;
 
-        @OneToMany(mappedBy = "baz")
-        public Set foos = new HashSet<>();
+		@OneToMany(mappedBy = "baz")
+		public Set foos = new HashSet<>();
 
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java
index 31bae23fb7e8..258351fb4676 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java
index d38a3def3194..d4ed854875d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchGenericAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchGenericAttributesTest.java
index fd0a1f0c45c4..1b1c0c721f02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchGenericAttributesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchGenericAttributesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java
index b4a0bfd3445d..47743a82cb5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FindWithEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FindWithEntityGraphTest.java
index e5058fe6eed8..50f043a40350 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FindWithEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FindWithEntityGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java
index fad2319da020..ba394df439ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java
index dc924764fa6f..e96293c623e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java
index 0e433181ba52..09bc3a75ff9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph;
 
@@ -37,209 +35,209 @@
  * @author Oliver Breidenbach
  */
 @DomainModel(
-        annotatedClasses = {
-                InheritedEntityGraphTest.Foo2.class,
-                InheritedEntityGraphTest.Foo.class,
-                InheritedEntityGraphTest.Bar.class
-        }
+		annotatedClasses = {
+				InheritedEntityGraphTest.Foo2.class,
+				InheritedEntityGraphTest.Foo.class,
+				InheritedEntityGraphTest.Bar.class
+		}
 )
 @SessionFactory
 public class InheritedEntityGraphTest {
 
 	@Test
-    @JiraKey(value = "HHH-10261")
-    void singleAttributeNodeInheritanceTest(SessionFactoryScope scope) {
+	@JiraKey(value = "HHH-10261")
+	void singleAttributeNodeInheritanceTest(SessionFactoryScope scope) {
 
-	    MutableLong fooId = new MutableLong();
+		MutableLong fooId = new MutableLong();
 
-	    scope.inTransaction(
-	            session -> {
-                    Bar bar = new Bar();
-                    session.persist(bar);
+		scope.inTransaction(
+				session -> {
+					Bar bar = new Bar();
+					session.persist(bar);
 
-                    Foo foo = new Foo();
-                    foo.bar = bar;
-                    session.persist( foo );
+					Foo foo = new Foo();
+					foo.bar = bar;
+					session.persist( foo );
 
-                    fooId.set( foo.id );
-                }
-        );
+					fooId.set( foo.id );
+				}
+		);
 
-	    scope.inTransaction(
-	            session -> {
-	                EntityManager em = session.unwrap( EntityManager.class );
-                    EntityGraph entityGraph = em.createEntityGraph( Foo.class );
-                    entityGraph.addSubgraph( "bar" );
+		scope.inTransaction(
+				session -> {
+					EntityManager em = session.unwrap( EntityManager.class );
+					EntityGraph entityGraph = em.createEntityGraph( Foo.class );
+					entityGraph.addSubgraph( "bar" );
 
-                    Map properties = Collections.singletonMap(
-                            GraphSemantic.LOAD.getJpaHintName(), entityGraph
-                    );
+					Map properties = Collections.singletonMap(
+							GraphSemantic.LOAD.getJpaHintName(), entityGraph
+					);
 
-                    Foo result = em.find( Foo.class, fooId.get(), properties );
+					Foo result = em.find( Foo.class, fooId.get(), properties );
 
-                    assertThat( result, isInitialized() );
-                    assertThat( result.bar, isInitialized() );
-                }
-        );
-    }
+					assertThat( result, isInitialized() );
+					assertThat( result.bar, isInitialized() );
+				}
+		);
+	}
 
-    @Test
-    @JiraKey(value = "HHH-10261")
-    void collectionAttributeNodeInheritanceTest(SessionFactoryScope scope) {
+	@Test
+	@JiraKey(value = "HHH-10261")
+	void collectionAttributeNodeInheritanceTest(SessionFactoryScope scope) {
+
+		MutableLong fooId = new MutableLong();
+
+		scope.inTransaction(
+				session -> {
+					Bar bar = new Bar();
+					session.persist(bar);
 
-	    MutableLong fooId = new MutableLong();
+					Foo foo = new Foo();
+					foo.bar = bar;
+					session.persist( foo );
 
-	    scope.inTransaction(
-	            session -> {
-                    Bar bar = new Bar();
-                    session.persist(bar);
+					fooId.set( foo.id );
+				}
+		);
 
-                    Foo foo = new Foo();
-                    foo.bar = bar;
-                    session.persist( foo );
+		scope.inTransaction(
+				session -> {
+					EntityManager em = session.unwrap( EntityManager.class );
+					EntityGraph entityGraph = em.createEntityGraph( Foo.class );
+					entityGraph.addSubgraph( "bars" );
 
-                    fooId.set( foo.id );
-                }
-        );
-
-	    scope.inTransaction(
-	            session -> {
-	                EntityManager em = session.unwrap( EntityManager.class );
-                    EntityGraph entityGraph = em.createEntityGraph( Foo.class );
-                    entityGraph.addSubgraph( "bars" );
-
-                    Map properties = Collections.singletonMap(
-                            GraphSemantic.LOAD.getJpaHintName(), entityGraph
-                    );
-
-                    Foo result = em.find( Foo.class, fooId.get(), properties );
-
-                    assertThat( result, isInitialized() );
-                    assertThat( result.bars, isInitialized() );
-                }
-        );
-    }
+					Map properties = Collections.singletonMap(
+							GraphSemantic.LOAD.getJpaHintName(), entityGraph
+					);
 
+					Foo result = em.find( Foo.class, fooId.get(), properties );
 
-    @Test
-    @JiraKey(value = "HHH-10261")
-    void singleAttributeSubgraphInheritanceTest(SessionFactoryScope scope) {
-
-	    MutableLong foo2Id = new MutableLong();
-
-	    scope.inTransaction(
-	            session -> {
-                    Bar bar = new Bar();
-                    session.persist(bar);
+					assertThat( result, isInitialized() );
+					assertThat( result.bars, isInitialized() );
+				}
+		);
+	}
 
-                    Foo foo = new Foo();
-                    foo.bar = bar;
-                    session.persist( foo );
 
-                    Foo2 foo2 = new Foo2();
-                    foo2.foo = foo;
-                    session.persist( foo2 );
+	@Test
+	@JiraKey(value = "HHH-10261")
+	void singleAttributeSubgraphInheritanceTest(SessionFactoryScope scope) {
+
+		MutableLong foo2Id = new MutableLong();
 
-                    foo2Id.set( foo2.id );
-                }
-        );
+		scope.inTransaction(
+				session -> {
+					Bar bar = new Bar();
+					session.persist(bar);
 
-	    scope.inTransaction(
-	            session -> {
-	                EntityManager em = session.unwrap( EntityManager.class );
-                    EntityGraph entityGraph = em.createEntityGraph( Foo2.class );
-                    Subgraph subgraphFoo = entityGraph.addSubgraph( "foo" );
-                    subgraphFoo.addSubgraph( "bar" );
+					Foo foo = new Foo();
+					foo.bar = bar;
+					session.persist( foo );
 
-                    Map properties = Collections.singletonMap(
-                            GraphSemantic.LOAD.getJpaHintName(), entityGraph
-                    );
+					Foo2 foo2 = new Foo2();
+					foo2.foo = foo;
+					session.persist( foo2 );
 
-                    Foo2 result = em.find( Foo2.class, foo2Id.get(), properties );
+					foo2Id.set( foo2.id );
+				}
+		);
 
-                    assertThat( result, isInitialized() );
-                    assertThat( result.foo, isInitialized() );
-                    assertThat( result.foo.bar, isInitialized() );
-                }
-        );
-    }
+		scope.inTransaction(
+				session -> {
+					EntityManager em = session.unwrap( EntityManager.class );
+					EntityGraph entityGraph = em.createEntityGraph( Foo2.class );
+					Subgraph subgraphFoo = entityGraph.addSubgraph( "foo" );
+					subgraphFoo.addSubgraph( "bar" );
 
-    @Test
-    @JiraKey(value = "HHH-10261")
-    void collectionAttributeSubgraphInheritanceTest(SessionFactoryScope scope) {
+					Map properties = Collections.singletonMap(
+							GraphSemantic.LOAD.getJpaHintName(), entityGraph
+					);
+
+					Foo2 result = em.find( Foo2.class, foo2Id.get(), properties );
+
+					assertThat( result, isInitialized() );
+					assertThat( result.foo, isInitialized() );
+					assertThat( result.foo.bar, isInitialized() );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey(value = "HHH-10261")
+	void collectionAttributeSubgraphInheritanceTest(SessionFactoryScope scope) {
 
-	    MutableLong foo2Id = new MutableLong();
+		MutableLong foo2Id = new MutableLong();
 
-	    scope.inTransaction(
-	            session -> {
-                    Bar bar = new Bar();
-                    session.persist(bar);
+		scope.inTransaction(
+				session -> {
+					Bar bar = new Bar();
+					session.persist(bar);
 
-                    Foo foo = new Foo();
-                    foo.bar = bar;
-                    session.persist( foo );
+					Foo foo = new Foo();
+					foo.bar = bar;
+					session.persist( foo );
 
-                    Foo2 foo2 = new Foo2();
-                    foo2.foo = foo;
-                    session.persist( foo2 );
+					Foo2 foo2 = new Foo2();
+					foo2.foo = foo;
+					session.persist( foo2 );
 
-                    foo2Id.set( foo2.id );
-                }
-        );
+					foo2Id.set( foo2.id );
+				}
+		);
 
-	    scope.inTransaction(
-	            session -> {
-	                EntityManager em = session.unwrap( EntityManager.class );
-                    EntityGraph entityGraph = em.createEntityGraph( Foo2.class );
-                    Subgraph subgraphFoo = entityGraph.addSubgraph( "foo" );
-                    subgraphFoo.addSubgraph( "bars" );
+		scope.inTransaction(
+				session -> {
+					EntityManager em = session.unwrap( EntityManager.class );
+					EntityGraph entityGraph = em.createEntityGraph( Foo2.class );
+					Subgraph subgraphFoo = entityGraph.addSubgraph( "foo" );
+					subgraphFoo.addSubgraph( "bars" );
 
-                    Map properties = Collections.singletonMap(
-                            GraphSemantic.LOAD.getJpaHintName(), entityGraph
-                    );
+					Map properties = Collections.singletonMap(
+							GraphSemantic.LOAD.getJpaHintName(), entityGraph
+					);
 
-                    Foo2 result = em.find( Foo2.class, foo2Id.get(), properties );
+					Foo2 result = em.find( Foo2.class, foo2Id.get(), properties );
 
-                    assertThat( result, isInitialized() );
-                    assertThat( result.foo, isInitialized() );
-                    assertThat( result.foo.bars, isInitialized() );
-                }
-        );
-    }
+					assertThat( result, isInitialized() );
+					assertThat( result.foo, isInitialized() );
+					assertThat( result.foo.bars, isInitialized() );
+				}
+		);
+	}
 
-    @MappedSuperclass
-    public static class MappedSupperclass {
-        @Id
-        @GeneratedValue
-        public long id;
+	@MappedSuperclass
+	public static class MappedSupperclass {
+		@Id
+		@GeneratedValue
+		public long id;
 
-        @OneToOne(fetch = FetchType.LAZY)
-        public Bar bar;
+		@OneToOne(fetch = FetchType.LAZY)
+		public Bar bar;
 
-        @OneToMany
-        public Set bars = new HashSet();
+		@OneToMany
+		public Set bars = new HashSet();
 
-    }
+	}
 
-    @Entity(name = "Bar")
-    public static class Bar {
-        @Id @GeneratedValue
-        public long id;
+	@Entity(name = "Bar")
+	public static class Bar {
+		@Id @GeneratedValue
+		public long id;
 
-    }
+	}
 
-    @Entity(name = "Foo")
-    public static class Foo extends MappedSupperclass {
+	@Entity(name = "Foo")
+	public static class Foo extends MappedSupperclass {
 
-    }
+	}
 
-    @Entity(name = "Foo2")
-    public static class Foo2 {
-        @Id @GeneratedValue
-        public long id;
+	@Entity(name = "Foo2")
+	public static class Foo2 {
+		@Id @GeneratedValue
+		public long id;
 
-        @OneToOne(fetch = FetchType.LAZY)
-        public Foo foo;
+		@OneToOne(fetch = FetchType.LAZY)
+		public Foo foo;
 
-    }
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java
index 4f63f8fe1c73..f192814c9f89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java
index b39530e9ab52..db171c586f57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java
index 2987ed69c760..e24cee1d1387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.ast;
 
@@ -114,7 +112,7 @@ void testBasicSemantics(GraphSemantic graphSemantic) {
 					// Check the domain-result graph
 					assertDomainResult( sqlAst, Cat.class,
 							fetch -> {
-						        if (graphSemantic == GraphSemantic.LOAD) {
+								if (graphSemantic == GraphSemantic.LOAD) {
 									assertThat( fetch, instanceOf( BiDirectionalFetch.class ) );
 								} else {
 									assertThat( fetch, instanceOf( EntityFetch.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
index 1ff410989129..e34397b3bf48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.ast;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java
index 54e2ec469fb4..4836c5f6ef9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.ast;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java
index eee42c2fbd2d..d187c3235210 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.ast;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java
index ab2e68268cc7..d4f477d31dc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.mappedbyid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java
index dc7149f88939..39baafc9456c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.named.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java
index 4619df21062e..08b41e9a303c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.named.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java
index 545c348bc894..04ec05049aa1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.named.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java
index 2972ea7bff18..4771bb7ef1ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.named.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java
index 9991ee28161a..836561c2de85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.named.multiple;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Author.java
index 735425f45de9..c45c1bffb319 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Author.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.named.subgraph;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Book.java
index 0b4a8882dcb8..18398b85eb5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Book.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.named.subgraph;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Prize.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Prize.java
index 786f72ba9bfd..668b8539358f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Prize.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/Prize.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.named.subgraph;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java
index ce9ce178beed..6cb4de5ee2ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph.named.subgraph;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java
index b741b011617d..f1a2d0838d3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.parser;
 
@@ -69,7 +67,7 @@ private void assertBasicAttributes(List> attrs, String... names
 		else {
 			Assert.assertNotNull( attrs );
 			Assert.assertTrue( names.length <= attrs.size() );
-	
+
 			for ( String name : names ) {
 				AttributeNode node = null;
 				for ( AttributeNode candidate : attrs ) {
@@ -104,4 +102,3 @@ private AttributeNode getAttributeNodeByName(List> attrs, St
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java
index d9e2541c6b02..4b3752def830 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.parser;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
index ad82327e2b75..af2a0322b885 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.parser;
 
@@ -28,7 +26,7 @@
 
 /**
  * A unit test of {@link GraphParser}.
- * 
+ *
  * @author asusnjar
  */
 public class EntityGraphParserTest extends AbstractEntityGraphTest {
@@ -215,7 +213,7 @@ public void testHHH12696MapSubgraphsKeyFirst() {
 
 		EntityManager entityManager = getOrCreateEntityManager();
 		EntityGraph graph = entityManager.createEntityGraph( GraphParsingTestEntity.class );
-		
+
 		final String mapAttributeName = "map";
 		Subgraph keySubgraph = graph.addKeySubgraph( mapAttributeName );
 		Subgraph valueSubgraph = graph.addSubgraph( mapAttributeName );
@@ -233,7 +231,7 @@ private void checkMapKeyAndValueSubgraphs(EntityGraph gr
 				Map keySubgraphs = node.getKeySubgraphs();
 				Assert.assertTrue( "Missing the key subgraph", !keySubgraphs.isEmpty() );
 				Assert.assertSame( keySubgraph, keySubgraphs.get( GraphParsingTestEntity.class ) );
-				
+
 				@SuppressWarnings("rawtypes")
 				Map valueSubgraphs = node.getSubgraphs();
 				Assert.assertTrue( "Missing the value subgraph", !valueSubgraphs.isEmpty() );
@@ -247,7 +245,7 @@ private void checkMapKeyAndValueSubgraphs(EntityGraph gr
 	public void testHHH12696MapSubgraphsValueFirst() {
 		EntityManager entityManager = getOrCreateEntityManager();
 		EntityGraph graph = entityManager.createEntityGraph( GraphParsingTestEntity.class );
-		
+
 		final String mapAttributeName = "map";
 		Subgraph valueSubgraph = graph.addSubgraph( mapAttributeName );
 		Subgraph keySubgraph = graph.addKeySubgraph( mapAttributeName );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java
index 804aef7885a9..8a4dcfeb6683 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitygraph.parser;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java
index ca121d147fed..4dd96f2ca961 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph.parser;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java
index 253ef7ad3d10..5d575fa8c261 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.entitygraph.parser;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java
index ff8e135d5980..46e36abd164a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.xml;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java
index 7333f1dc9ed7..6deda7106aa7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.xml;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java
index 37fabe3ad988..f6da5555093d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.entitygraph.xml;
 
 import org.hibernate.cfg.Configuration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java
index c4fb977b2741..81b342fc59d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.dom4j;
 
@@ -38,4 +36,4 @@ public Component getComponent() {
 	public void setComponent(Component component) {
 		this.component = component;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java
index 9d02036767d8..821acdab6445 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.dom4j;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java
index c9145d3ff802..dc7960c5d3fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.dom4j;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java
index c39bc24e5f02..fd49414f4eeb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.dom4j;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java
index b0d09d27db23..2b6cf9d21c52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.map.basic;
 
@@ -68,15 +66,15 @@ public void testLazyDynamicClass() {
 
 		s = openSession();
 		t = s.beginTransaction();
-		
+
 		cars = (Map) s.createQuery("from ProductLine pl order by pl.description").uniqueResult();
 		models = (List) cars.get("models");
 		assertFalse( Hibernate.isInitialized(models) );
 		assertEquals( models.size(), 2);
 		assertTrue( Hibernate.isInitialized(models) );
-		
+
 		s.clear();
-		
+
 		List list = s.createQuery("from Model m").list();
 		for ( Iterator i=list.iterator(); i.hasNext(); ) {
 			assertFalse( Hibernate.isInitialized( ( (Map) i.next() ).get("productLine") ) );
@@ -84,7 +82,7 @@ public void testLazyDynamicClass() {
 		Map model = (Map) list.get(0);
 		assertTrue( ( (List) ( (Map) model.get("productLine") ).get("models") ).contains(model) );
 		s.clear();
-		
+
 		t.commit();
 		s.close();
 
@@ -98,4 +96,3 @@ public void testLazyDynamicClass() {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java
index 4269fc34ab38..93e61ab011ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.map.compositeId;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java
index 74a078a31e2e..ef577dea48fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entitymode.map.subclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Car.java
index f5f982749ff1..64e69da04ac8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Car.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Car.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Car.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.entityname;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java
index b10119984e61..fa9d3d7dd387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entityname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java
index 5372a7011012..c2665526cb6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entityname;
 import org.junit.Test;
@@ -40,7 +38,7 @@ public void testEntityName() {
 		s.persist(stliu);
 		s.getTransaction().commit();
 		s.close();
-		
+
 		s=openSession();
 		s.beginTransaction();
 		Person p = (Person)s.get(Person.class, stliu.getId());
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MultipleMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MultipleMappingsTest.java
index 82cd2b0e8b4e..f1a347bd8e59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MultipleMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MultipleMappingsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entityname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MyEntity.java
index c654ccb22c18..7326b74891de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entityname;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Person.java
index 4ef104416d0e..5255bf152f48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Person.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.entityname;
 import java.util.HashSet;
 import java.util.Set;
 /**
- * 
+ *
  * @author stliu
  *
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Vehicle.java
index 1cf223c24d47..4388f732f148 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Vehicle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/Vehicle.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Vehicle.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.entityname;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java
index 70c5f40fc2a9..06f9133b8c3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java
index 9ae1d138aa2b..f1f284493231 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event;
 
@@ -54,22 +52,22 @@ public void tearDown() {
 	}
 
 	@Test
-    public void testMergeToManagedEntityFillFollowedByInvertMapping() {
+	public void testMergeToManagedEntityFillFollowedByInvertMapping() {
 		MergeContext cache = new MergeContext( session, new DoNothingEntityCopyObserver() );
 
-        Object mergeEntity = new Simple( 1 );
-        Object managedEntity = new Simple( 2 );
-        
-        cache.put(mergeEntity, managedEntity);
+		Object mergeEntity = new Simple( 1 );
+		Object managedEntity = new Simple( 2 );
+
+		cache.put(mergeEntity, managedEntity);
 
 		checkCacheConsistency( cache, 1 );
 
 		assertTrue( cache.containsKey( mergeEntity ) );
-        assertFalse( cache.containsKey( managedEntity ) );
+		assertFalse( cache.containsKey( managedEntity ) );
 		assertTrue( cache.containsValue( managedEntity ) );
 
 		assertTrue( cache.invertMap().containsKey( managedEntity ) );
-        assertFalse( cache.invertMap().containsKey( mergeEntity ) );
+		assertFalse( cache.invertMap().containsKey( mergeEntity ) );
 		assertTrue( cache.invertMap().containsValue( mergeEntity ) );
 
 		cache.clear();
@@ -77,73 +75,73 @@ public void testMergeToManagedEntityFillFollowedByInvertMapping() {
 		checkCacheConsistency( cache, 0 );
 
 		assertFalse(cache.containsKey(mergeEntity));
-        assertFalse(cache.invertMap().containsKey(managedEntity));
+		assertFalse(cache.invertMap().containsKey(managedEntity));
 	}
 
 	@Test
-    public void testMergeToManagedEntityFillFollowedByInvert() {
+	public void testMergeToManagedEntityFillFollowedByInvert() {
 		MergeContext cache = new MergeContext( session, new DoNothingEntityCopyObserver() );
 
-        Object mergeEntity = new Simple( 1 );
-        Object managedEntity = new Simple( 2 );
-        
-        cache.put(mergeEntity, managedEntity);
+		Object mergeEntity = new Simple( 1 );
+		Object managedEntity = new Simple( 2 );
+
+		cache.put(mergeEntity, managedEntity);
 
 		checkCacheConsistency( cache, 1 );
 
 		assertTrue(cache.containsKey(mergeEntity));
-        assertFalse( cache.containsKey( managedEntity ) );
-        
-        assertTrue( cache.invertMap().containsKey( managedEntity ) );
-        assertFalse( cache.invertMap().containsKey( mergeEntity ) );
-    }
+		assertFalse( cache.containsKey( managedEntity ) );
+
+		assertTrue( cache.invertMap().containsKey( managedEntity ) );
+		assertFalse( cache.invertMap().containsKey( mergeEntity ) );
+	}
 
 	@Test
-    public void testMergeToManagedEntityFillFollowedByInvertUsingPutAll() {
+	public void testMergeToManagedEntityFillFollowedByInvertUsingPutAll() {
 		MergeContext cache = new MergeContext( session, new DoNothingEntityCopyObserver() );
 
-        Map input = new HashMap();
-        Object mergeEntity1 = new Simple( 1 );
+		Map input = new HashMap();
+		Object mergeEntity1 = new Simple( 1 );
 		//
-        Object managedEntity1 = 1;
-        input.put(mergeEntity1, managedEntity1);
-        Object mergeEntity2 = new Simple( 3 );
-        Object managedEntity2 = 2;
-        input.put(mergeEntity2, managedEntity2);
-        cache.putAll(input);
+		Object managedEntity1 = 1;
+		input.put(mergeEntity1, managedEntity1);
+		Object mergeEntity2 = new Simple( 3 );
+		Object managedEntity2 = 2;
+		input.put(mergeEntity2, managedEntity2);
+		cache.putAll(input);
 
 		checkCacheConsistency( cache, 2 );
 
 		assertTrue(cache.containsKey(mergeEntity1));
-        assertFalse(cache.containsKey(managedEntity1));
-        assertTrue(cache.containsKey(mergeEntity2));
-        assertFalse(cache.containsKey(managedEntity2));
+		assertFalse(cache.containsKey(managedEntity1));
+		assertTrue(cache.containsKey(mergeEntity2));
+		assertFalse(cache.containsKey(managedEntity2));
 
-        assertTrue(cache.invertMap().containsKey(managedEntity1));
-        assertFalse(cache.invertMap().containsKey(mergeEntity1));
+		assertTrue(cache.invertMap().containsKey(managedEntity1));
+		assertFalse(cache.invertMap().containsKey(mergeEntity1));
 
-        assertTrue(cache.invertMap().containsKey(managedEntity2));
-        assertFalse(cache.invertMap().containsKey(mergeEntity2));
-    }
+		assertTrue(cache.invertMap().containsKey(managedEntity2));
+		assertFalse(cache.invertMap().containsKey(mergeEntity2));
+	}
 
 	@Test
-    public void testMergeToManagedEntityFillFollowedByInvertUsingPutWithSetOperatedOnArg() {
+	public void testMergeToManagedEntityFillFollowedByInvertUsingPutWithSetOperatedOnArg() {
 		MergeContext cache = new MergeContext( session, new DoNothingEntityCopyObserver() );
 
-        Object mergeEntity = new Simple( 1 );
-        Object managedEntity = new Simple( 2 );
-        
-        cache.put(mergeEntity, managedEntity, true);
+		Object mergeEntity = new Simple( 1 );
+		Object managedEntity = new Simple( 2 );
+
+		cache.put(mergeEntity, managedEntity, true);
 
 		checkCacheConsistency( cache, 1 );
 
 		assertTrue(cache.containsKey(mergeEntity));
-        assertFalse( cache.containsKey( managedEntity ) );
+		assertFalse( cache.containsKey( managedEntity ) );
 
-        assertTrue( cache.invertMap().containsKey( managedEntity ) );
-        assertFalse( cache.invertMap().containsKey( mergeEntity ) );
-        
-        cache.clear();
+		assertTrue( cache.invertMap().containsKey( managedEntity ) );
+		assertFalse( cache.invertMap().containsKey( mergeEntity ) );
+
+		cache.clear();
 
 		checkCacheConsistency( cache, 0 );
 
@@ -153,8 +151,8 @@ public void testMergeToManagedEntityFillFollowedByInvertUsingPutWithSetOperatedO
 		checkCacheConsistency( cache, 1 );
 
 		assertTrue(cache.containsKey(mergeEntity));
-        assertFalse(cache.containsKey(managedEntity));
-    }
+		assertFalse(cache.containsKey(managedEntity));
+	}
 
 	@Test
 	public void testMergeToManagedEntityFillFollowedByIterateEntrySet() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java
index 827f0ca21685..d15193588504 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToOne;
 
-import org.hibernate.TransientObjectException;
 import org.hibernate.action.internal.EntityActionVetoException;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventType;
@@ -26,7 +23,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java
index 520089636e86..4fec38773080 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event;
 
@@ -33,93 +31,93 @@
 @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
 @JiraKey( value = "HHH-11721" )
 public class PreInsertEventListenerVetoUnidirectionalTest extends BaseCoreFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Child.class, Parent.class };
-    }
-
-    @Override
-    protected void afterSessionFactoryBuilt() {
-        super.afterSessionFactoryBuilt();
-        EventListenerRegistry registry = sessionFactory().getServiceRegistry().getService( EventListenerRegistry.class );
-        registry.appendListeners(
-                EventType.PRE_INSERT,
-                (PreInsertEventListener) event -> event.getEntity() instanceof Parent
-        );
-    }
-
-    @Test(expected = EntityActionVetoException.class)
-    public void testVeto() {
-        doInHibernate( this::sessionFactory, session -> {
-            Parent parent = new Parent();
-            parent.setField1( "f1" );
-            parent.setfield2( "f2" );
-
-            Child child = new Child();
-            child.setParent( parent );
-
-            session.persist( child );
-        } );
-
-        fail( "Should have thrown EntityActionVetoException!" );
-    }
-
-    @Entity(name = "Child")
-    public static class Child {
-        @Id
-        @GeneratedValue(strategy = GenerationType.IDENTITY)
-        private Integer id;
-
-        @OneToOne(cascade = CascadeType.ALL)
-        private Parent parent;
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public Parent getParent() {
-            return parent;
-        }
-
-        public void setParent(Parent parent) {
-            this.parent = parent;
-        }
-    }
-
-    @Entity(name = "Parent")
-    public static class Parent {
-        @Id
-        @GeneratedValue(strategy = GenerationType.IDENTITY)
-        private Integer id;
-        private String field1;
-        private String field2;
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getField1() {
-            return field1;
-        }
-
-        public void setField1(String field1) {
-            this.field1 = field1;
-        }
-
-        public String getField2() {
-            return field2;
-        }
-
-        public void setfield2(String field2) {
-            this.field2 = field2;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Child.class, Parent.class };
+	}
+
+	@Override
+	protected void afterSessionFactoryBuilt() {
+		super.afterSessionFactoryBuilt();
+		EventListenerRegistry registry = sessionFactory().getServiceRegistry().getService( EventListenerRegistry.class );
+		registry.appendListeners(
+				EventType.PRE_INSERT,
+				(PreInsertEventListener) event -> event.getEntity() instanceof Parent
+		);
+	}
+
+	@Test(expected = EntityActionVetoException.class)
+	public void testVeto() {
+		doInHibernate( this::sessionFactory, session -> {
+			Parent parent = new Parent();
+			parent.setField1( "f1" );
+			parent.setfield2( "f2" );
+
+			Child child = new Child();
+			child.setParent( parent );
+
+			session.persist( child );
+		} );
+
+		fail( "Should have thrown EntityActionVetoException!" );
+	}
+
+	@Entity(name = "Child")
+	public static class Child {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private Integer id;
+
+		@OneToOne(cascade = CascadeType.ALL)
+		private Parent parent;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public Parent getParent() {
+			return parent;
+		}
+
+		public void setParent(Parent parent) {
+			this.parent = parent;
+		}
+	}
+
+	@Entity(name = "Parent")
+	public static class Parent {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private Integer id;
+		private String field1;
+		private String field2;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getField1() {
+			return field1;
+		}
+
+		public void setField1(String field1) {
+			this.field1 = field1;
+		}
+
+		public String getField2() {
+			return field2;
+		}
+
+		public void setfield2(String field2) {
+			this.field2 = field2;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/SessionEventListenersManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/SessionEventListenersManagerTest.java
index 16f8478aad45..865464176780 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/SessionEventListenersManagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/SessionEventListenersManagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java
index 4fce431a5598..370b492d9c7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection;
 
@@ -791,23 +789,23 @@ protected ParentWithCollection createParentWithOneChild(String parentName, Strin
 	}
 
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 ParentWithCollection parent,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							ParentWithCollection parent,
+							int index) {
 		checkResult( listeners, listenerExpected, parent, parent.getChildren(), index );
 	}
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 ChildWithBidirectionalManyToMany child,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							ChildWithBidirectionalManyToMany child,
+							int index) {
 		checkResult( listeners, listenerExpected, child, child.getParents(), index );
 	}
 
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 Entity ownerExpected,
-							 Collection collExpected,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							Entity ownerExpected,
+							Collection collExpected,
+							int index) {
 		assertSame( listenerExpected, listeners.getListenersCalled().get( index ) );
 		assertSame(
 				ownerExpected,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractParentWithCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractParentWithCollection.java
index 5f063c2607f3..32d0fd667352 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractParentWithCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractParentWithCollection.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection;
 import java.util.Collection;
 
@@ -17,7 +12,7 @@
 public abstract class AbstractParentWithCollection implements ParentWithCollection {
 	private Long id;
 	private String name;
-	           
+
 	private Collection children;
 
 	public AbstractParentWithCollection() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java
index 688325b81a0d..52cbd9be2761 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection;
 import java.util.Collection;
@@ -264,7 +262,7 @@ public void testUpdateMergedParentOneChildToNullFailureExpected() {
 		checkResult( listeners, listeners.getPreCollectionRecreateListener(), parent, index++ );
 		checkResult( listeners, listeners.getPostCollectionRecreateListener(), parent, index++ );
 		checkNumberOfResults( listeners, index );
-	}	
+	}
 	*/
 
 	private ParentWithCollection createParentWithNullChildren(String parentName) {
@@ -301,23 +299,23 @@ private ParentWithCollection createParentWithOneChild(String parentName, String
 	}
 
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 ParentWithCollection parent,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							ParentWithCollection parent,
+							int index) {
 		checkResult( listeners, listenerExpected, parent, parent.getChildren(), index );
 	}
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 ChildWithBidirectionalManyToMany child,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							ChildWithBidirectionalManyToMany child,
+							int index) {
 		checkResult( listeners, listenerExpected, child, child.getParents(), index );
 	}
 
 	protected void checkResult(CollectionListeners listeners,
-							 CollectionListeners.Listener listenerExpected,
-							 Entity ownerExpected,
-							 Collection collExpected,
-							 int index) {
+							CollectionListeners.Listener listenerExpected,
+							Entity ownerExpected,
+							Collection collExpected,
+							int index) {
 		assertSame( listenerExpected, listeners.getListenersCalled().get( index ) );
 		assertSame(
 				ownerExpected,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Child.java
index 7d0f4c9ae29c..2eec09b6cef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Child.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildEntity.java
index 8f8bba981925..bb1b9f89cb9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildEntity.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildValue.java
index 572ba437c904..fe19b9dd702a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ChildValue.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/CollectionListeners.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/CollectionListeners.java
index 57374576fa94..0613913a37da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/CollectionListeners.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/CollectionListeners.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Entity.java
index be49dd6a5622..ea668bbdb582 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ParentWithCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ParentWithCollection.java
index af292d7234a3..699050af0a27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ParentWithCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/ParentWithCollection.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java
index ecbb7b7c2b90..512cd0860426 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association;
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java
index 8956de2cb5ce..e328d7328428 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.bidirectional.manytomany;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java
index 34de99e0c7c9..48fbdd0a0cab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.bidirectional.manytomany;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java
index 47b0d3cf3341..67ff8b748a3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.bidirectional.manytomany;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java
index bec299916fdf..7f734f5e57f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.bidirectional.manytomany;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java
index 007a60709672..58abfc7554fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java
index 55a6f6acdf58..7e9c8a4dea8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java
index a5d9c7937e35..4b124f44b3bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java
index 30310c42468b..783cb8420d13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 import org.hibernate.orm.test.event.collection.ChildEntity;
 import org.hibernate.orm.test.event.collection.ParentWithCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java
index 6006ec3e86d3..83cca458c3fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java
index c577125f3e21..0855d4581784 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.bidirectional.onetomany;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java
index 477fe7f66458..ef316de281d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.association.unidirectional;
 import org.hibernate.orm.test.event.collection.AbstractParentWithCollection;
 import org.hibernate.orm.test.event.collection.Child;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java
index 80a739e0d4e5..bd93d8332f5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.unidirectional.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java
index 6ee7056e1516..c18e5119f7bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.unidirectional.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java
index ec3579a80549..ff63c7e026c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.association.unidirectional.onetomany;
 
@@ -30,6 +28,5 @@ public ParentWithCollection createParent(String name) {
 	@Override
 	public Collection createCollection() {
 		return new HashSet();
-	}	
+	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/AggregatedCollectionEventListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/AggregatedCollectionEventListener.java
index 1b3b4a8f40d0..9d665950e461 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/AggregatedCollectionEventListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/AggregatedCollectionEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -42,12 +40,12 @@
  */
 public class AggregatedCollectionEventListener
 		implements InitializeCollectionEventListener,
-				   PreCollectionRecreateEventListener,
-				   PostCollectionRecreateEventListener,
-				   PreCollectionRemoveEventListener,
-				   PostCollectionRemoveEventListener,
-				   PreCollectionUpdateEventListener,
-				   PostCollectionUpdateEventListener {
+				PreCollectionRecreateEventListener,
+				PostCollectionRecreateEventListener,
+				PreCollectionRemoveEventListener,
+				PostCollectionRemoveEventListener,
+				PreCollectionUpdateEventListener,
+				PostCollectionUpdateEventListener {
 
 	private static final Logger log = Logger.getLogger( AggregatedCollectionEventListener.class );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java
index 4070936163ed..8e9a03fa6d44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java
index fb6e81bf8007..ef532d7f54b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java
index 1350b607daa4..4803203865cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java
index 3b429af046ac..49aed6ed7e8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -28,7 +26,7 @@
 /**
  * Test HHH-6361: Collection events may contain wrong stored snapshot after
  * merging a detached entity into the persistencecontext.
- * 
+ *
  * @author Erik-Berndt Scheper
  */
 @JiraKey( value = "HHH-6361" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Identifiable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Identifiable.java
index b5d99b6847b7..371a229d69c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Identifiable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Identifiable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java
index 8e90753ebd30..c1a5d8141fc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java
index 9fa503b36f97..d2fa1d6162e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -131,12 +129,12 @@ public boolean equals(Object obj) {
 		return true;
 	}
 
-	
+
 	public MultipleCollectionEntity deepCopy() {
 		MultipleCollectionEntity clone = new MultipleCollectionEntity();
 		clone.setText(this.text);
 		clone.setId(this.id);
-		
+
 		for (MultipleCollectionRefEntity1 refEntity1 : refEntities1) {
 			clone.addRefEntity1(refEntity1.deepCopy(clone));
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionListeners.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionListeners.java
index 18df577b3cc2..6b12ce8a9f37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionListeners.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionListeners.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -36,7 +34,7 @@
 /**
  * Support listeners for Test HHH-6361: Collection events may contain wrong
  * stored snapshot after merging a detached entity into the persistencecontext.
- * 
+ *
  * @author Erik-Berndt Scheper
  */
 public class MultipleCollectionListeners {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java
index 56e287eb313b..a86bfa4b56f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -98,7 +96,7 @@ public boolean equals(Object obj) {
 			return false;
 		return true;
 	}
-	
+
 	public MultipleCollectionRefEntity1 deepCopy(MultipleCollectionEntity newRef) {
 		MultipleCollectionRefEntity1 clone = new MultipleCollectionRefEntity1();
 		clone.setText(this.text);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java
index 46211f59e38e..1e79702aa348 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.detached;
 
@@ -99,7 +97,7 @@ public boolean equals(Object obj) {
 		return true;
 	}
 
-	
+
 	public MultipleCollectionRefEntity2 deepCopy(MultipleCollectionEntity newRef) {
 		MultipleCollectionRefEntity2 clone = new MultipleCollectionRefEntity2();
 		clone.setText(this.text);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ParentWithCollectionOfValues.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ParentWithCollectionOfValues.java
index d8930a004a67..1349d17a40e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ParentWithCollectionOfValues.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ParentWithCollectionOfValues.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.event.collection.values;
 import org.hibernate.orm.test.event.collection.AbstractParentWithCollection;
 import org.hibernate.orm.test.event.collection.Child;
@@ -23,7 +18,7 @@ public ParentWithCollectionOfValues() {
 	public ParentWithCollectionOfValues(String name) {
 		super( name );
 	}
-	
+
 	public Child createChild(String name) {
 		return new ChildValue( name );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ValuesBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ValuesBagCollectionEventTest.java
index 3e90e39c3f3d..4924824f4eb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ValuesBagCollectionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/values/ValuesBagCollectionEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.collection.values;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java
index ffc9cf09e339..25457e47b36e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java
index 83eddfc0d972..eece1f14d576 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.event.entity;
 
@@ -26,7 +24,6 @@
 import org.hibernate.event.spi.PreInsertEvent;
 import org.hibernate.event.spi.PreInsertEventListener;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.testing.DialectCheck;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.RequiresDialectFeature;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java
index ea1440de4193..1fb43a7037b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/BaseEntity.java
index 39dd80a083b5..b06c1c39af8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/BaseEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -16,30 +14,29 @@
 @MappedSuperclass
 public abstract class BaseEntity {
 
-    private Timestamp createdOn;
+	private Timestamp createdOn;
 
-    private Timestamp updatedOn;
+	private Timestamp updatedOn;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::events-default-listener-mapping-example[]
 
-    public Timestamp getCreatedOn() {
-        return createdOn;
-    }
+	public Timestamp getCreatedOn() {
+		return createdOn;
+	}
 
-    void setCreatedOn(Timestamp createdOn) {
-        this.createdOn = createdOn;
-    }
+	void setCreatedOn(Timestamp createdOn) {
+		this.createdOn = createdOn;
+	}
 
-    public Timestamp getUpdatedOn() {
-        return updatedOn;
-    }
+	public Timestamp getUpdatedOn() {
+		return updatedOn;
+	}
 
-    void setUpdatedOn(Timestamp updatedOn) {
-        this.updatedOn = updatedOn;
-    }
+	void setUpdatedOn(Timestamp updatedOn) {
+		this.updatedOn = updatedOn;
+	}
 //tag::events-default-listener-mapping-example[]
 }
 //end::events-default-listener-mapping-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java
index 12c1dc97a765..7cdd37591e22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -46,12 +44,12 @@ public class CallbackTest extends BaseCoreFunctionalTestCase {
 	private TestingListener listener = new TestingListener();
 
 	@Override
-    public String[] getMappings() {
+	public String[] getMappings() {
 		return NO_MAPPINGS;
 	}
 
 	@Override
-    public void configure(Configuration cfg) {
+	public void configure(Configuration cfg) {
 		cfg.setSessionFactoryObserver( observer );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/ClearEventListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/ClearEventListenerTest.java
index 79cb650b74d5..fecd7ef22cfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/ClearEventListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/ClearEventListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListener.java
index 820c1816b5b1..bf3083025139 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -16,24 +14,24 @@
 //tag::events-default-listener-mapping-example[]
 public class DefaultEntityListener {
 
-    public void onPersist(Object entity) {
-        if (entity instanceof BaseEntity) {
-            BaseEntity baseEntity = (BaseEntity) entity;
-            baseEntity.setCreatedOn(now());
-        }
-    }
+	public void onPersist(Object entity) {
+		if (entity instanceof BaseEntity) {
+			BaseEntity baseEntity = (BaseEntity) entity;
+			baseEntity.setCreatedOn(now());
+		}
+	}
 
-    public void onUpdate(Object entity) {
-        if (entity instanceof BaseEntity) {
-            BaseEntity baseEntity = (BaseEntity) entity;
-            baseEntity.setUpdatedOn(now());
-        }
-    }
+	public void onUpdate(Object entity) {
+		if (entity instanceof BaseEntity) {
+			BaseEntity baseEntity = (BaseEntity) entity;
+			baseEntity.setUpdatedOn(now());
+		}
+	}
 
-    private Timestamp now() {
-        return Timestamp.from(
-            LocalDateTime.now().toInstant(ZoneOffset.UTC)
-       );
-    }
+	private Timestamp now() {
+		return Timestamp.from(
+			LocalDateTime.now().toInstant(ZoneOffset.UTC)
+	);
+	}
 }
 //end::events-default-listener-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListenerTest.java
index 42ca0fad7de0..369cd6fff6b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/DefaultEntityListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java
index 150879b5979a..6484b3e744c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/InterceptorTest.java
index 4414edeaec3b..ea3f6359f240 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/InterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/InterceptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -17,10 +15,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 
 import org.hibernate.type.Type;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java
index 53fe302ab97e..138e7723e394 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -107,7 +105,7 @@ public void testPostCommitInsertListenerRollback() {
 		transaction.rollback();
 		session.close();
 
-		//the legacy implementation fires the listener on failure as well 
+		//the legacy implementation fires the listener on failure as well
 		Assert.assertEquals( 1, ( (LegacyPostCommitInsertEventListener) postCommitInsertEventListener ).fired );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/ListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/ListenerTest.java
index d2511d1f3d1f..d2d067241d30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/ListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/ListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java
index c07e30a23b53..79802e5f83d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.events;
 
@@ -35,7 +33,7 @@
 
 /**
  * Test to ensure that the existing post commit behavior when using plain PostXEventListeners fire on both success and failure.
- * 
+ *
  * @author ShawnClowater
  */
 public class PostCommitListenerTest extends BaseCoreFunctionalTestCase {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/CascadeAllEvictTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/CascadeAllEvictTest.java
index 91837ae57439..9a5510be85dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/CascadeAllEvictTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/CascadeAllEvictTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.eviction;
 
 import org.hibernate.engine.internal.ManagedTypeHelper;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictAndGetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictAndGetTest.java
index febefbc95ece..5dd3956e5575 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictAndGetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictAndGetTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.eviction;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java
index 49e1bd0ed964..d45d0b757ada 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.eviction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java
index 28540b241462..362ab2db7241 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.eviction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/Group.java
index 532d40ce0ed9..b9dc531c2f5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Group.java 4746 2004-11-11 20:57:28Z steveebersole $
 package org.hibernate.orm.test.exception;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
index 88c11a78cdc7..81a6cec0e66e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exception;
 
@@ -151,7 +149,7 @@ public void testNotNullConstraint() {
 	private void releaseStatement(Session session, PreparedStatement ps) {
 		if ( ps != null ) {
 			try {
-                ((SessionImplementor) session).getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( ps );
+				((SessionImplementor) session).getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( ps );
 			}
 			catch ( Throwable ignore ) {
 				// ignore...
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/User.java
index 550106263d83..12e02400591f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: User.java 4746 2004-11-11 20:57:28Z steveebersole $
 package org.hibernate.orm.test.exception;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java
index a99088b7f67a..5a8ebfb636fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
@@ -35,4 +33,4 @@ protected BaseExceptionHandlingTest(
 
 	@Override
 	protected void configure(Map properties) {}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
index 719595eedd54..4b8de0395818 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java
index 62cf3c088b0e..eddda01c9ad7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java
index e9aa9d316b4b..bff598f87b78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java
index c5d3a5ddf627..a226f7408e51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java
index 291d1ee07a11..b4e1e19eec8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java
index 587ff4362ad0..1bd6b8fcf296 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java
index ee3708740e5d..1ebcff9911e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
@@ -24,7 +22,6 @@
 import jakarta.persistence.OptimisticLockException;
 import jakarta.persistence.Version;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java
index 36329d4f9147..da3abf6fe08c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java
index 30ab480dcb0e..4202a0640ab4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java
index cc68dc5d8c1d..a4337fd9c6e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java
index 152d4bba1597..e35d00c31bba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.exceptionhandling;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java
index 839459eba209..3fb71c4c1f3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 5011 2004-12-19 22:01:25Z maxcsaucdk $
 package org.hibernate.orm.test.extendshbm;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java
index 932e9e853cd6..c6b0ac5a27fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 5011 2004-12-19 22:01:25Z maxcsaucdk $
 package org.hibernate.orm.test.extendshbm;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java
index 4eb98ebf5db2..5e00affdd333 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ExtendsTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.extendshbm;
 
 import org.hibernate.HibernateException;
@@ -134,4 +130,3 @@ public void testUnionSubclass() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.java
index 4d6720001584..841986bed3b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 5011 2004-12-19 22:01:25Z maxcsaucdk $
 package org.hibernate.orm.test.extendshbm;
 
 
@@ -17,7 +13,7 @@ public class Person {
 	private long id;
 	private String name;
 	private char sex;
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java
index 32b1203168c3..f111c3262b07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java
index f00774ce1512..41701095a443 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.fetch;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java
index 105a5cd0915b..c2c8b7df192f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/OneToOneOwnerByContainedEagerCyclesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/OneToOneOwnerByContainedEagerCyclesTest.java
index d8d4a4ff4da9..48b0b9f14a7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/OneToOneOwnerByContainedEagerCyclesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/OneToOneOwnerByContainedEagerCyclesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java
index 22b199701f1b..c46c0db64f5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetch.runtime.managed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/BatchFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/BatchFetchingTest.java
index 5b637c1669fa..cd7f57d329ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/BatchFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/BatchFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/DirectVsQueryFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/DirectVsQueryFetchingTest.java
index 0789962a4def..934b845e3015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/DirectVsQueryFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/DirectVsQueryFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeJoinTest.java
index 036522a9fcb1..c6101526769b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
@@ -121,6 +119,6 @@ public static class Employee {
 		private Department department;
 
 		//Getters and setters omitted for brevity
-		
+
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSelectTest.java
index 69551aa6f594..3c5b0093e380 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
@@ -127,7 +125,7 @@ public static class Employee {
 		private Department department;
 
 		//Getters and setters omitted for brevity
-		
+
 	}
 	//end::fetching-strategies-fetch-mode-select-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSubselectTest.java
index 9edb73a7c9ec..d87e7fb1abc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchModeSubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
@@ -139,6 +137,6 @@ public static class Employee {
 		private Department department;
 
 		//Getters and setters omitted for brevity
-		
+
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchingTest.java
index e6e633ebbe06..34e79889706e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/FetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphFetchingTest.java
index c61d69a71d0d..cf68ab2778d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
@@ -21,7 +19,6 @@
 import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.NamedSubgraph;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.QueryHint;
 
 import org.hibernate.annotations.ColumnTransformer;
 import org.hibernate.annotations.NaturalId;
@@ -36,7 +33,6 @@
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphParsingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphParsingTest.java
index d80f99133bac..33ddac2e51a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphParsingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphParsingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
@@ -52,7 +50,7 @@ protected Class[] getAnnotatedClasses() {
 				Ticket.class
 		};
 	}
-	
+
 	@Test
 	public void testParsingExample1() {
 		EntityManager entityManager = getOrCreateEntityManager();
@@ -63,10 +61,10 @@ public void testParsingExample1() {
 				entityManager
 		);
 		//end::fetching-strategies-dynamic-fetching-entity-graph-parsing-example-1[]
-		
+
 		Assert.assertNotNull(graph);
 	}
-	
+
 	@Test
 	public void testParsingExample2() {
 		EntityManager entityManager = getOrCreateEntityManager();
@@ -77,7 +75,7 @@ public void testParsingExample2() {
 				entityManager
 		);
 		//end::fetching-strategies-dynamic-fetching-entity-graph-parsing-example-2[]
-		
+
 		Assert.assertNotNull(graph);
 	}
 
@@ -108,7 +106,7 @@ public void testEntityKeyParsing() {
 
 		Assert.assertNotNull(graph);
 	}
-	
+
 	@Test
 	public void testMergingExample() {
 		EntityManager entityManager = getOrCreateEntityManager();
@@ -116,27 +114,27 @@ public void testMergingExample() {
 		final EntityGraph a = GraphParser.parse(
 				Project.class, "employees(username)", entityManager
 		);
-	
+
 		final EntityGraph b = GraphParser.parse(
 				Project.class, "employees(password, accessLevel)", entityManager
 		);
-	
+
 		final EntityGraph c = GraphParser.parse(
 				Project.class, "employees(department(employees(username)))", entityManager
 		);
-		
+
 		final EntityGraph all = EntityGraphs.merge(entityManager, Project.class, a, b, c);
 		//end::fetching-strategies-dynamic-fetching-entity-graph-merging-example[]
-		
+
 		final EntityGraph expected = GraphParser.parse(
 				Project.class,
 				"employees(username, password, accessLevel, department(employees(username)))",
 				entityManager
 		);
-		
+
 		Assert.assertTrue(EntityGraphs.areEqual(expected, all));
 	}
-	
+
 	@Test
 	public void testFindExample() {
 		doInJPA(this::entityManagerFactory, entityManager -> {
@@ -154,20 +152,20 @@ public void testFindExample() {
 			//end::fetching-strategies-dynamic-fetching-entity-graph-apply-example-find[]
 		});
 	}
-	
+
 	@Test
 	public void testQueryExample() {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::fetching-strategies-dynamic-fetching-entity-graph-apply-example-query[]
 			final String graphString = "username, accessLevel";
 			final String queryString = "select e from Employee e where e.id = 1";
-			
+
 			final EntityGraph graph = GraphParser.parse(
 					Employee.class,
 					graphString,
 					entityManager
 			);
-			
+
 			TypedQuery query1 = entityManager.createQuery(queryString, Employee.class);
 			query1.setHint(
 					GraphSemantic.FETCH.getJakartaHintName(),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/LazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/LazyCollectionTest.java
index 278ccbf957c0..c6783b18ee33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/LazyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/LazyCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/ProfileFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/ProfileFetchingTest.java
index 54504eac35cd..a13e97182b37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/ProfileFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetching/ProfileFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java
index d9060b5a9df8..7c35c1913abc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchmode.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java
index 11a4dc56681a..ac6ca2ff5fb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchmode.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java
index fb803b54d606..c2adf644cd07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchmode.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java
index 3cad2916c515..cde2ec087221 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchmode.toone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity2Test.java
index 650d31fcc9cd..591a87628e12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.fetchmode.toone;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity3Test.java
index 73ae8251cbcc..a4683ac95f83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularity3Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.fetchmode.toone;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularityTest.java
index 47126c8e3799..094e03118a28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/ManyToOneWithCircularityTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.fetchmode.toone;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java
index 703b443477ed..4b8429b1adac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles;
 
@@ -16,8 +14,6 @@
 import jakarta.persistence.ManyToMany;
 
 import org.hibernate.LazyInitializationException;
-import org.hibernate.Session;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
@@ -25,7 +21,6 @@
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.hibernate.cfg.AvailableSettings.DEFAULT_LIST_SEMANTICS;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java
index 15d8a629fc6b..0ac0cc3a9a6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.ManyToOne;
 
 import org.hibernate.LazyInitializationException;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java
index 412d0dc9950d..f682cc1b821c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java
index ffb8d19fad7b..9429c17ab272 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java
index 96bcfe4941b3..22c4e40572e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java
index 67dcbc4d8d65..9846ad6a2a0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java
index 0168f9f48d4f..a4d94d3dcf1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 
@@ -134,8 +132,8 @@ public void testNormalLoading() {
 									assertFalse( Hibernate.isInitialized( section.getCourse() ) );
 									assertFalse( Hibernate.isInitialized( section.getEnrollments() ) );
 									assertFalse( Hibernate.isInitialized( section.getCourse()
-																				  .getCode()
-																				  .getDepartment() ) );
+																				.getCode()
+																				.getDepartment() ) );
 									assertTrue( Hibernate.isInitialized( section.getCourse() ) );
 									assertEquals( 1, sessionFactory().getStatistics().getEntityFetchCount() );
 								}
@@ -160,8 +158,8 @@ public void testNormalCriteria() {
 									assertFalse( Hibernate.isInitialized( section.getCourse() ) );
 									assertFalse( Hibernate.isInitialized( section.getEnrollments() ) );
 									assertFalse( Hibernate.isInitialized( section.getCourse()
-																				  .getCode()
-																				  .getDepartment() ) );
+																				.getCode()
+																				.getDepartment() ) );
 									assertTrue( Hibernate.isInitialized( section.getCourse() ) );
 									assertEquals( 1, sessionFactory().getStatistics().getEntityFetchCount() );
 								}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java
index d290d5c64314..85ae75e24035 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java
index 874763b8c31c..a498a3d22e38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join.selfReferencing;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java
index 6011793edfa6..527432a5882a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchprofiles.join.selfReferencing;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java
index be19a96ae07a..bdb7521ed717 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchstrategyhelper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyDeterminationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyDeterminationTests.java
index 831eb5e9d255..b0572162befe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyDeterminationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyDeterminationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchstrategyhelper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java
index 6e3f4e7bb862..5cadf0ffb89f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.fetchstrategyhelper;
 
@@ -32,8 +30,8 @@
  * @author Gail Badner
  */
 public class FetchStrategyHelperTest extends BaseCoreFunctionalTestCase {
-	
-	
+
+
 	@Test
 	public void testManyToOneDefaultFetch() {
 		final AssociationType associationType = determineAssociationType( AnEntity.class, "otherEntityDefault" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/AbstractStatefulStatelessFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/AbstractStatefulStatelessFilterTest.java
index 0360a6ebeb47..1aa03fa62fdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/AbstractStatefulStatelessFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/AbstractStatefulStatelessFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Category.java
index 02a53deda1de..696c06e8da04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Category.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Category.java 6507 2005-04-25 16:57:32Z steveebersole $
 package org.hibernate.orm.test.filter;
 import java.util.Date;
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java
index 74b73a188fc0..9b953a921d38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
@@ -71,7 +69,7 @@ void setUP() {
 			student2.setAge( 27 );
 			student2.setAddress( new Address( "London", "Oxford St" ) );
 			session.persist( student2 );
-	   });
+	});
 	}
 
 	@AfterEach
@@ -108,7 +106,7 @@ void testSubquery(BiConsumer {
 			session.enableFilter( "statusFilter" ).setParameter( "status", "deleted" );
@@ -133,7 +131,7 @@ void testSubquery(BiConsumer list = session.createQuery( query ).getResultList();
 
 			assertThat( list.size(), is( 0 ) );
-	   	});
+		});
 	}
 
 	@ParameterizedTest
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Department.java
index 0f8b1928b290..efbe263219b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Department.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Department.java 4448 2004-08-28 02:29:05Z steveebersole $
 package org.hibernate.orm.test.filter;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
index e779fe4925b1..715de81975c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
@@ -32,7 +30,6 @@
 import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.transform.ResultTransformer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -106,7 +103,7 @@ public void testSqlSyntaxOfFiltersWithUnions() {
 	@Test
 	public void testSecondLevelCachedCollectionsFiltering() {
 
-        CollectionPersister persister = sessionFactory().getRuntimeMetamodels()
+		CollectionPersister persister = sessionFactory().getRuntimeMetamodels()
 				.getMappingMetamodel()
 				.getCollectionDescriptor(Salesperson.class.getName() + ".orders");
 		CollectionDataAccess cache = persister.getCacheAccessStrategy();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java
index 3f7fd308bc62..7540c470b6c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterParameterTests.java
index 60fb8f35fbc2..4a964583324e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
@@ -309,9 +307,9 @@ public void dropTestData() {
 	@Entity( name = "EntityOne" )
 	@Table( name = "EntityOne" )
 	public static class EntityOne {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Column( name = "yes_no" )
 		@JdbcTypeCode( Types.CHAR )
@@ -364,9 +362,9 @@ public void setYesNo(boolean yesNo) {
 	@Entity( name = "EntityTwo" )
 	@Table( name = "EntityTwo" )
 	public static class EntityTwo {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Column( name = "zero_one" )
 		@JdbcTypeCode( Types.TINYINT )
@@ -412,9 +410,9 @@ public void setZeroOne(boolean zeroOne) {
 	@Entity( name = "EntityThree" )
 	@Table( name = "EntityThree" )
 	public static class EntityThree {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Column( name = "mismatch" )
 		@JdbcTypeCode( Types.TINYINT )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java
index 372b035c1f5c..8ebac1cf6533 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWithILikeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWithILikeTest.java
index e8718b4281f7..0357ff113a70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWithILikeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWithILikeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.filter;
 
 import org.hibernate.annotations.Filter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/LineItem.java
index f23725e5e874..02b7fb35d5e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/LineItem.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: LineItem.java 4046 2004-07-20 04:07:40Z steveebersole $
 package org.hibernate.orm.test.filter;
 
 
 /**
  * Implementation of LineItem.
- * 
+ *
  * @author Steve
  */
 public class LineItem {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java
index 18c880c3b2bb..a7db695ee4de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
@@ -20,7 +18,6 @@
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
-import org.hibernate.internal.util.collections.CollectionHelper;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java
index 9c35aa704dbf..b10c92936635 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter;
 
@@ -90,8 +88,8 @@ void testForIssue(BiConsumer query = session.createQuery( "select a.id from ArticleRevision as a " +
-															 "left join a.articleTradings as t " +
-															 "with ( (t.partyId = :p_0)  and  (t.classifier = :p_1) )", Long.class );
+															"left join a.articleTradings as t " +
+															"with ( (t.partyId = :p_0)  and  (t.classifier = :p_1) )", Long.class );
 			query.setParameter( "p_0", 1L );
 			query.setParameter( "p_1", "no_classification" );
 			final List list = query.getResultList();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Order.java
index ec803a0ac002..61a96f82083c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Order.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Order.java 4222 2004-08-10 05:19:46Z steveebersole $
 package org.hibernate.orm.test.filter;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Product.java
index d9d2def74f1d..590b5a2fc909 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Product.java 6507 2005-04-25 16:57:32Z steveebersole $
 package org.hibernate.orm.test.filter;
 import java.util.Date;
 import java.util.HashSet;
@@ -87,7 +83,7 @@ public double getWeightPounds() {
 	public void setWeightPounds(double weightPounds) {
 		this.weightPounds = weightPounds;
 	}
-	
+
 	public Set getCategories() {
 		return categories;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java
index 71e6e4fb07c6..f830f934320d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/Salesperson.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Salesperson.java 4448 2004-08-28 02:29:05Z steveebersole $
 package org.hibernate.orm.test.filter;
 import java.util.Date;
 import java.util.HashSet;
@@ -13,7 +9,7 @@
 
 /**
  * Implementation of Salesperson.
- * 
+ *
  * @author Steve
  */
 public class Salesperson {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java
index 5f1bd9f9acd3..9dbd2ccb3fca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java
index 9a23d0ab45bf..c9a2de65ab8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java
index 41b5b5c5ddf6..308a93872a48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java
index d0f8881341c6..d98ebc8e56e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java
index 4b743a17944d..f4c618b6bb40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java
index b0d8b74a7dd9..56cd61208073 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/SecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/SecondaryTableTest.java
index 522e57fdfc6f..2f8607b843a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/SecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/SecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.secondarytable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java
index b31c7869bf65..987324648843 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.secondarytable;
 
@@ -27,24 +25,24 @@
 @Filter(name="ageFilter", condition="{u}.AGE < :age AND {s}.LOCKED_OUT <> 1",
 				aliases={@SqlFragmentAlias(alias="u", table="T_USER"), @SqlFragmentAlias(alias="s", table="SECURITY_USER")})
 public class User {
-	
+
 	@Id
 	@GeneratedValue
 	@Column(name="USER_ID")
 	private int id;
-	
+
 	@Column(name="EMAIL_ADDRESS")
 	private String emailAddress;
-	
+
 	@Column(name="AGE")
 	private int age;
-	
+
 	@Column(name="SECURITY_USERNAME", table="SECURITY_USER")
 	private String username;
-	
+
 	@Column(name="SECURITY_PASSWORD", table="SECURITY_USER")
 	private String password;
-	
+
 	@Column(name="LOCKED_OUT", table="SECURITY_USER")
 	@Convert( converter = NumericBooleanConverter.class )
 	private boolean lockedOut;
@@ -96,5 +94,5 @@ public boolean isLockedOut() {
 	public void setLockedOut(boolean lockedOut) {
 		this.lockedOut = lockedOut;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java
index 37d476679dbf..6277753dc042 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java
index 210136e823b1..fd7808115e3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java
index 5b14cc6499f8..21ad681ca34f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java
index 6863ee38f517..573d537c0a34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.MappedSuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/SubClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/SubClassTest.java
index 9cedb668d6b5..bed60b9243ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/SubClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/SubClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java
index e89f180ea26e..50db10c57c5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.joined;
 
@@ -28,7 +26,7 @@ public class Animal {
 	@GeneratedValue
 	@Column(name="ANIMAL_ID")
 	private Integer id;
-	
+
 	@Column(name="ANIMAL_NAME")
 	private String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java
index f4019a3d6bc8..f99e401483c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.joined;
 
@@ -27,9 +25,9 @@ public class Club {
 	@GeneratedValue
 	@Column(name="CLUB_ID")
 	private int id;
-	
+
 	private String name;
-	
+
 	@OneToMany(mappedBy="club")
 	@Filter(name="iqMin", condition="{h}.HUMAN_IQ >= :min", aliases={@SqlFragmentAlias(alias="h", entity=Human.class)})
 	@Filter(name="pregnantMembers", condition="{m}.IS_PREGNANT=1", aliases={@SqlFragmentAlias(alias="m", table="ZOOLOGY_MAMMAL")})
@@ -58,6 +56,6 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java
index 1b101a2b3a05..695588aa5f07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.joined;
 
@@ -26,10 +24,10 @@
 public class Human extends Mammal {
 	@Column(name="HUMAN_IQ")
 	private int iq;
-	
+
 	@ManyToOne
 	private Club club;
-	
+
 	public int getIq() {
 		return iq;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/JoinedSubClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/JoinedSubClassTest.java
index f920f1775576..6b6c08f30ac1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/JoinedSubClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/JoinedSubClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java
index 877240827bd1..bd28d98a6b1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.joined;
 
@@ -20,7 +18,7 @@
 @FilterDef(name="pregnantOnly")
 @Filter(name="pregnantOnly", condition="IS_PREGNANT = 1")
 public class Mammal extends Animal{
-	
+
 	@Column(name="IS_PREGNANT")
 	@Convert( converter = NumericBooleanConverter.class )
 	private boolean isPregnant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Animal.java
index 66bd44f64b92..c0ac999d1de8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Animal.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.filter.subclass.joined2;
 
 import jakarta.persistence.Column;
@@ -16,10 +20,10 @@
 public class Animal {
 	@Id
 	@Column(name = "id_animal")
-    private int id;
+	private int id;
 
-    private String name;
+	private String name;
 
 	@Column(name = "id_company")
-    private long company;
-}
\ No newline at end of file
+	private long company;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Dog.java
index b27972351efc..cfd09724e2e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Dog.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.filter.subclass.joined2;
 
 import jakarta.persistence.Entity;
@@ -10,7 +14,7 @@
 @Table(name = "dogs")
 @PrimaryKeyJoinColumn(name = "id_dog", referencedColumnName = "id_animal")
 public class Dog extends Animal {
-    private String breed;
+	private String breed;
 	@ManyToOne @JoinColumn(name = "id_owner")
-    private Owner owner;
-}
\ No newline at end of file
+	private Owner owner;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java
index 70a8905890ac..d6a268610233 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.filter.subclass.joined2;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Owner.java
index ea375bcf18ac..f857095e9901 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/Owner.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.filter.subclass.joined2;
 
 import jakarta.persistence.Column;
@@ -27,4 +31,4 @@ public class Owner {
 
 	@Column(name = "id_company")
 	private long company;
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java
index 4b93912c487c..f3e3ac58c921 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
@@ -28,7 +26,7 @@ public class Animal {
 	@GeneratedValue
 	@Column(name="ANIMAL_ID")
 	private Integer id;
-	
+
 	@Column(name="ANIMAL_NAME")
 	private String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java
index 533ea85acc6d..e03cf072cb6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
@@ -23,7 +21,7 @@
 public class Human extends Mammal {
 	@Column(name="HUMAN_IQ")
 	private int iq;
-	
+
 	public int getIq() {
 		return iq;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java
index 3bc8bcd5e5e9..8900b60645e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
@@ -13,13 +11,12 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
 
 @Entity
 @FilterDef(name="pregnantOnly")
 @Filter(name="pregnantOnly", condition="IS_PREGNANT = 1")
 public class Mammal extends Animal {
-	
+
 	@Column(name="IS_PREGNANT")
 	@Convert( converter = NumericBooleanConverter.class )
 	private boolean isPregnant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableDefaultSchemaFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableDefaultSchemaFilterTest.java
index c3638eac06db..92d8d2368f3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableDefaultSchemaFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableDefaultSchemaFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
@@ -22,12 +20,10 @@
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java
index aa7a87888b5d..35a30f21973d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableTest.java
index 07e3018f6997..20748ad0a96c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.singletable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java
index 18ef12b45dd2..496fa81b5aaa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.tableperclass;
 
@@ -28,7 +26,7 @@ public class Animal {
 	@GeneratedValue
 	@Column(name="ANIMAL_ID")
 	private Integer id;
-	
+
 	@Column(name="ANIMAL_NAME")
 	private String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java
index dc3ed034b1d3..3fd28edcbd05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.tableperclass;
 
@@ -25,7 +23,7 @@
 public class Human extends Mammal {
 	@Column(name="HUMAN_IQ")
 	private int iq;
-	
+
 	public int getIq() {
 		return iq;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java
index 9b4d4b3f05e1..130db5b94b6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.tableperclass;
 
@@ -20,7 +18,7 @@
 @FilterDef(name="pregnantOnly")
 @Filter(name="pregnantOnly", condition="IS_PREGNANT = 1")
 public class Mammal extends Animal{
-	
+
 	@Column(name="IS_PREGNANT")
 	@Convert( converter = NumericBooleanConverter.class )
 	private boolean isPregnant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/TablePerClassTest.java
index 6f6d3eaeeea4..86619d66c7d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/TablePerClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/TablePerClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.filter.subclass.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
index 2f8a87bafbd3..1a48e002bb5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -34,128 +32,128 @@ public class AlwaysFlushTest extends BaseEntityManagerFunctionalTestCase {
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] {
 			Person.class,
-            Phone.class,
+			Phone.class,
 			Advertisement.class
 		};
 	}
 
-    @Test
-    public void testFlushSQL() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery("delete from Person").executeUpdate();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.info("testFlushSQL");
-            //tag::flushing-always-flush-sql-example[]
-            Person person = new Person("John Doe");
-            entityManager.persist(person);
+	@Test
+	public void testFlushSQL() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery("delete from Person").executeUpdate();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.info("testFlushSQL");
+			//tag::flushing-always-flush-sql-example[]
+			Person person = new Person("John Doe");
+			entityManager.persist(person);
+
+			Session session = entityManager.unwrap(Session.class);
+			assertTrue(((Number) session
+					.createNativeQuery("select count(*) from Person", Integer.class)
+					.setHibernateFlushMode(FlushMode.ALWAYS)
+					.uniqueResult()).intValue() == 1);
+			//end::flushing-always-flush-sql-example[]
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		@OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
+		private List phones = new ArrayList<>();
+
+		public Person() {
+		}
+
+		public Person(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public List getPhones() {
+			return phones;
+		}
+
+		public void addPhone(Phone phone) {
+			phones.add(phone);
+			phone.setPerson(this);
+		}
+	}
+
+	@Entity(name = "Phone")
+	public static class Phone {
+
+		@Id
+		@GeneratedValue
+		private Long id;
 
-            Session session = entityManager.unwrap(Session.class);
-            assertTrue(((Number) session
-                    .createNativeQuery("select count(*) from Person", Integer.class)
-                    .setHibernateFlushMode(FlushMode.ALWAYS)
-                    .uniqueResult()).intValue() == 1);
-            //end::flushing-always-flush-sql-example[]
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String name;
-
-        @OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
-        private List phones = new ArrayList<>();
-
-        public Person() {
-        }
-
-        public Person(String name) {
-            this.name = name;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List getPhones() {
-            return phones;
-        }
-
-        public void addPhone(Phone phone) {
-            phones.add(phone);
-            phone.setPerson(this);
-        }
-    }
-
-    @Entity(name = "Phone")
-    public static class Phone {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @ManyToOne
-        private Person person;
-
-        @Column(name = "`number`")
-        private String number;
-
-        public Phone() {
-        }
-
-        public Phone(String number) {
-            this.number = number;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getNumber() {
-            return number;
-        }
-
-        public Person getPerson() {
-            return person;
-        }
-
-        public void setPerson(Person person) {
-            this.person = person;
-        }
-    }
-
-    @Entity(name = "Advertisement")
-    public static class Advertisement {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String title;
-
-        public Long getId() {
-            return id;
-        }
+		@ManyToOne
+		private Person person;
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		@Column(name = "`number`")
+		private String number;
 
-        public String getTitle() {
-            return title;
-        }
+		public Phone() {
+		}
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
-    }
+		public Phone(String number) {
+			this.number = number;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getNumber() {
+			return number;
+		}
+
+		public Person getPerson() {
+			return person;
+		}
+
+		public void setPerson(Person person) {
+			this.person = person;
+		}
+	}
+
+	@Entity(name = "Advertisement")
+	public static class Advertisement {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String title;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getTitle() {
+			return title;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java
index 4cdc0f5eb69c..97ae6960f688 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushBeforeLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushBeforeLoadTest.java
index 9ea0ee51d5a8..bc125f1b17af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushBeforeLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushBeforeLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushTest.java
index 05d6dc96267b..8e9ea341a7d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java
index 8c67c8c40566..dd02a8b64c04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java
index 7576b25a64ae..1fe636804db0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/CommitFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/CommitFlushTest.java
index b9db5a9eb0a4..e63cbd5474a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/CommitFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/CommitFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -30,150 +28,150 @@
  */
 public class CommitFlushTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-            Person.class,
-            Phone.class,
-            Advertisement.class,
-        };
-    }
-
-    @Test
-    public void testFlushJPQL() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.info("testFlushJPQL");
-            //tag::flushing-commit-flush-jpql-example[]
-            Person person = new Person("John Doe");
-            entityManager.persist(person);
-
-            entityManager.createQuery("select p from Advertisement p")
-                .setFlushMode(FlushModeType.COMMIT)
-                .getResultList();
-
-            entityManager.createQuery("select p from Person p")
-                .setFlushMode(FlushModeType.COMMIT)
-                .getResultList();
-            //end::flushing-commit-flush-jpql-example[]
-        });
-    }
-
-    @Test
-    public void testFlushSQL() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery("delete from Person")
-                .executeUpdate();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.info("testFlushSQL");
-            //tag::flushing-commit-flush-sql-example[]
-            Person person = new Person("John Doe");
-            entityManager.persist(person);
-
-            assertTrue(((Number) entityManager
-                .createNativeQuery("select count(*) from Person")
-                .getSingleResult()).intValue() == 1);
-            //end::flushing-commit-flush-sql-example[]
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String name;
-
-        @OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
-        private List phones = new ArrayList<>();
-
-        public Person() {
-        }
-
-        public Person(String name) {
-            this.name = name;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List getPhones() {
-            return phones;
-        }
-
-        public void addPhone(Phone phone) {
-            phones.add(phone);
-            phone.setPerson(this);
-        }
-    }
-
-    @Entity(name = "Phone")
-    public static class Phone {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @ManyToOne
-        private Person person;
-
-        @Column(name = "`number`")
-        private String number;
-
-        public Phone() {
-        }
-
-        public Phone(String number) {
-            this.number = number;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getNumber() {
-            return number;
-        }
-
-        public Person getPerson() {
-            return person;
-        }
-
-        public void setPerson(Person person) {
-            this.person = person;
-        }
-    }
-
-    @Entity(name = "Advertisement")
-    public static class Advertisement {
-
-        @Id
-        @GeneratedValue
-        private Long id;
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+			Person.class,
+			Phone.class,
+			Advertisement.class,
+		};
+	}
+
+	@Test
+	public void testFlushJPQL() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.info("testFlushJPQL");
+			//tag::flushing-commit-flush-jpql-example[]
+			Person person = new Person("John Doe");
+			entityManager.persist(person);
+
+			entityManager.createQuery("select p from Advertisement p")
+				.setFlushMode(FlushModeType.COMMIT)
+				.getResultList();
+
+			entityManager.createQuery("select p from Person p")
+				.setFlushMode(FlushModeType.COMMIT)
+				.getResultList();
+			//end::flushing-commit-flush-jpql-example[]
+		});
+	}
+
+	@Test
+	public void testFlushSQL() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery("delete from Person")
+				.executeUpdate();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.info("testFlushSQL");
+			//tag::flushing-commit-flush-sql-example[]
+			Person person = new Person("John Doe");
+			entityManager.persist(person);
+
+			assertTrue(((Number) entityManager
+				.createNativeQuery("select count(*) from Person")
+				.getSingleResult()).intValue() == 1);
+			//end::flushing-commit-flush-sql-example[]
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		@OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
+		private List phones = new ArrayList<>();
+
+		public Person() {
+		}
+
+		public Person(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public List getPhones() {
+			return phones;
+		}
+
+		public void addPhone(Phone phone) {
+			phones.add(phone);
+			phone.setPerson(this);
+		}
+	}
+
+	@Entity(name = "Phone")
+	public static class Phone {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@ManyToOne
+		private Person person;
+
+		@Column(name = "`number`")
+		private String number;
+
+		public Phone() {
+		}
+
+		public Phone(String number) {
+			this.number = number;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getNumber() {
+			return number;
+		}
+
+		public Person getPerson() {
+			return person;
+		}
+
+		public void setPerson(Person person) {
+			this.person = person;
+		}
+	}
+
+	@Entity(name = "Advertisement")
+	public static class Advertisement {
+
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        private String title;
-
-        public Long getId() {
-            return id;
-        }
+		private String title;
+
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getTitle() {
-            return title;
-        }
+		public String getTitle() {
+			return title;
+		}
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
-    }
+		public void setTitle(String title) {
+			this.title = title;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/FlushOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/FlushOrderTest.java
index b80ab648794b..ed452a533479 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/FlushOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/FlushOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -20,66 +18,66 @@
  */
 public class FlushOrderTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                Person.class
-        };
-    }
-
-    @Test
-    public void testOrder() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery("delete from Person").executeUpdate();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Person person = new Person("John Doe");
-            person.id = 1L;
-            entityManager.persist(person);
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.info("testFlushSQL");
-            //tag::flushing-order-example[]
-            Person person = entityManager.find(Person.class, 1L);
-            entityManager.remove(person);
-
-            Person newPerson = new Person();
-            newPerson.setId(2L);
-            newPerson.setName("John Doe");
-            entityManager.persist(newPerson);
-            //end::flushing-order-example[]
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        private Long id;
-
-        private String name;
-
-        public Person() {
-        }
-
-        public Person(String name) {
-            this.name = name;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				Person.class
+		};
+	}
+
+	@Test
+	public void testOrder() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery("delete from Person").executeUpdate();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Person person = new Person("John Doe");
+			person.id = 1L;
+			entityManager.persist(person);
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.info("testFlushSQL");
+			//tag::flushing-order-example[]
+			Person person = entityManager.find(Person.class, 1L);
+			entityManager.remove(person);
+
+			Person newPerson = new Person();
+			newPerson.setId(2L);
+			newPerson.setName("John Doe");
+			entityManager.persist(newPerson);
+			//end::flushing-order-example[]
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		private Long id;
+
+		private String name;
+
+		public Person() {
+		}
+
+		public Person(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/HibernateAutoFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/HibernateAutoFlushTest.java
index 9e8a92ff875b..0486c7abc739 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/HibernateAutoFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/HibernateAutoFlushTest.java
@@ -1,15 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.FlushModeType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
@@ -17,7 +12,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/LazyCollectionInitalizationPreUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/LazyCollectionInitalizationPreUpdateTest.java
index 841088b89565..32e5ce12d11d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/LazyCollectionInitalizationPreUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/LazyCollectionInitalizationPreUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/ManualFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/ManualFlushTest.java
index 466d2c562fd5..447bc3afcbbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/ManualFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/ManualFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -30,137 +28,137 @@
  */
 public class ManualFlushTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                Person.class,
-                Phone.class,
-                Advertisement.class,
-        };
-    }
-
-    @Test
-    public void testFlushSQL() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery("delete from Person").executeUpdate();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.info("testFlushSQL");
-            //tag::flushing-manual-flush-example[]
-            Person person = new Person("John Doe");
-            entityManager.persist(person);
-
-            Session session = entityManager.unwrap(Session.class);
-            session.setHibernateFlushMode(FlushMode.MANUAL);
-
-            assertTrue(((Number) entityManager
-                .createQuery("select count(id) from Person")
-                .getSingleResult()).intValue() == 0);
-
-            assertTrue(((Number) session
-                .createNativeQuery("select count(*) from Person", Integer.class)
-                .uniqueResult()).intValue() == 0);
-            //end::flushing-manual-flush-example[]
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String name;
-
-        @OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
-        private List phones = new ArrayList<>();
-
-        public Person() {
-        }
-
-        public Person(String name) {
-            this.name = name;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public List getPhones() {
-            return phones;
-        }
-
-        public void addPhone(Phone phone) {
-            phones.add(phone);
-            phone.setPerson(this);
-        }
-    }
-
-    @Entity(name = "Phone")
-    public static class Phone {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @ManyToOne
-        private Person person;
-
-        @Column(name = "`number`")
-        private String number;
-
-        public Phone() {
-        }
-
-        public Phone(String number) {
-            this.number = number;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getNumber() {
-            return number;
-        }
-
-        public Person getPerson() {
-            return person;
-        }
-
-        public void setPerson(Person person) {
-            this.person = person;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				Person.class,
+				Phone.class,
+				Advertisement.class,
+		};
+	}
+
+	@Test
+	public void testFlushSQL() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery("delete from Person").executeUpdate();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.info("testFlushSQL");
+			//tag::flushing-manual-flush-example[]
+			Person person = new Person("John Doe");
+			entityManager.persist(person);
+
+			Session session = entityManager.unwrap(Session.class);
+			session.setHibernateFlushMode(FlushMode.MANUAL);
+
+			assertTrue(((Number) entityManager
+				.createQuery("select count(id) from Person")
+				.getSingleResult()).intValue() == 0);
+
+			assertTrue(((Number) session
+				.createNativeQuery("select count(*) from Person", Integer.class)
+				.uniqueResult()).intValue() == 0);
+			//end::flushing-manual-flush-example[]
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		@OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
+		private List phones = new ArrayList<>();
+
+		public Person() {
+		}
+
+		public Person(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public List getPhones() {
+			return phones;
+		}
+
+		public void addPhone(Phone phone) {
+			phones.add(phone);
+			phone.setPerson(this);
+		}
+	}
+
+	@Entity(name = "Phone")
+	public static class Phone {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@ManyToOne
+		private Person person;
+
+		@Column(name = "`number`")
+		private String number;
+
+		public Phone() {
+		}
+
+		public Phone(String number) {
+			this.number = number;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getNumber() {
+			return number;
+		}
+
+		public Person getPerson() {
+			return person;
+		}
+
+		public void setPerson(Person person) {
+			this.person = person;
+		}
+	}
 
-    @Entity(name = "Advertisement")
-    public static class Advertisement {
+	@Entity(name = "Advertisement")
+	public static class Advertisement {
 
-        @Id
-        @GeneratedValue
-        private Long id;
+		@Id
+		@GeneratedValue
+		private Long id;
 
-        private String title;
+		private String title;
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getTitle() {
-            return title;
-        }
+		public String getTitle() {
+			return title;
+		}
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
-    }
+		public void setTitle(String title) {
+			this.title = title;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java
index 08ccda163ecb..afd8e7212a8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
index 53836af17331..0389125f4198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java
index a7ce391010d5..479f741e8aee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
index 2af6202a6ca5..e0e538a525b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -26,7 +24,6 @@
 import org.hibernate.event.spi.PreUpdateEventListener;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.internal.SessionImpl;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java
index 7b9218bbdf00..8a2bd151dfff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -19,7 +17,7 @@
 /**
  * Thanks to Jan Hodac and Laurent Almeras for providing test cases for this
  * issue.
- * 
+ *
  * @author Guillaume Smet
  */
 @JiraKey(value = "HHH-7821")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java
index b9cba67f824d..6ef289cb7a8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java
index 4d8550ef1afb..99e6872c6a8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -33,7 +31,7 @@ protected void addSettings(Map settings) {
 		TestingJtaBootstrap.prepare( settings );
 		settings.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "jta" );
 	}
-	
+
 	@Test
 	public void testFlush() throws Exception {
 		Session session = openSession();
@@ -49,7 +47,7 @@ public void testFlush() throws Exception {
 			session.close();
 		}
 	}
-	
+
 	@Test
 	public void testIsConnectedFlush() throws Exception {
 		Session session = openSession();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java
index 7096e63295e4..b3a1e4332ae3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java
index f6250fc543f7..3eb1fef53d02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
@@ -16,7 +14,7 @@
 
 /**
  * Test for issue https://hibernate.atlassian.net/browse/HHH-13663
- * 
+ *
  * @author Luca Domenichini
  */
 @JiraKey(value = "HHH-13663")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java
index 312115dafb50..999bd9f09d4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java
index da7bc1d78bcf..7a6b8eea5308 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys;
 
@@ -20,7 +18,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.mapping.Table;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java
index ec5e49a91295..53c667992468 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java
index 5f0372dfa5e1..e4119329c612 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java
index dbc5ff05acfa..0d1931be5e3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
@@ -130,4 +128,3 @@ public static class ApplicationEvents extends AbstractEventsEntityModel {
 
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java
index f05f6564139e..6a193b3ba22f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java
index 1114f6d0b640..f2ef640ff6f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java
index 15b887321e49..681fb13e01fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.disabled;
 
@@ -27,7 +25,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.mapping.Table;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/A.java
index 6d16596f0f9d..2d58504a1a29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.sorting;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/B.java
index 595431fabf08..3f4866533ee2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.sorting;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
index a2081651be3f..9b0f740c6fda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.foreignkeys.sorting;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedDetail.java
index 0670c6f1745a..787cf9418025 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedDetail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedDetail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.formulajoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java
index ece66758e153..9d0790c4295e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.formulajoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedRoot.java
index 14dc1e06b1a5..85e3419560e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedRoot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.formulajoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Detail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Detail.java
index d2df74aea8c6..047e11553b8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Detail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Detail.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Detail.java 4602 2004-09-26 11:42:47Z oneovthafew $
 package org.hibernate.orm.test.formulajoin;
 import java.io.Serializable;
 
@@ -18,7 +14,7 @@ public class Detail implements Serializable {
 	private int version;
 	private String details;
 	private boolean currentVersion;
-	
+
 	public boolean isCurrentVersion() {
 		return currentVersion;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/FormulaJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/FormulaJoinTest.java
index 0e085d6eb311..6b9ba49a1356 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/FormulaJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/FormulaJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.formulajoin;
 
@@ -58,7 +56,7 @@ public void testFormulaJoin() {
 		s.persist(current);
 		tx.commit();
 		s.close();
-		
+
 		if ( getDialect() instanceof PostgreSQLDialect ) return;
 
 		s = openSession();
@@ -67,7 +65,7 @@ public void testFormulaJoin() {
 		assertEquals( l.size(), 1 );
 		tx.commit();
 		s.close();
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
 		l = s.createQuery("from Root m left join fetch m.detail").list();
@@ -77,14 +75,14 @@ public void testFormulaJoin() {
 		assertTrue( m==m.getDetail().getRoot() );
 		tx.commit();
 		s.close();
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
 		l = s.createQuery("from Root m join fetch m.detail").list();
 		assertEquals( l.size(), 1 );
 		tx.commit();
 		s.close();
-		
+
 		s = openSession();
 		tx = s.beginTransaction();
 		l = s.createQuery("from Detail d join fetch d.currentRoot.root").list();
@@ -109,13 +107,12 @@ public void testFormulaJoin() {
 		tx = s.beginTransaction();
 		l = s.createQuery("from Detail d join fetch d.root m join fetch m.detail").list();
 		assertEquals( l.size(), 2 );
-		
+
 		s.createQuery("delete from Detail").executeUpdate();
 		s.createQuery("delete from Root").executeUpdate();
-		
+
 		tx.commit();
 		s.close();
 
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Root.java
index 3ad92a7a4c0c..cb8f795342dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.formulajoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
index 06f48d3f0966..9ec42b82e21c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAppendTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAppendTest.java
index 43d1d23ba679..e920ee779971 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAppendTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAppendTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConcatTest.java
index 2f02cf5289d2..8e407d3112ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConcatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConcatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorInSelectClauseTest.java
index 1c36651739d7..d717d0022ad7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorInSelectClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorInSelectClauseTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.function.array;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
index f5d22d54c521..109498bf14a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
index 2167a8ed5ad7..22a03141e354 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayFillTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayFillTest.java
index 2b8f097e02a3..72bd09212d48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayFillTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayFillTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayGetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayGetTest.java
index eb292df7e19e..3d0d0fba93f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayGetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayGetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIncludesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIncludesTest.java
index 2093e45bd4f9..8e399b1e0e51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIncludesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIncludesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIntersectsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIntersectsTest.java
index ad9029f1f9c9..32174b535b77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIntersectsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayIntersectsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayLengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayLengthTest.java
index 10d1de10b895..5c505092dc33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayLengthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayLengthTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionTest.java
index 65bac8406609..bc8a7fde8342 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.query.criteria.JpaRoot;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionsTest.java
index 3e387cf23b04..9c319c5fe286 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPositionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPrependTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPrependTest.java
index 7eb6c7822fae..a3e8d5953b8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPrependTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayPrependTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveIndexTest.java
index c1f35580b83c..ee1fb35fbbaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveTest.java
index cfbc037b827c..1d00496e298a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayRemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReplaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReplaceTest.java
index 1214de3dbbfb..ac090f188b14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReplaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReplaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySetTest.java
index 45a620cfb60c..e4494e9f8789 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySliceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySliceTest.java
index ab96b73cb806..bf4abf0a8a78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySliceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySliceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringTest.java
index aa28254da16a..1d65aa254168 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
@@ -26,8 +24,6 @@
 import jakarta.persistence.Tuple;
 import org.assertj.core.api.Assertions;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isOneOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
index f47df76c40de..b5292c707e61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.function.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/EntityWithArrays.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/EntityWithArrays.java
index c03c1e76f3d0..7802485ca40b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/EntityWithArrays.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/EntityWithArrays.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.function.array;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/Label.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/Label.java
index f06de9082b85..8dc6a5071eed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/Label.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/Label.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.function.array;
 
 public enum Label {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
index 10d7d16d36a0..fec6fb0c4eb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java
index 261f2e95e45e..6084724d8013 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.generatedkeys.generated;
 
 import org.h2.tools.TriggerAdapter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/MyEntity.java
index a83286fed485..270deabdc330 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.generated;
 
@@ -14,7 +12,6 @@
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.NaturalId;
 
-import static org.hibernate.generator.EventType.INSERT;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java
index cc3018a7981a..595d37da1366 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java
index f44c3df33344..007c63625ea1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java
index 435f0e56c0d8..efbcfc6369c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.identity;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java
index 0014f4468566..b0143dcc1338 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java
index 566c2b843e6c..4ae56698f0e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.select;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
index a1244a9968fa..da5b96427864 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.select;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/H2Trigger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/H2Trigger.java
index 46c965531724..e3e6770ddbdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/H2Trigger.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/H2Trigger.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.generatedkeys.selectannotated;
 
 import org.h2.tools.TriggerAdapter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/MyEntity.java
index 3509619dec2d..ce62462526e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.selectannotated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
index 5412c247a9b5..9a149c005b07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.generatedkeys.selectannotated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/getclass/HibernateGetClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/getclass/HibernateGetClassTest.java
index a9006a0be8b7..1bc993d7420a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/getclass/HibernateGetClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/getclass/HibernateGetClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.getclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
index 2879adb41a72..13cdc9f99035 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.graph;
 
@@ -69,7 +67,7 @@ private void assertBasicAttributes(List> attrs, String... names
 		else {
 			Assert.assertNotNull( attrs );
 			Assert.assertTrue( names.length <= attrs.size() );
-	
+
 			for ( String name : names ) {
 				AttributeNode node = null;
 				for ( AttributeNode candidate : attrs ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
index 6dfdade91b6e..7e73ad0720fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.graph;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java
index da9cafa65481..cd67b27f7c53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.graph;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java
index 31687236f2f8..1e1e532687e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.graph;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java
index 96f1684bf8d2..eddc84a29c37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.graph;
 
@@ -47,11 +45,11 @@ void testDeterministicStatementWithEntityGraphHavingMultipleAttributes(SessionFa
 		List sqlQueries = statementInspector.getSqlQueries();
 		assertEquals( 1, sqlQueries.size() );
 		assertEquals( "select b1_0.id,a1_0.id,a1_0.name,ca1_0.id,ca1_0.name,ce1_0.id,ce1_0.name,e1_0.id,e1_0.name" +
-					 " from Book b1_0" +
-					 " left join Person a1_0 on a1_0.id=b1_0.author_id" +
-					 " left join Person ca1_0 on ca1_0.id=b1_0.coAuthor_id" +
-					 " left join Person ce1_0 on ce1_0.id=b1_0.coEditor_id" +
-					 " left join Person e1_0 on e1_0.id=b1_0.editor_id", sqlQueries.get(0) );
+					" from Book b1_0" +
+					" left join Person a1_0 on a1_0.id=b1_0.author_id" +
+					" left join Person ca1_0 on ca1_0.id=b1_0.coAuthor_id" +
+					" left join Person ce1_0 on ce1_0.id=b1_0.coEditor_id" +
+					" left join Person e1_0 on e1_0.id=b1_0.editor_id", sqlQueries.get(0) );
 	}
 
 	@Entity(name = "Book")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
index 1d89d8079310..7174cdf73221 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.collectionpk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java
index 95168516d641..c92815fa3dd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.comment;
 
 import java.io.StringReader;
@@ -5,7 +9,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.ReaderInputStream;
 import org.hibernate.mapping.PersistentClass;
@@ -43,6 +46,6 @@ public void testClassComment() {
 			Assert.assertNotNull( table );
 			Assert.assertEquals( "This is class 'Foo' with property 'bar'.", table.getComment() );
 		}
-	}	
-	
+	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java
index 7c9c5fd909b9..c604170d054c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.fk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java
index 48ecad39fb4c..460f1e26f198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java
index 8900b6ddd5f5..edb297238800 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java
index d49d2d9cf522..d329d129f70d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java
index 9e4917b182e8..746b7f255d58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java
index b542add27ceb..534563e9e999 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Animal.java
index 6cf481293d0a..f298b149beab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Animal.java
@@ -1,16 +1,20 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public abstract class Animal {
-    
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-    
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public abstract class Animal {
+
+	private long id;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/AnimalReport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/AnimalReport.java
index 5cf7edf959b3..332b1648501b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/AnimalReport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/AnimalReport.java
@@ -1,34 +1,38 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public class AnimalReport {
-
-	private long id;
-
-	private String name;
-
-	private Animal animal;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Animal getAnimal() {
-		return animal;
-	}
-
-	public void setAnimal(Animal animal) {
-		this.animal = animal;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public class AnimalReport {
+
+	private long id;
+
+	private String name;
+
+	private Animal animal;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Animal getAnimal() {
+		return animal;
+	}
+
+	public void setAnimal(Animal animal) {
+		this.animal = animal;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Cat.java
index a6b91655d409..afa104f767c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Cat.java
@@ -1,14 +1,18 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public class Cat extends Animal {
-
-	private CatName name;
-
-	public CatName getName() {
-		return name;
-	}
-
-	public void setName(CatName name) {
-		this.name = name;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public class Cat extends Animal {
+
+	private CatName name;
+
+	public CatName getName() {
+		return name;
+	}
+
+	public void setName(CatName name) {
+		this.name = name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/CatName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/CatName.java
index e65649bde0a3..1f12c9522461 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/CatName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/CatName.java
@@ -1,24 +1,28 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public class CatName {
-	private long id;
-
-	private String name;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public class CatName {
+	private long id;
+
+	private String name;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Dog.java
index 4a2907476f31..471ca150e54f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/Dog.java
@@ -1,14 +1,18 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public class Dog extends Animal {
-
-	private DogName name;
-
-	public DogName getName() {
-		return name;
-	}
-
-	public void setName(DogName name) {
-		this.name = name;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public class Dog extends Animal {
+
+	private DogName name;
+
+	public DogName getName() {
+		return name;
+	}
+
+	public void setName(DogName name) {
+		this.name = name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/DogName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/DogName.java
index c1db365532bc..3c7732c57e8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/DogName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/DogName.java
@@ -1,24 +1,28 @@
-package org.hibernate.orm.test.hbm.inheritance;
-
-public class DogName {
-	private long id;
-
-	private String name;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-}
\ No newline at end of file
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.inheritance;
+
+public class DogName {
+	private long id;
+
+	private String name;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java
index 7938ba7c7458..5f6ff637dc6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.inheritance;
 
 import org.hibernate.boot.MetadataSources;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Address.java
index 052c00b49dfe..dfcbbd30eb5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.mappingexception;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Employee.java
index 627c021459fa..5079c7226b90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Employee.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.mappingexception;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Person.java
index 063da3f343b9..dd9487abe7b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/Person.java
@@ -1,23 +1,27 @@
-package org.hibernate.orm.test.hbm.mappingexception;
-
-public class Person {
-
-	private long id;
-	private boolean name;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public boolean isName() {
-		return name;
-	}
-
-	public void setName(boolean name) {
-		this.name = name;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hbm.mappingexception;
+
+public class Person {
+
+	private long id;
+	private boolean name;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public boolean isName() {
+		return name;
+	}
+
+	public void setName(boolean name) {
+		this.name = name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java
index 67d3a2f710e7..e752479382da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.mappingexception;
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java
index 0f0defc9c340..c5bc31a50024 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.mappingexception;
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/Bar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/Bar.java
index 2d917781c86e..bf29d80ee5ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/Bar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/Bar.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.query;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/BarPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/BarPK.java
index 6b8a33fed3ea..4c9c516f81f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/BarPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/BarPK.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.query;
 
 public class BarPK {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java
index b3f4a87cf5ee..cad14e74e7cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.query;
 
 import java.io.StringReader;
@@ -19,18 +23,18 @@
 @JiraKey( value = "HHH-10223" )
 @RequiresDialect( H2Dialect.class )
 public class NamedQueryTest extends BaseUnitTestCase {
-	
+
 	private static String NAMED_QUERY_HBM_XML =
 		" "+
-	    "	                   "+
+		"	                   "+
 		"		                                  "+
-	    "			               "+
-	    "		                                           "+
+		"			               "+
+		"		                                           "+
 		"                                 "+
-	    "		                        "+
-	    "			     "+
-	    "			from NamedQueryTest$Bar where foo like :foo "+
-	    "		                                        "+    	
+		"		                        "+
+		"			     "+
+		"			from NamedQueryTest$Bar where foo like :foo "+
+		"		                                        "+
 		"	                                            "+
 		"                                   ";
 
@@ -43,13 +47,13 @@ public void testQuery() {
 		SessionFactory sessionFactory = cfg.buildSessionFactory();
 		sessionFactory.close();
 	}
-	
+
 	public class Bar {
-		private Integer id;		
+		private Integer id;
 		private String foo;
-		public Integer getId() { return id; }		
+		public Integer getId() { return id; }
 		public void setId(Integer id) { this.id = id; }
-		public String getFoo() { return foo; }		
+		public String getFoo() { return foo; }
 		public void setFoo(String foo) { this.foo = foo; }
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java
index 6a2f432f9885..d75336667869 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hbm.query;
 
 import java.io.StringReader;
@@ -26,23 +30,23 @@
 @JiraKey( value = "HHH-10405" )
 @RequiresDialect( H2Dialect.class )
 public class QueryReturnTest extends BaseUnitTestCase {
-	
+
 	private static String QUERY_RETURN_HBM_XML =
 			"          "+
-		    "                                      "+
+			"                                      "+
 			"                                                          "+
-		    "                                           "+
-		    "                                                                   "+
-		    "                                    "+
+			"                                           "+
+			"                                                                   "+
+			"                                    "+
 			"                                                                "+
-		    "                                              "+
-			"                                          "+ 
-		    "                                                  "+
+			"                                          "+
+			"                                                                      "+
-		    "         50]]>             "+
-		    "                                                            "+    	
+			"         50]]>             "+
+			"                                                            "+
 			"                                                    ";
 
 	@Test
@@ -89,7 +93,7 @@ public SessionFactoryImplementor getSessionFactory() {
 	}
 
 	public static class Bar {
-		public Integer id;		
+		public Integer id;
 		public String foo;
 		public Integer getId() { return id; }
 		public void setId(Integer id) { this.id = id; }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/SimpleEntity.java
index 345843532992..92b2b5a9abde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/XmlCacheableNamedQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/XmlCacheableNamedQueryTests.java
index c38fbe620122..ff9775a049fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/XmlCacheableNamedQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/XmlCacheableNamedQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java
index 98365721632f..91153d6f0c7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.uk;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java
index 9b446658997e..0781aaffe31d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java
index a3fd729c7a39..f4b7026dc2dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hbm.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
index e5d2e2be7974..d1f3b7317410 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -1138,7 +1136,7 @@ public void testImplicitJoinsInDifferentClauses() {
 				"implicit-join in select and group-by clauses"
 		);
 
-	 	s = openSession();
+		s = openSession();
 		s.beginTransaction();
 		s.remove( e1 );
 		s.remove( e2 );
@@ -1223,7 +1221,7 @@ public void testImplicitSelectEntityAssociationInShallowQuery() {
 		s.getTransaction().commit();
 		s.close();
 
-	 	s = openSession();
+		s = openSession();
 		s.beginTransaction();
 		int count = determineCount( s.createQuery( "select e.id, e.owner from SimpleAssociatedEntity e" ).list().iterator() );
 		// thing two would be removed from the result due to the inner join
@@ -1231,7 +1229,7 @@ public void testImplicitSelectEntityAssociationInShallowQuery() {
 		s.getTransaction().commit();
 		s.close();
 
-	 	s = openSession();
+		s = openSession();
 		s.beginTransaction();
 		s.remove( e1 );
 		s.remove( e2 );
@@ -1249,25 +1247,25 @@ private int determineCount(Iterator iterator) {
 		return count;
 	}
 
-    @Test
-    @JiraKey( value = "HHH-6714" )
-    public void testUnaryMinus(){
-        Session s = openSession();
-        s.beginTransaction();
-        Human stliu = new Human();
-        stliu.setIntValue( 26 );
+	@Test
+	@JiraKey( value = "HHH-6714" )
+	public void testUnaryMinus(){
+		Session s = openSession();
+		s.beginTransaction();
+		Human stliu = new Human();
+		stliu.setIntValue( 26 );
 
-        s.persist( stliu );
-        s.getTransaction().commit();
-        s.clear();
-        s.beginTransaction();
-        List list =s.createQuery( "from Human h where -(h.intValue - 100)=74" ).list();
-        assertEquals( 1, list.size() );
-        s.getTransaction().commit();
-        s.close();
+		s.persist( stliu );
+		s.getTransaction().commit();
+		s.clear();
+		s.beginTransaction();
+		List list =s.createQuery( "from Human h where -(h.intValue - 100)=74" ).list();
+		assertEquals( 1, list.size() );
+		s.getTransaction().commit();
+		s.close();
 
 
-    }
+	}
 
 	@Test
 	public void testEntityAndOneToOneReturnedByQuery() {
@@ -1738,11 +1736,11 @@ public void testCollectionJoinsInSubselect() {
 				"       select a1 from Animal a1" +
 				"           left join a1.offspring o" +
 				"       where a1.id=1" +
-		        ")";
+				")";
 		s.createQuery( qryString ).list();
 		qryString =
 				"select h.id, h.description" +
-		        " from Human h" +
+				" from Human h" +
 				"      left join h.friends" +
 				" where h in (" +
 				"      select h1" +
@@ -1753,7 +1751,7 @@ public void testCollectionJoinsInSubselect() {
 		s.createQuery( qryString ).list();
 		qryString =
 				"select h.id, h.description" +
-		        " from Human h" +
+				" from Human h" +
 				"      left join h.friends f" +
 				" where f in (" +
 				"      select h1" +
@@ -3561,7 +3559,7 @@ public void testResultTransformerScalarQueries() throws Exception {
 		t = session.beginTransaction();
 
 		try (ScrollableResults sr = session.createQuery( query )
-			     .setResultTransformer(Transformers.aliasToBean(Animal.class)).scroll()) {
+				.setResultTransformer(Transformers.aliasToBean(Animal.class)).scroll()) {
 			assertTrue( "Incorrect result size", sr.next() );
 			assertTrue( "Incorrect return type", sr.get() instanceof Animal );
 			assertFalse( session.contains( sr.get() ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Address.java
index 1a792d86acf4..484b66945781 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Address.java 7996 2005-08-22 14:49:57Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Animal.java
index 8257145e1909..a9fc33e44088 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Animal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Animal.java 7445 2005-07-10 16:51:17Z oneovthafew $
 package org.hibernate.orm.test.hql;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanLiteralEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanLiteralEntity.java
index ed078ec51c3e..014b1fe2bcb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanLiteralEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanLiteralEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanPredicateTest.java
index 4398d4fef5f4..6a524835bb1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BooleanPredicateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import org.hibernate.community.dialect.DerbyDialect;
@@ -12,36 +16,36 @@
 @SessionFactory
 @DomainModel
 public class BooleanPredicateTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inSession(session -> {
-            assertEquals(1, session.createSelectionQuery("select 1 where true is true").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where false is true").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where true is not true").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where false is not true").getResultList().size());
+	@Test void test(SessionFactoryScope scope) {
+		scope.inSession(session -> {
+			assertEquals(1, session.createSelectionQuery("select 1 where true is true").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where false is true").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where true is not true").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where false is not true").getResultList().size());
 
-            assertEquals(0, session.createSelectionQuery("select 1 where true is false").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where false is false").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where true is not false").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where false is not false").getResultList().size());
-        });
-    }
+			assertEquals(0, session.createSelectionQuery("select 1 where true is false").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where false is false").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where true is not false").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where false is not false").getResultList().size());
+		});
+	}
 
-    @SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't accept literal null in case")
-    @Test void testNulls(SessionFactoryScope scope) {
-        scope.inSession(session -> {
-            assertEquals(1, session.createSelectionQuery("select 1 where true is true").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where false is true").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where null is true").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where true is not true").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where false is not true").getResultList().size());
-            assertEquals(1,  session.createSelectionQuery("select 1 where null is not true").getResultList().size());
+	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't accept literal null in case")
+	@Test void testNulls(SessionFactoryScope scope) {
+		scope.inSession(session -> {
+			assertEquals(1, session.createSelectionQuery("select 1 where true is true").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where false is true").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where null is true").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where true is not true").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where false is not true").getResultList().size());
+			assertEquals(1,  session.createSelectionQuery("select 1 where null is not true").getResultList().size());
 
-            assertEquals(0, session.createSelectionQuery("select 1 where true is false").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where false is false").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where null is false").getResultList().size());
-            assertEquals(1, session.createSelectionQuery("select 1 where true is not false").getResultList().size());
-            assertEquals(0, session.createSelectionQuery("select 1 where false is not false").getResultList().size());
-            assertEquals(1,  session.createSelectionQuery("select 1 where null is not false").getResultList().size());
-        });
-    }
+			assertEquals(0, session.createSelectionQuery("select 1 where true is false").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where false is false").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where null is false").getResultList().size());
+			assertEquals(1, session.createSelectionQuery("select 1 where true is not false").getResultList().size());
+			assertEquals(0, session.createSelectionQuery("select 1 where false is not false").getResultList().size());
+			assertEquals(1,  session.createSelectionQuery("select 1 where null is not false").getResultList().size());
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
index fb18ff404370..410d7ec448ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -577,7 +575,7 @@ public void testInsertAcrossMappedJoin() {
 	}
 
 	protected boolean supportsBulkInsertIdGeneration(Class entityClass) {
-        EntityPersister persister = sessionFactory()
+		EntityPersister persister = sessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(entityClass.getName());
 		Generator generator = persister.getGenerator();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CallStatistics.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CallStatistics.java
index b36297040f4a..7df1341fc04b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CallStatistics.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CallStatistics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -12,20 +10,20 @@
 //tag::hql-select-clause-dynamic-instantiation-example[]
 public class CallStatistics {
 
-    private final long count;
-    private final long total;
-    private final int min;
-    private final int max;
-    private final double avg;
+	private final long count;
+	private final long total;
+	private final int min;
+	private final int max;
+	private final double avg;
 
-    public CallStatistics(long count, long total, int min, int max, double avg) {
-        this.count = count;
-        this.total = total;
-        this.min = min;
-        this.max = max;
-        this.avg = avg;
-    }
+	public CallStatistics(long count, long total, int min, int max, double avg) {
+		this.count = count;
+		this.total = total;
+		this.min = min;
+		this.max = max;
+		this.avg = avg;
+	}
 
-    //Getters and setters omitted for brevity
+	//Getters and setters omitted for brevity
 }
 //end::hql-select-clause-dynamic-instantiation-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Car.java
index 885e5a556249..341484f591a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Car.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Car.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Car.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Cat.java
index 574b552faef4..bbc9664a40e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Cat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Cat.java 4476 2004-09-02 02:28:13Z oneovthafew $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Classification.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Classification.java
index 612e42c96621..6b183b30b962 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Classification.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Classification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ClassificationType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ClassificationType.java
index 573fc8067102..a45617d3e990 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ClassificationType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ClassificationType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java
index 27b0f53d3bb1..535f41a8c48d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -13,9 +11,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.TypedQuery;
 
-import org.hibernate.dialect.PostgreSQLDialect;
 
-import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Before;
@@ -31,108 +27,108 @@
 @JiraKey( value = "HHH-10463")
 public class CoalesceTest extends BaseCoreFunctionalTestCase {
 
-    private Person person;
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                Person.class
-        };
-    }
-
-    @Before
-    public void setUp() {
-        doInHibernate( this::sessionFactory, session -> {
-            person = new Person();
-            person.setName("Johannes");
-            person.setSurname("Buehler");
-            session.persist(person);
-        } );
-    }
-
-    @Test
-    public void HHH_10463_TestCoalesce() {
-        doInHibernate( this::sessionFactory, session -> {
-            TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name , p.name) ", Person.class );
-            query.setParameter("name", "Johannes");
-            List resultList = query.getResultList();
-            assertThat(resultList, hasItem(person));
-        } );
-
-    }
-
-    @Test
-    public void HHH_10463_NullInCoalesce() {
-        doInHibernate( this::sessionFactory, session -> {
-            TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name, p.name) ", Person.class );
-            query.setParameter("name", null);
-            List resultList = query.getResultList();
-            assertThat(resultList, hasItem(person));
-        } );
-    }
-
-    @Test
-    public void HHH_10463_NullInCoalesce_PostgreSQL_Workaround() {
-        doInHibernate( this::sessionFactory, session -> {
-            TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(cast( :name as string) , p.name) ", Person.class );
-            query.setParameter("name", null);
-            List resultList = query.getResultList();
-            assertThat(resultList, hasItem(person));
-        } );
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Integer id;
-
-        @Column
-        private String name;
-
-        @Column
-        private String surname;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getSurname() {
-            return surname;
-        }
-
-        public void setSurname(String surname) {
-            this.surname = surname;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof Person )) return false;
-
-            Person person = (Person) o;
-
-            return id != null ? id.equals(person.id) : person.id == null;
-
-        }
-
-        @Override
-        public int hashCode() {
-            return id != null ? id.hashCode() : 0;
-        }
-    }
+	private Person person;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				Person.class
+		};
+	}
+
+	@Before
+	public void setUp() {
+		doInHibernate( this::sessionFactory, session -> {
+			person = new Person();
+			person.setName("Johannes");
+			person.setSurname("Buehler");
+			session.persist(person);
+		} );
+	}
+
+	@Test
+	public void HHH_10463_TestCoalesce() {
+		doInHibernate( this::sessionFactory, session -> {
+			TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name , p.name) ", Person.class );
+			query.setParameter("name", "Johannes");
+			List resultList = query.getResultList();
+			assertThat(resultList, hasItem(person));
+		} );
+
+	}
+
+	@Test
+	public void HHH_10463_NullInCoalesce() {
+		doInHibernate( this::sessionFactory, session -> {
+			TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name, p.name) ", Person.class );
+			query.setParameter("name", null);
+			List resultList = query.getResultList();
+			assertThat(resultList, hasItem(person));
+		} );
+	}
+
+	@Test
+	public void HHH_10463_NullInCoalesce_PostgreSQL_Workaround() {
+		doInHibernate( this::sessionFactory, session -> {
+			TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(cast( :name as string) , p.name) ", Person.class );
+			query.setParameter("name", null);
+			List resultList = query.getResultList();
+			assertThat(resultList, hasItem(person));
+		} );
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Integer id;
+
+		@Column
+		private String name;
+
+		@Column
+		private String surname;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getSurname() {
+			return surname;
+		}
+
+		public void setSurname(String surname) {
+			this.surname = surname;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof Person )) return false;
+
+			Person person = (Person) o;
+
+			return id != null ? id.equals(person.id) : person.id == null;
+
+		}
+
+		@Override
+		public int hashCode() {
+			return id != null ? id.hashCode() : 0;
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java
index 4b9da6e369c0..3a25c5147872 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -35,7 +33,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.Fail.fail;
-import static org.hamcrest.core.Is.is;
 import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ComponentContainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ComponentContainer.java
index adca46a5eb71..024c431d16fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ComponentContainer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ComponentContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CompositeIdEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CompositeIdEntity.java
index fc7daaf74131..ea40616cac26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CompositeIdEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CompositeIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -52,7 +50,7 @@ public boolean equals( Object obj ) {
 			return true;
 		}
 		if ( !( obj instanceof CompositeIdEntity ) ) {
-			return false; 
+			return false;
 		}
 		CompositeIdEntity other = ( CompositeIdEntity ) obj;
 		if ( key1 == null ? other.key1 != null : !key1.equals( other.key1 ) ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Constructor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Constructor.java
index 5ff6c008255c..1bce112dae63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Constructor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Constructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CrazyCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CrazyCompositeKey.java
index ae5b00d223d1..266f298a4f01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CrazyCompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CrazyCompositeKey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: CrazyCompositeKey.java 6970 2005-05-31 20:24:41Z oneovthafew $
 package org.hibernate.orm.test.hql;
 import java.io.Serializable;
 
@@ -33,13 +29,13 @@ public Long getOtherId() {
 	public void setOtherId(Long otherId) {
 		this.otherId = otherId;
 	}
-	
+
 	public boolean equals(Object that) {
 		CrazyCompositeKey cck = (CrazyCompositeKey) that;
 		return cck.id.longValue() == id.longValue()
 			&& cck.otherId.longValue() == otherId.longValue();
 	}
-	
+
 	public int hashCode() {
 		return id.hashCode() + otherId.hashCode();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Crop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Crop.java
index 5b4c03a08b21..b252646f8465 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Crop.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Crop.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -22,9 +20,9 @@ public class Crop {
 
 	@Id @GeneratedValue
 	private long id;
-	
+
 	private String name;
-	
+
 	@ManyToMany(mappedBy = "crops", cascade = CascadeType.ALL)
 	private List farms;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java
index 620076afd099..e4ff4c8e20ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java
@@ -1,21 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.PersistenceException;
 
 import org.hibernate.QueryException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import org.hibernate.testing.RequiresDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java
index 901a23a5a8ff..9e28799a7469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java
index 87c4f875640e..81669c2c80f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java
index 198432bb49c7..286ec358e12e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWhereFunctionCallTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java
index d56c851c6280..ac68d09206fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -12,8 +10,6 @@
 import org.hibernate.orm.test.annotations.query.Attrvalue;
 import org.hibernate.orm.test.annotations.query.Employee;
 import org.hibernate.orm.test.annotations.query.Employeegroup;
-import org.hibernate.orm.test.hql.Panel;
-import org.hibernate.orm.test.hql.TrtPanel;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -50,16 +46,16 @@ public void testDeleteMemberOf() {
 		s.getTransaction().commit();
 		s.close();
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-8447" )
 	public void testDeleteMultipleWhereIns() {
 		Session s = openSession();
 		s.getTransaction().begin();
-        s.createQuery("DELETE FROM Panel panelEntity WHERE " +
-		        " panelEntity.clientId IN ( SELECT trtPanel.clientId FROM TrtPanel trtPanel ) " +
-		        " AND panelEntity.deltaStamp NOT IN ( SELECT trtPanel.deltaStamp FROM TrtPanel trtPanel )").executeUpdate();
-        s.getTransaction().commit();
-        s.close();
+		s.createQuery("DELETE FROM Panel panelEntity WHERE " +
+				" panelEntity.clientId IN ( SELECT trtPanel.clientId FROM TrtPanel trtPanel ) " +
+				" AND panelEntity.deltaStamp NOT IN ( SELECT trtPanel.deltaStamp FROM TrtPanel trtPanel )").executeUpdate();
+		s.getTransaction().commit();
+		s.close();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Department.java
index a6920996d73a..57d8ac421ae0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Department.java
@@ -1,41 +1,38 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
 @Entity
 @Table(name="department")
 public class Department implements java.io.Serializable {
-    private Integer deptNo;
-    private String deptName;
+	private Integer deptNo;
+	private String deptName;
 
-    @Id
-    @GeneratedValue
-    @Column(name="id_dep")
-    public Integer getDeptNo() {
-        return this.deptNo;
-    }
+	@Id
+	@GeneratedValue
+	@Column(name="id_dep")
+	public Integer getDeptNo() {
+		return this.deptNo;
+	}
 
-    public void setDeptNo(Integer deptNo) {
-        this.deptNo = deptNo;
-    }
+	public void setDeptNo(Integer deptNo) {
+		this.deptNo = deptNo;
+	}
 
-    public String getDeptName() {
-        return this.deptName;
-    }
+	public String getDeptName() {
+		return this.deptName;
+	}
 
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Dog.java
index 68c1d0c5421e..927497921ab6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Dog.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Dog.java 4476 2004-09-02 02:28:13Z oneovthafew $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DomesticAnimal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DomesticAnimal.java
index b922e63b8506..703340f2b443 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DomesticAnimal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DomesticAnimal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DomesticAnimal.java 4899 2004-12-06 14:17:24Z pgmjsd $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java
index 72ee4bdb9da8..33fe04e489ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Employee.java
index 72e2664e7928..bad46991b7c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -12,7 +10,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
@@ -23,68 +20,68 @@
 @Table(name="employee")
 public class Employee implements Serializable  {
 
-    @Id
-    @GeneratedValue
-    @Column(name="id_emp")
-    private Integer id;
-    
-    private String firstName;
-    private String lastName;
-    
-    @OneToOne
-    @JoinColumn(name="id_title")
-    private Title title;
-    
-    @ManyToOne(fetch=FetchType.LAZY)
-    @JoinColumn(name="id_depto")
-    private Department department;
-    
-    public Employee() {}
-    
-    public Employee(Integer _id, String _lastName, Integer _idTitle, String _descriptionTitle, Department _dept, String _fname) {
-        setId(_id);
-        setLastName(_lastName);
-        Title _title = new Title();
-        _title.setId(_idTitle);
-        _title.setDescription(_descriptionTitle);
-        setTitle(_title);
-        setDepartment(_dept);
-        setFirstName(_fname);
-    }
-    
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public String getFirstName() {
-        return firstName;
-    }
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    public String getLastName() {
-        return lastName;
-    }
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    public Title getTitle() {
-        return title;
-    }
-    public void setTitle(Title title) {
-        this.title = title;
-    }
-    public Department getDepartment() {
-        return department;
-    }
-    public void setDepartment(Department department) {
-        this.department = department;
-    }
-    
-    
-    
-    
-    
+	@Id
+	@GeneratedValue
+	@Column(name="id_emp")
+	private Integer id;
+
+	private String firstName;
+	private String lastName;
+
+	@OneToOne
+	@JoinColumn(name="id_title")
+	private Title title;
+
+	@ManyToOne(fetch=FetchType.LAZY)
+	@JoinColumn(name="id_depto")
+	private Department department;
+
+	public Employee() {}
+
+	public Employee(Integer _id, String _lastName, Integer _idTitle, String _descriptionTitle, Department _dept, String _fname) {
+		setId(_id);
+		setLastName(_lastName);
+		Title _title = new Title();
+		_title.setId(_idTitle);
+		_title.setDescription(_descriptionTitle);
+		setTitle(_title);
+		setDepartment(_dept);
+		setFirstName(_fname);
+	}
+
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public Title getTitle() {
+		return title;
+	}
+	public void setTitle(Title title) {
+		this.title = title;
+	}
+	public Department getDepartment() {
+		return department;
+	}
+	public void setDepartment(Department department) {
+		this.department = department;
+	}
+
+
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithArgFunctionAsColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithArgFunctionAsColumn.java
index bb9e7dd8dc52..43e8eda1dc11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithArgFunctionAsColumn.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithArgFunctionAsColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -20,7 +18,7 @@ public long getId() {
 		return id;
 	}
 	public void setId(long id) {
-		this.id = id;		
+		this.id = id;
 	}
 
 	public int getLower() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithCrazyCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithCrazyCompositeKey.java
index 9d213d40b0a5..255f030642a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithCrazyCompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithCrazyCompositeKey.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: EntityWithCrazyCompositeKey.java 6567 2005-04-27 17:41:57Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithFunctionAsColumnHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithFunctionAsColumnHolder.java
index 8e24bb025df5..75c069a68516 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithFunctionAsColumnHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithFunctionAsColumnHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithNoArgFunctionAsColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithNoArgFunctionAsColumn.java
index 989a7a9ad68e..79ed62b692fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithNoArgFunctionAsColumn.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EntityWithNoArgFunctionAsColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java
index b8e3755206ed..c31fcc97f514 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -25,7 +23,7 @@ public class Farm {
 
 	@Id @GeneratedValue
 	private long id;
-	
+
 	private String name;
 
 	@ManyToMany(cascade = CascadeType.ALL)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java
index ca94a323ad33..acee8ced9360 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -298,7 +296,7 @@ public void testGetMultiColumnSameNameAsNoArgFunctionCriteria() {
 					assertTrue( Hibernate.isInitialized( holder.getEntityWithNoArgFunctionAsColumns() ) );
 					assertTrue( Hibernate.isInitialized( holder.getNextHolder() ) );
 					assertTrue( Hibernate.isInitialized( holder.getNextHolder()
-																 .getEntityWithNoArgFunctionAsColumns() ) );
+																.getEntityWithNoArgFunctionAsColumns() ) );
 					assertEquals( 1, holder.getEntityWithNoArgFunctionAsColumns().size() );
 					EntityWithNoArgFunctionAsColumn e1 = (EntityWithNoArgFunctionAsColumn) holder.getEntityWithNoArgFunctionAsColumns()
 							.iterator()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
index 93e963c4991f..02d3ee8c6b2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -288,7 +286,7 @@ public void hql_select_simplest_jpql_fqn_example() {
 
 	@Test
 	public void test_hql_multiple_root_reference_jpql_example() {
-		 doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::hql-multiple-root-reference-jpql-example[]
 			List persons = entityManager.createQuery(
 				"select distinct pr, ph " +
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HeresAnotherCrazyIdFieldName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HeresAnotherCrazyIdFieldName.java
index 95602624e011..0c00d3d709f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HeresAnotherCrazyIdFieldName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HeresAnotherCrazyIdFieldName.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: HeresAnotherCrazyIdFieldName.java 7471 2005-07-14 14:58:28Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlOperatorTypesafetyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlOperatorTypesafetyTest.java
index d5d4ab431384..030453b3c37b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlOperatorTypesafetyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlOperatorTypesafetyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import jakarta.persistence.Entity;
@@ -13,77 +17,77 @@
 @SessionFactory
 @DomainModel(annotatedClasses = HqlOperatorTypesafetyTest.Book.class)
 public class HqlOperatorTypesafetyTest {
-    @Test void testOperatorTyping(SessionFactoryScope scope) {
-        scope.inSession( s -> {
-            // these should succeed
-            s.createSelectionQuery("from Book where title = 'Hibernate'").getResultList();
-            s.createSelectionQuery("from Book where title > ''").getResultList();
-            s.createSelectionQuery("select edition + 1 from Book").getResultList();
-            s.createSelectionQuery("select title || '!' from Book").getResultList();
-            try {
-                s.createSelectionQuery("from Book where title = 1").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("from Book where title > 1").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("select title + 1 from Book").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-        });
-    }
+	@Test void testOperatorTyping(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			// these should succeed
+			s.createSelectionQuery("from Book where title = 'Hibernate'").getResultList();
+			s.createSelectionQuery("from Book where title > ''").getResultList();
+			s.createSelectionQuery("select edition + 1 from Book").getResultList();
+			s.createSelectionQuery("select title || '!' from Book").getResultList();
+			try {
+				s.createSelectionQuery("from Book where title = 1").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("from Book where title > 1").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("select title + 1 from Book").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+		});
+	}
 
-    @Test void testSubselectTyping(SessionFactoryScope scope) {
-        scope.inSession( s -> {
-            // these should succeed
-            s.createSelectionQuery("from Book where title in (select title from Book)").getResultList();
-            s.createSelectionQuery("from Book where title = any (select title from Book)").getResultList();
+	@Test void testSubselectTyping(SessionFactoryScope scope) {
+		scope.inSession( s -> {
+			// these should succeed
+			s.createSelectionQuery("from Book where title in (select title from Book)").getResultList();
+			s.createSelectionQuery("from Book where title = any (select title from Book)").getResultList();
 
-            // test tuple length errors
-            try {
-                s.createSelectionQuery("from Book where title = any (select title, isbn from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("from Book where title = every (select title, isbn from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("from Book where title in (select title, isbn from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
+			// test tuple length errors
+			try {
+				s.createSelectionQuery("from Book where title = any (select title, isbn from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("from Book where title = every (select title, isbn from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("from Book where title in (select title, isbn from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
 
-            // test typing errors
-            try {
-                s.createSelectionQuery("from Book where 1 = any (select title from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("from Book where 1 = every (select title from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-            try {
-                s.createSelectionQuery("from Book where 1 in (select title from Book)").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {}
-        });
-    }
+			// test typing errors
+			try {
+				s.createSelectionQuery("from Book where 1 = any (select title from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("from Book where 1 = every (select title from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+			try {
+				s.createSelectionQuery("from Book where 1 in (select title from Book)").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {}
+		});
+	}
 
-    @Entity(name = "Book")
-    static class Book {
-        @Id String isbn;
-        String title;
-        int edition;
-    }
+	@Entity(name = "Book")
+	static class Book {
+		@Id String isbn;
+		String title;
+		int edition;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java
index 9be6a8404b68..8e29f02e9fc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -17,8 +15,6 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Human.java
index 471f0634d4a5..56552af84f19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Human.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Human.java 9873 2006-05-04 13:42:48Z max.andersen@jboss.com $
 package org.hibernate.orm.test.hql;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -26,12 +22,12 @@ public class Human extends Mammal {
 	private Collection pets;
 	private Map family;
 	private double heightInches;
-	
+
 	private BigInteger bigIntegerValue;
 	private BigDecimal bigDecimalValue;
 	private int intValue;
 	private float floatValue;
-	
+
 	private Set nickNames;
 	private Map addresses;
 
@@ -66,11 +62,11 @@ public String getNickName() {
 	public void setNickName(String nickName) {
 		this.nickName = nickName;
 	}
-	
+
 	public double getHeightInches() {
 		return heightInches;
 	}
-	
+
 	public void setHeightInches(double height) {
 		this.heightInches = height;
 	}
@@ -78,7 +74,7 @@ public void setHeightInches(double height) {
 	public Map getFamily() {
 		return family;
 	}
-	
+
 
 	public void setFamily(Map family) {
 		this.family = family;
@@ -131,6 +127,6 @@ public int getIntValue() {
 	public void setIntValue(int intValue) {
 		this.intValue = intValue;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Image.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Image.java
index cfbb5e3c061a..da1787019198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Image.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Image.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -11,11 +9,11 @@
  * @author Rob.Hasselbaum
  */
 public class Image {
-	
+
 	private Long id;
 	private String name;
 	private double sizeKb;
-	
+
 	/**
 	 * @return the id
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InSubqueryPredicateAnonymousTupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InSubqueryPredicateAnonymousTupleTest.java
index bbff5db9e768..2fa3c98e1e75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InSubqueryPredicateAnonymousTupleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InSubqueryPredicateAnonymousTupleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java
index 53eac5af5d73..2ce8606c9ac1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import java.util.HashMap;
@@ -23,90 +27,90 @@
  */
 @JiraKey(value = "HHH-14475")
 public class IndicesTest extends BaseNonConfigCoreFunctionalTestCase {
-    
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {Project.class, Role.class, Person.class};
-    }
-    
-    @Before
-    public void setUp() {
-        doInHibernate( this::sessionFactory, session -> {
-
-            Project project = new Project(1);
-            Role role = new Role(1);
-            
-            session.persist( project );
-            session.persist( role );
-
-            Person person = new Person(1, project, role);
-            
-            session.persist( person );
-        });
-    }
-    
-    @Test
-    public void testSelectIndices() {
-        doInHibernate( this::sessionFactory, session -> {
-            
-            List result = session.createQuery(
-                    "select indices(p.roles) from Person p"
-            ).list();
-
-            assertThat( result.size(), is( 1 ) );
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        private Integer id;
-
-        @OneToMany
-        @JoinTable(name = "person_to_role",
-                joinColumns = @JoinColumn(name = "person_id"),
-                inverseJoinColumns = @JoinColumn(name = "role_id")
-        )
-        @MapKeyJoinColumn(name = "project_id")
-        private Map roles;
-
-        public Person() {
-        }
-        
-        public Person(Integer id, Project project, Role role) {
-            this.id = id;
-            roles = new HashMap<>();
-            roles.put(project, role);
-        }
-    }
-
-    @Entity(name = "Project")
-    public static class Project {
-
-        @Id
-        private Integer id;
-
-        public Project() {
-        }
-        
-        public Project(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "Role")
-    @Table(name = "proj_role")
-    public static class Role {
-
-        @Id
-        private Integer id;
-
-        public Role() {
-        }
-        
-        public Role(Integer id) {
-            this.id = id;
-        }
-    }
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {Project.class, Role.class, Person.class};
+	}
+
+	@Before
+	public void setUp() {
+		doInHibernate( this::sessionFactory, session -> {
+
+			Project project = new Project(1);
+			Role role = new Role(1);
+
+			session.persist( project );
+			session.persist( role );
+
+			Person person = new Person(1, project, role);
+
+			session.persist( person );
+		});
+	}
+
+	@Test
+	public void testSelectIndices() {
+		doInHibernate( this::sessionFactory, session -> {
+
+			List result = session.createQuery(
+					"select indices(p.roles) from Person p"
+			).list();
+
+			assertThat( result.size(), is( 1 ) );
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		private Integer id;
+
+		@OneToMany
+		@JoinTable(name = "person_to_role",
+				joinColumns = @JoinColumn(name = "person_id"),
+				inverseJoinColumns = @JoinColumn(name = "role_id")
+		)
+		@MapKeyJoinColumn(name = "project_id")
+		private Map roles;
+
+		public Person() {
+		}
+
+		public Person(Integer id, Project project, Role role) {
+			this.id = id;
+			roles = new HashMap<>();
+			roles.put(project, role);
+		}
+	}
+
+	@Entity(name = "Project")
+	public static class Project {
+
+		@Id
+		private Integer id;
+
+		public Project() {
+		}
+
+		public Project(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "Role")
+	@Table(name = "proj_role")
+	public static class Role {
+
+		@Id
+		private Integer id;
+
+		public Role() {
+		}
+
+		public Role(Integer id) {
+			this.id = id;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InferenceTest.java
index dd2931294238..d4921e37e578 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/InferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -36,14 +34,14 @@
  */
 public class InferenceTest extends BaseCoreFunctionalTestCase {
 
-    private Person person;
+	private Person person;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                Person.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				Person.class
+		};
+	}
 
 	@Before
 	public void setUp() {
@@ -62,26 +60,26 @@ public void cleanUp() {
 		} );
 	}
 
-    @Test
-    public void testBinaryArithmeticInference() {
-        doInHibernate( this::sessionFactory, session -> {
-            TypedQuery query = session.createQuery( "from Person p where p.id + 1 < :param", Person.class );
-            query.setParameter("param", 10);
-            List resultList = query.getResultList();
-            assertThat(resultList, hasItem(person));
-        } );
+	@Test
+	public void testBinaryArithmeticInference() {
+		doInHibernate( this::sessionFactory, session -> {
+			TypedQuery query = session.createQuery( "from Person p where p.id + 1 < :param", Person.class );
+			query.setParameter("param", 10);
+			List resultList = query.getResultList();
+			assertThat(resultList, hasItem(person));
+		} );
 
-    }
+	}
 
-    @Test
-    @JiraKey("HHH-17386")
-    public void testInferenceSourceResetForOnClause() {
-        doInHibernate( this::sessionFactory, session -> {
-            session.createQuery( "from Person p where p in (select p2 from Person p2 join Person p3 on exists (select 1 from Person p4))", Person.class )
-                .getResultList();
-        } );
+	@Test
+	@JiraKey("HHH-17386")
+	public void testInferenceSourceResetForOnClause() {
+		doInHibernate( this::sessionFactory, session -> {
+			session.createQuery( "from Person p where p in (select p2 from Person p2 join Person p3 on exists (select 1 from Person p4))", Person.class )
+				.getResultList();
+		} );
 
-    }
+	}
 
 	@Test
 	@JiraKey("HHH-18046")
@@ -97,58 +95,58 @@ public void testBinaryArithmeticParameterInference() {
 		} );
 	}
 
-    @Entity(name = "Person")
-    public static class Person {
+	@Entity(name = "Person")
+	public static class Person {
 
-        @Id
-        @GeneratedValue
-        private Integer id;
+		@Id
+		@GeneratedValue
+		private Integer id;
 
-        @Column
-        private String name;
+		@Column
+		private String name;
 
-        @Column
-        private String surname;
+		@Column
+		private String surname;
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public String getSurname() {
-            return surname;
-        }
+		public String getSurname() {
+			return surname;
+		}
 
-        public void setSurname(String surname) {
-            this.surname = surname;
-        }
+		public void setSurname(String surname) {
+			this.surname = surname;
+		}
 
-        public Integer getId() {
-            return id;
-        }
+		public Integer getId() {
+			return id;
+		}
 
-        public void setId(Integer id) {
-            this.id = id;
-        }
+		public void setId(Integer id) {
+			this.id = id;
+		}
 
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof Person )) return false;
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) return true;
+			if (!(o instanceof Person )) return false;
 
-            Person person = (Person) o;
+			Person person = (Person) o;
 
-            return id != null ? id.equals(person.id) : person.id == null;
+			return id != null ? id.equals(person.id) : person.id == null;
 
-        }
+		}
 
-        @Override
-        public int hashCode() {
-            return id != null ? id.hashCode() : 0;
-        }
-    }
+		@Override
+		public int hashCode() {
+			return id != null ? id.hashCode() : 0;
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IntegerVersioned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IntegerVersioned.java
index b26430a8f7e8..486c833df408 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IntegerVersioned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IntegerVersioned.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: IntegerVersioned.java 7384 2005-07-06 17:04:45Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java
index 25901eee65f0..9e186f7bfbfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Joiner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Joiner.java
index b1ccae032680..25b6e88c7133 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Joiner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Joiner.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Joiner.java 6021 2005-03-06 02:02:30Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneEntity.java
index 985ce39eceb8..284785c6ba16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: KeyManyToOneEntity.java 7091 2005-06-08 19:31:26Z steveebersole $
 package org.hibernate.orm.test.hql;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneKeyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneKeyEntity.java
index 8da70fccf02c..30c70aad801b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneKeyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/KeyManyToOneKeyEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: KeyManyToOneKeyEntity.java 7091 2005-06-08 19:31:26Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Lizard.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Lizard.java
index 92b477340e6d..4694dcc7e6db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Lizard.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Lizard.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Lizard.java 3890 2004-06-03 16:31:32Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Mammal.java
index d887863bd20a..4d46882e7326 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Mammal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Mammal.java 6005 2005-03-04 11:41:11Z oneovthafew $
 package org.hibernate.orm.test.hql;
 import java.util.Date;
 
@@ -30,7 +26,7 @@ public void setPregnant(boolean pregnant) {
 	public Date getBirthdate() {
 		return birthdate;
 	}
-	
+
 
 	public void setBirthdate(Date birthdate) {
 		this.birthdate = birthdate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java
index cbb45ee8b008..dfe02c70c90a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.hql;
 
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java
index 0eebb8b489da..c833b7800265 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MappedSuperclassAttributeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MappedSuperclassAttributeQueryTest.java
index a8e12e4d064e..c002eb23e7ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MappedSuperclassAttributeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MappedSuperclassAttributeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java
index 09c44ca5b457..1dd80afb4edf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MoreCrazyIdFieldNameStuffEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MoreCrazyIdFieldNameStuffEntity.java
index 5ee9c5b4a353..3504d567576f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MoreCrazyIdFieldNameStuffEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MoreCrazyIdFieldNameStuffEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: MoreCrazyIdFieldNameStuffEntity.java 7471 2005-07-14 14:58:28Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MutationQueryExampleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MutationQueryExampleTests.java
index c2b4e7a9ef85..30237f5e18ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MutationQueryExampleTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MutationQueryExampleTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Name.java
index 8515a3c7b779..b5bb6a0a57ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Name.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Name.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
@@ -19,9 +15,9 @@ public class Name {
 	private String first;
 	private Character initial;
 	private String last;
-	
+
 	protected Name() {}
-	
+
 	public Name(String first, Character initial, String last) {
 		this.first = first;
 		this.initial = initial;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java
index 1f84cdbd8575..b4daa05df84d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.hql;
 
 import org.hibernate.annotations.NaturalId;
@@ -278,7 +275,7 @@ public void dereferenceNaturalIdInJoin2(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Query query = session.createQuery( "SELECT b.normalBook FROM BookRefRef a " +
-															   "JOIN BookRef b ON b.naturalBook.isbn = a.naturalBookRef.naturalBook.isbn" );
+															"JOIN BookRef b ON b.naturalBook.isbn = a.naturalBookRef.naturalBook.isbn" );
 					query.getResultList();
 					sqlStatementInterceptor.assertExecutedCount( 1 );
 					assertEquals( 2, sqlStatementInterceptor.getNumberOfJoins( 0 ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java
index 9e233b8cca36..c4c4e1c72324 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Panel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Panel.java
index d7f41aa77895..3aa0cc39292e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Panel.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Panel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -14,12 +12,12 @@
 @Entity
 public class Panel implements Serializable {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    private Long clientId;
+	private Long clientId;
 
-    private String deltaStamp;
+	private String deltaStamp;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java
index 625bd82e6c46..d977bf2bc968 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
index 7db90beb26ea..dcdcc82faa21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
 import java.util.Collections;
-import java.util.List;
 
-import org.hibernate.query.SemanticException;
 
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PettingZoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PettingZoo.java
index 49b7c196eab3..b450be4e2707 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PettingZoo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PettingZoo.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: PettingZoo.java 4857 2004-12-02 16:28:57Z oneovthafew $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Pickup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Pickup.java
index 77d16eff877d..470c0f386525 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Pickup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Pickup.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Pickup.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
index 5078c8628f43..ce89c9d780f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
index 954af74e10ee..19fc49b3ea4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -20,7 +18,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
index d4ef9a11af93..c78ede790413 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import java.time.LocalDate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
index 1c74f13068e5..ed50fade6c86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Reptile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Reptile.java
index 09f5069e1c7b..35f0c8abb8a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Reptile.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Reptile.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Reptile.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SUV.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SUV.java
index de564a97426a..c7f82d9c199d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SUV.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SUV.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: SUV.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
index 01579f201da0..e1aa0ee0d27e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectDistinctTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectDistinctTest.java
index eac10371bd7e..622209b76527 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectDistinctTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectDistinctTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java
index 2e576447fab3..bd37f1e44e9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectWithFkInPackageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectWithFkInPackageTest.java
index 8af4431717f6..99a89e2eff4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectWithFkInPackageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectWithFkInPackageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -14,9 +12,7 @@
 import org.hibernate.testing.orm.junit.Jpa;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java
index c326e896057d..6047bd7e217f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleAssociatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleAssociatedEntity.java
index 23d42e8d7f18..a0d22308d497 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleAssociatedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleAssociatedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleEntityWithAssociation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleEntityWithAssociation.java
index 9f12a4648a4e..d877bc2e843d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleEntityWithAssociation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SimpleEntityWithAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 import java.util.HashSet;
@@ -40,14 +38,14 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Integer getNegatedNumber() {
 		return negatedNumber;
 	}
 
 	public void setNegatedNumber(Integer negatedNumber) {
 		this.negatedNumber = negatedNumber;
-	}	
+	}
 
 	public Set getAssociatedEntities() {
 		return associatedEntities;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StateProvince.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StateProvince.java
index a9d588aa21e4..be63b9fbc4c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StateProvince.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StateProvince.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: StateProvince.java 7996 2005-08-22 14:49:57Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StringBracketSyntaxTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StringBracketSyntaxTest.java
index 6f260c3a85e8..33546ae516f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StringBracketSyntaxTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/StringBracketSyntaxTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
index 9bf6ca5dcd38..a8b0602b7fcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java
index f161d4a966bd..1d5fc2292d4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TimestampVersioned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TimestampVersioned.java
index 14e6356020af..94f21ba9aec4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TimestampVersioned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TimestampVersioned.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: TimestampVersioned.java 7384 2005-07-06 17:04:45Z steveebersole $
 package org.hibernate.orm.test.hql;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Title.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Title.java
index e74bb7c0db59..aedc4aa4235a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Title.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Title.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -17,26 +15,26 @@
 @Table(name="title")
 public class Title implements Serializable {
 
-    @Id
-    @GeneratedValue
-    @Column(name="id_title")
-    private Integer id;
-    
-    private String description;
-    
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    
-    
-    
+	@Id
+	@GeneratedValue
+	@Column(name="id_title")
+	private Integer id;
+
+	private String description;
+
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java
index e537321aaeac..976c9cb65c6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TrtPanel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TrtPanel.java
index 2435423c8583..628ea9db66ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TrtPanel.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TrtPanel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -16,15 +14,15 @@
 @Entity
 public class TrtPanel implements Serializable {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Panel panel;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Panel panel;
 
-    private Long clientId;
+	private Long clientId;
 
-    private String deltaStamp;
+	private String deltaStamp;
 
 	public Long getId() {
 		return id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Truck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Truck.java
index 2fa80ad32cbb..92ad69da2a63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Truck.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Truck.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Truck.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java
index 56673cb08565..8e24dcbc9879 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
@@ -88,4 +92,3 @@ public Detail( Integer id, Root root) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/User.java
index 7c85fbf59d76..e9802bba1db2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 5891 2005-02-24 01:18:15Z oneovthafew $
 package org.hibernate.orm.test.hql;
 import java.util.List;
 
@@ -45,10 +41,10 @@ public void setHuman(Human human) {
 	public List getPermissions() {
 		return permissions;
 	}
-	
+
 
 	public void setPermissions(List permissions) {
 		this.permissions = permissions;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/VariousKeywordPropertyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/VariousKeywordPropertyEntity.java
index af1f19392f9d..1285e13f9f52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/VariousKeywordPropertyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/VariousKeywordPropertyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Vehicle.java
index a2db9d3bf967..6ce49fc31906 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Vehicle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Vehicle.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Vehicle.java 7087 2005-06-08 18:23:44Z steveebersole $
 package org.hibernate.orm.test.hql;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java
index ebe062d53545..b78fe2541fd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql;
 
@@ -121,7 +119,7 @@ public void testWithClauseWithImplicitJoin(SessionFactoryScope scope) {
 				}
 		);
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-2772")
 	public void testWithJoinRHS(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Zoo.java
index 2a2f9794e4c4..c84b930ff86a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Zoo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Zoo.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Zoo.java 10653 2006-10-26 13:38:50Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.hql;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/BitwiseFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/BitwiseFunctionsTest.java
index d7dca61d0115..05bdecff34c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/BitwiseFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/BitwiseFunctionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.bitwise;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/IntEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/IntEntity.java
index 8c4ab7ea11b1..bada6fedb021 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/IntEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/bitwise/IntEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.bitwise;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Child.java
index 5d673ac5f80a..f7c21ffa525e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Child.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity1.java
index fcfb48129426..817d77a06800 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity1.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity2.java
index 92aa94dc2c51..f6825f08e69b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity2.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity3.java
index d913b4e1f93f..d08aa4528bb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Entity3.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/GrandChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/GrandChild.java
index 970a0b546960..7982cbf34483 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/GrandChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/GrandChild.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Parent.java
index 9ee6b28e888a..92a42be3d022 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/Parent.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java
index 805b91df6d4e..0138ee7dda7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.fetchAndJoin;
 
@@ -31,7 +12,6 @@
 
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
-import org.hibernate.dialect.MySQLDialect;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Employee.java
index c8cf76398c0b..d61f7e6d4531 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java
index d78bdfa88a03..e2aa81bb1fea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java
index 0635228ff7e2..3db0bf78559d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java
index 97fe42ac318e..9994008d6637 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Person.java
index 10eaa5a8cda9..1cda147ee54d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.joinedSubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/nofrom/NoFromTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/nofrom/NoFromTest.java
index c1a8fd346a3d..695630fe0d30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/nofrom/NoFromTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/nofrom/NoFromTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.hql.nofrom;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java
index 53d42085a8a4..c16809508827 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.hql.size;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/City.java
index a242692093e5..96f4c1d71d34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/City.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.size.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/Region.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/Region.java
index dcc502bd06d6..343e0c4767bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/Region.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/Region.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.size.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java
index 5a78032c47ec..29ec96862f74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hql.size.filter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Child.java
index f8452424ab22..f46e6c78c309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hqlfetchscroll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java
index 20db74d906e7..d4b0c2d3e207 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hqlfetchscroll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Parent.java
index a72a4494ea9c..c34baa088718 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hqlfetchscroll;
 
@@ -10,7 +8,7 @@
 import java.util.Set;
 
 public class Parent {
-	
+
 	// A numeric id must be the  field.  Some databases (Sybase, etc.)
 	// require identifier columns in order to support scrollable results.
 	private long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java
index d421adcf23dc..75e637d1fe85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.hqlfetchscroll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/AbstractHolderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/AbstractHolderTest.java
index 47d8df4dac8e..3cee3484f4d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/AbstractHolderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/AbstractHolderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigDecimalHolderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigDecimalHolderTest.java
index 1cfb7cfa5674..d9b3dc32ab5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigDecimalHolderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigDecimalHolderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigIntegerHolderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigIntegerHolderTest.java
index cb4973fc5600..eb4aa4ee7544 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigIntegerHolderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/BigIntegerHolderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java
index 97882e36d5ae..a194328e0ee7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java
index 71f73b8a3d92..16d5242bb1fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.id;
 
 import org.hibernate.Transaction;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java
index 7047e04ccfe3..0784e3f18dd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/GenericGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/GenericGeneratorTest.java
index 24a8d2bdb5ba..5185c34807f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/GenericGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/GenericGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id;
 
 import org.hibernate.annotations.GenericGenerator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java
index a42ef4b487ac..59a9af8abc29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java
index 4711190a1cd8..ced55f3ce9fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/LongHolderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/LongHolderTest.java
index b09fdceeaa6e..730fa97a3b37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/LongHolderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/LongHolderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
index 7490083ee30b..c5f6e14fd16d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/Person.java
index a902d0d0b541..2343ddcd8ec9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/Person.java
@@ -1,25 +1,23 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
 
 public class Person {
 
-    private long id;
+	private long id;
 
-    public Person() {
-    }
+	public Person() {
+	}
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 
-    public void setId(final long id) {
-        this.id = id;
-    }
+	public void setId(final long id) {
+		this.id = id;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
index c898a388ba6a..130e6c44b5c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
@@ -142,4 +123,3 @@ private void insertNewRow(Session session) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/Product.java
index 267c94e9a630..496f1c92362d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.id;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java
index 7694b3aee0c8..c44051c7fa74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java
index 975b983016eb..5f489523a701 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.id;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java
index 834ed1917b84..df882cc6c290 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.id;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java
index b7399342076e..6929b797a693 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java
index 069778c2c733..b163ee8f5743 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java
index 192419c802a1..2f947f8e5fcf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequeceHiloGeneratorWitZeroIncrementSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequeceHiloGeneratorWitZeroIncrementSizeTest.java
index 4db06cf90f7d..f4217dde105e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequeceHiloGeneratorWitZeroIncrementSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequeceHiloGeneratorWitZeroIncrementSizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
@@ -15,7 +13,6 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -35,7 +32,6 @@
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.transaction.TransactionUtil;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.hibernate.testing.util.uuid.IdGeneratorCreationContext;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -124,7 +120,7 @@ public Type getType() {
 
 		sessionFactory = (SessionFactoryImplementor) metadata.buildSessionFactory();
 		generator.initialize( sessionFactory.getSqlStringGenerationContext() );
-        sequenceValueExtractor = new SequenceValueExtractor(sessionFactory.getJdbcServices().getDialect(), TEST_SEQUENCE );
+		sequenceValueExtractor = new SequenceValueExtractor(sessionFactory.getJdbcServices().getDialect(), TEST_SEQUENCE );
 	}
 
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceValueExtractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceValueExtractor.java
index f5e42254942c..0fd5ea56b6eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceValueExtractor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceValueExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/UseIdentifierRollbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/UseIdentifierRollbackTest.java
index fb62908750c9..52034102352c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/UseIdentifierRollbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/UseIdentifierRollbackTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.id;
 
 import org.hibernate.cfg.Environment;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java
index 19b34e97e654..27e68edd06da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java
index c689f53eca51..89fb4a8473b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java
index c6bffee0b5a1..4c938a40f9d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java
index 11dbcbeb2795..2006476022b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
index bf06420ab261..909d5d76f3fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomSequenceGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomSequenceGenerator.java
index a33563cd30d0..7bffafefb906 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomSequenceGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomSequenceGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/Sequence.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/Sequence.java
index 9159ae89c8a7..275b41c9a877 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/Sequence.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/Sequence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/TheEntity.java
index 8471494ad70f..39c774d79cd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.custom;
 
@@ -39,4 +37,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/CustomNamingStrategyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/CustomNamingStrategyTests.java
index feeebf3f7496..bef5015b6c90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/CustomNamingStrategyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/CustomNamingStrategyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
@@ -105,10 +103,10 @@ public QualifiedName determineTableName(
 	@Entity( name = "TheEntity" )
 	@Table( name = "ents" )
 	public static class TheEntity {
-	    @Id
+		@Id
 		@GeneratedValue( strategy = GenerationType.SEQUENCE )
-	    private Integer id;
-	    @Basic
+		private Integer id;
+		@Basic
 		private String name;
 
 		private TheEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/NamingStrategySelectorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/NamingStrategySelectorTests.java
index 175ac4950f24..fdeea3b1b634 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/NamingStrategySelectorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/NamingStrategySelectorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerConcurrencyUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerConcurrencyUnitTest.java
index 2c7b42d9c03f..510a1e0a334d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerConcurrencyUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerConcurrencyUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerUnitTest.java
index dd11efc1e325..1174bfa4306c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/OptimizerUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceNamingStrategyTest.java
index e8410cb97b2b..ee4a2643655d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceStyleConfigUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceStyleConfigUnitTest.java
index d77129d18dec..9b69e3906932 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceStyleConfigUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SequenceStyleConfigUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
@@ -45,7 +43,6 @@
 import org.hibernate.testing.boot.MetadataBuildingContextTestingImpl;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.hibernate.testing.util.uuid.IdGeneratorCreationContext;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.instanceOf;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java
index 907ddc3ae55e..9e3d178fe96b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java
index 94b516e0a4eb..5dabf823fdaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/TableNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/TableNamingStrategyTest.java
index 7e76dba26404..022c52f7337b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/TableNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/TableNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
index f84738916814..2ea4589e9785 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
@@ -21,7 +19,6 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.PostgreSQLDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
index 7ccc82428316..fbff017790a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java
index b32b59168631..e3f45f82ff98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java
index 00aa9e0ed6a6..aedbe81e0b44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
index 1d782739a3ad..c5ddde200d44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java
index 10a9d5ccdfe8..417ca0993287 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java
index a69a1058393d..269b91964be0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java
index a86c27d461d8..77e88b63a8cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java
index e736aca4bd86..d385588d2b04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java
index db1fb912a5b8..c6a4975e509b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.hhh12973;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java
index b118e42ba99a..8653e311c36a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.idClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java
index 93e15a35fe3e..ec4541fce846 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.idClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java
index 7f9d5c9031a8..2fc967bfecd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.idClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
index 42fd4e34dc56..ff5028640a65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.sequence;
 
@@ -16,7 +14,6 @@
 import org.hibernate.Session;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.id.enhanced.NoopOptimizer;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java
index 5709098dcf91..da13cff57cd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PooledWithCustomNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PooledWithCustomNamingStrategyTest.java
index 21e736c3445f..22939419e6b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PooledWithCustomNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PooledWithCustomNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.sequence;
 
@@ -97,7 +95,7 @@ public void setUp() {
 		provider.configure( PropertiesHelper.map( Environment.getProperties() ) );
 		connectionProvider = provider;
 		try (final Connection connection = connectionProvider.getConnection();
-			 final Statement statement = connection.createStatement()) {
+			final Statement statement = connection.createStatement()) {
 			statement.execute( "create sequence MY_SEQ start with 1 increment by 5" );
 			statement.execute( "create table RightEntity(id bigint not null, primary key (id))" );
 		}
@@ -109,7 +107,7 @@ public void setUp() {
 	@AfterAll
 	public void tearDown() {
 		try (final Connection connection = connectionProvider.getConnection();
-			 final Statement statement = connection.createStatement()) {
+			final Statement statement = connection.createStatement()) {
 			statement.execute( "drop sequence MY_SEQ" );
 			statement.execute( "drop table RightEntity" );
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java
index 4c5545f1681c..293705f06b88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java
index d044763f73c2..87e4f4962299 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceGeneratorAndAutoFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceGeneratorAndAutoFlushTest.java
index 8b33009ede8c..000270b9bdd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceGeneratorAndAutoFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceGeneratorAndAutoFlushTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id.sequence;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java
index ae0599b36ec3..305aba77a6b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype;
 
@@ -38,7 +36,6 @@
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
index 990d744c2517..7a8270d26ae3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype;
 
@@ -18,7 +16,6 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.usertype.EnhancedUserType;
-import org.hibernate.usertype.UserType;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
index 36f54b94aaa8..be08997bd533 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype;
 
@@ -21,7 +19,6 @@
 import org.hibernate.annotations.Type;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.usertype.EnhancedUserType;
-import org.hibernate.usertype.UserType;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Event.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Event.java
index 11caf4729f49..bb87d76673a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Event.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Event.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Inet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Inet.java
index c25214dbab9e..f48df5b3469a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Inet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/Inet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJavaType.java
index 7fc3fcdb0507..080fef0dce15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
index 8e63b99019b0..1fcdbb5424ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
 import org.hibernate.dialect.PostgreSQLInetJdbcType;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetType.java
index d1548fea6af9..d545cca50e7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
@@ -20,4 +18,4 @@ public InetType() {
 	public String getName() {
 		return "inet";
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java
index 3f66872a1129..9f70d4ccfc4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java
index c1fc58cec3d4..1c21abc6c3a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.inet;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/Json.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/Json.java
index 403a5c0f16ed..0c9f1e25aff7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/Json.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/Json.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.json;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonJavaType.java
index 2d0c0f0f7bbb..9d48d0066592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.json;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonType.java
index 0ec7e0a88861..427ed294ecd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/JsonType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.usertype.json;
 
@@ -21,4 +19,4 @@ public JsonType() {
 	public String getName() {
 		return "json";
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java
index 5aa49bd45d2d..0e852c1e52cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid;
 
@@ -23,8 +21,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.generator.Generator;
-import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.id.UUIDGenerator;
 import org.hibernate.id.uuid.UuidGenerator;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PersistentClass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDTest.java
index f7392fe1eaa8..f4646da99b99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/AnotherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/AnotherEntity.java
index 6a46672fdd4f..d47c0a198182 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/AnotherEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/AnotherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.annotation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/CustomUuidValueGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/CustomUuidValueGenerator.java
index deece8f857af..4ac36315a9cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/CustomUuidValueGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/CustomUuidValueGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.annotation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheEntity.java
index 621ebd2d0c43..67263227d43f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.annotation;
 
@@ -43,4 +41,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheOtherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheOtherEntity.java
index dd84858f2ada..ddf9e181b101 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheOtherEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/TheOtherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.annotation;
 
@@ -46,4 +44,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/UuidGeneratorAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/UuidGeneratorAnnotationTests.java
index 65b0104dd32c..cc6a26c7a657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/UuidGeneratorAnnotationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/annotation/UuidGeneratorAnnotationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.annotation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java
index 02b42b8d5804..6b1040679fe4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id.uuid.generator;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java
index 9ef821fd0408..b1c83b9219c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id.uuid.generator;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java
index 592879f2e551..6eeae1732b52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.id.uuid.generator;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java
index 1b874f2f8b08..53d0cfcc986a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.interpretation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java
index d563a197499a..d02684dd1830 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.sqlrep.sqlbinary;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java
index dc4af182fad3..94ac75c71fdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.sqlrep.sqlchar;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java
index 9cd672dc4190..bdff0b59acef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.sqlrep.sqlchar;
 
@@ -121,4 +119,4 @@ static class Node {
 			this.parent = parent;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java
index 8afbda2eadfa..dcbaa40c6ee0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.strategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomVersionOneStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomVersionOneStrategyTest.java
index 2abda68cb51d..8259c133ff56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomVersionOneStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomVersionOneStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.uuid.strategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java
index 585719f7c8f1..1136d90179b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 6058 2005-03-11 17:05:19Z oneovthafew $
 package org.hibernate.orm.test.idbag;
 
 
@@ -14,19 +10,19 @@
  */
 public class Group {
 	private String name;
-	
+
 	Group() {}
-	
+
 	public Group(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java
index fa76893b8ed8..0d90770db701 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idbag;
 
@@ -103,4 +101,3 @@ public void testJoin(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java
index 6c42a8c5931d..810209670b39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 6058 2005-03-11 17:05:19Z oneovthafew $
 package org.hibernate.orm.test.idbag;
 
 import java.util.ArrayList;
@@ -17,9 +13,9 @@
 public class User {
 	private String name;
 	private List groups = new ArrayList();
-	
+
 	User() {}
-	
+
 	public User(String name) {
 		this.name = name;
 	}
@@ -27,7 +23,7 @@ public User(String name) {
 	public String getName() {
 		return name;
 	}
-	
+
 
 	void setName(String name) {
 		this.name = name;
@@ -36,9 +32,9 @@ void setName(String name) {
 	public List getGroups() {
 		return groups;
 	}
-	
+
 	void setGroups(List groups) {
 		this.groups = groups;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/Customer.java
index 3384b8732ca0..1424d31031e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
@@ -46,4 +44,3 @@ public void setOrgName(String orgName) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/CustomerId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/CustomerId.java
index c470e64001fd..400e55e9518a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/CustomerId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/CustomerId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/FavoriteCustomer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/FavoriteCustomer.java
index feab29c5565c..f85c69e89580 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/FavoriteCustomer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/FavoriteCustomer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java
index 8063f60a5dc6..ab60cbee128a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
@@ -292,4 +290,4 @@ public void setUser(Integer user) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java
index e7ea0a85187d..b7df91d6a731 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassHbmTest.java
index 27023f28be8e..9b8b926b11d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
@@ -39,7 +37,7 @@ public void testIdClass() {
 		s.persist(cust);
 		t.commit();
 		s.close();
-		
+
 		s = openSession();
 		CustomerId custId = new CustomerId("JBoss", "RouteOne");
 		t = s.beginTransaction();
@@ -48,7 +46,7 @@ public void testIdClass() {
 		assertEquals( cust.getCustomerName(), custId.getCustomerName() );
 		assertEquals( cust.getOrgName(), custId.getOrgName() );
 		t.commit();
-		s.close();		
+		s.close();
 
 		s = openSession();
 		t = s.beginTransaction();
@@ -65,12 +63,11 @@ public void testIdClass() {
 		assertEquals( "Detroit", cust.getAddress() );
 		assertEquals( cust.getCustomerName(), custId.getCustomerName() );
 		assertEquals( cust.getOrgName(), custId.getOrgName() );
-		
+
 		s.createQuery( "delete from Customer" ).executeUpdate();
-		
+
 		t.commit();
 		s.close();
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassPropertiesTest.java
index d9db8a540d67..7cc3c6bd7a31 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassPropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassPropertiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
@@ -11,7 +9,6 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java
index 31ec1684eb52..a5e39e13efad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
@@ -292,4 +290,4 @@ public void setUser(Integer user) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java
index f808d2a397e0..08d89edc9cac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idclass;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java
index 722785d3e07f..1bc258e6296c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneAbstractParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneAbstractParentTest.java
index b023cbdf719b..4b2499bbb592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneAbstractParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneAbstractParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java
index 6ee25481127d..f46a52e44606 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java
index 71cdef28b114..275af50b508f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java
index 352e09479297..762594e623dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idclass;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
index 564baa394e34..0c6253a5f679 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idclass;
 
 import jakarta.persistence.CascadeType;
@@ -23,100 +27,100 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 @DomainModel(
-        annotatedClasses = {
-                IdClassWithOneToOneTest.Task.class,
-                IdClassWithOneToOneTest.TaskText.class
-        }
+		annotatedClasses = {
+				IdClassWithOneToOneTest.Task.class,
+				IdClassWithOneToOneTest.TaskText.class
+		}
 )
 @SessionFactory(useCollectingStatementInspector = true)
 public class IdClassWithOneToOneTest {
 
-    @BeforeEach
-    void setup(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    Task task = new Task(new TaskText("en", "Localized in en"));
-                    session.persist( task );
-                }
-        );
-    }
-
-    @Test
-    public void testCreate(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    Task task = session.get(Task.class, 1L);
-                    assertThat( task.text.content, is( "Localized in en" ) );
-                    assertThat( task.text.locale, is( "en" ) );
-                }
-        );
-    }
-
-    @Entity
-    public static class Task {
-
-        @Id
-        @GeneratedValue
-        public Long id;
-
-        @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "task")
-        public TaskText text;
-
-        public Task() {}
-
-        public Task(TaskText text) {
-            this.text = text;
-            text.task = this;
-        }
-    }
-
-    @Entity
-    @IdClass(TaskText.TaskTextPK.class)
-    public static class TaskText {
-
-        public static class TaskTextPK implements Serializable {
-            public Long task;
-            public String locale;
-
-            public TaskTextPK() {}
-
-            public TaskTextPK(Long task, String locale) {
-                this.task = task;
-                this.locale = locale;
-            }
-
-            @Override
-            public boolean equals(Object obj) {
-                if (!(obj instanceof TaskTextPK)) {
-                    return false;
-                } else {
-                    TaskTextPK pk = (TaskTextPK) obj;
-                    return Objects.equals(task, pk.task) && locale.equals(pk.locale);
-                }
-            }
-
-            @Override
-            public int hashCode() {
-                return task.hashCode() + locale.hashCode();
-            }
-        }
-
-        public TaskText() {}
-
-        public TaskText(String locale, String content) {
-            this.locale = locale;
-            this.content = content;
-        }
-
-        @Id
-        @OneToOne(fetch = FetchType.EAGER)
-        @OnDelete(action = OnDeleteAction.CASCADE)
-        @JoinColumn(name = "id")
-        public Task task;
-
-        @Id
-        public String locale;
-
-        public String content;
-    }
+	@BeforeEach
+	void setup(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Task task = new Task(new TaskText("en", "Localized in en"));
+					session.persist( task );
+				}
+		);
+	}
+
+	@Test
+	public void testCreate(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Task task = session.get(Task.class, 1L);
+					assertThat( task.text.content, is( "Localized in en" ) );
+					assertThat( task.text.locale, is( "en" ) );
+				}
+		);
+	}
+
+	@Entity
+	public static class Task {
+
+		@Id
+		@GeneratedValue
+		public Long id;
+
+		@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "task")
+		public TaskText text;
+
+		public Task() {}
+
+		public Task(TaskText text) {
+			this.text = text;
+			text.task = this;
+		}
+	}
+
+	@Entity
+	@IdClass(TaskText.TaskTextPK.class)
+	public static class TaskText {
+
+		public static class TaskTextPK implements Serializable {
+			public Long task;
+			public String locale;
+
+			public TaskTextPK() {}
+
+			public TaskTextPK(Long task, String locale) {
+				this.task = task;
+				this.locale = locale;
+			}
+
+			@Override
+			public boolean equals(Object obj) {
+				if (!(obj instanceof TaskTextPK)) {
+					return false;
+				} else {
+					TaskTextPK pk = (TaskTextPK) obj;
+					return Objects.equals(task, pk.task) && locale.equals(pk.locale);
+				}
+			}
+
+			@Override
+			public int hashCode() {
+				return task.hashCode() + locale.hashCode();
+			}
+		}
+
+		public TaskText() {}
+
+		public TaskText(String locale, String content) {
+			this.locale = locale;
+			this.content = content;
+		}
+
+		@Id
+		@OneToOne(fetch = FetchType.EAGER)
+		@OnDelete(action = OnDeleteAction.CASCADE)
+		@JoinColumn(name = "id")
+		public Task task;
+
+		@Id
+		public String locale;
+
+		public String content;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdEmbeddableFieldsShouldThrowAnExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdEmbeddableFieldsShouldThrowAnExceptionTest.java
index c71a9ce05867..0bd08e09003b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdEmbeddableFieldsShouldThrowAnExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdEmbeddableFieldsShouldThrowAnExceptionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen;
 
 import org.hibernate.AnnotationException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdFieldsShouldThrowAnExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdFieldsShouldThrowAnExceptionTest.java
index 00d75e53baec..140fd15ce75f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdFieldsShouldThrowAnExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/GeneratorNotAppliedToIdFieldsShouldThrowAnExceptionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen;
 
 import org.hibernate.AnnotationException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java
index 52814fadd1c1..96b7ae049909 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.idgen;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
index 0b76ac4b52b3..04187d1aa233 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.biginteger.increment;
 
 import java.math.BigInteger;
 
-import org.hibernate.Session;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/Entity.java
index 5ae89dd18a71..2475945b3b10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.biginteger.increment;
 import java.math.BigInteger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
index 83aa73d8b4c5..40b0fcdff9c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.biginteger.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java
index 93e6cfb8bffc..c3de119365a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.idgen.biginteger.sequence;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/Entity.java
index dee42309a2a4..9cdb5ec72792 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.biginteger.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java
index f50c4ec49e9c..22742418fb8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
index 6684c17d815e..761080ab3df9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.auto;
 
@@ -27,7 +25,6 @@
 import org.hibernate.generator.Generator;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.IncrementGenerator;
-import org.hibernate.id.UUIDGenerator;
 import org.hibernate.id.enhanced.DatabaseStructure;
 import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.id.uuid.UuidGenerator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java
index 36233cf03e29..b900c6148812 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.forcedtable;
 
@@ -23,7 +21,6 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 @DomainModel(
 		xmlMappings = "org/hibernate/orm/test/idgen/enhanced/forcedtable/Basic.hbm.xml"
@@ -33,7 +30,7 @@ public class BasicForcedTableSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/Entity.java
index b10e8f8abc96..3b8c94c4dc69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.forcedtable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java
index cdbbac8812d1..5bfeb5585a92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.forcedtable;
 
@@ -30,7 +28,7 @@ public class HiLoForcedTableSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java
index 8c1a9c69f57e..1693c3144db4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.forcedtable;
 
@@ -32,7 +30,7 @@ public class PooledForcedTableSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        EntityPersister persister = scope.getSessionFactory()
+		EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java
index b8bc85600b9f..a2e8ff830248 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.sequence;
 
@@ -37,7 +35,7 @@ public class BasicSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getGenerator(), instanceOf( SequenceStyleGenerator.class ) );
@@ -68,7 +66,7 @@ public void testNormalBoundary(SessionFactoryScope scope) {
 	public void testSequencePerEntity(SessionFactoryScope scope) {
 		final String overriddenEntityName = "SpecialEntity";
 
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(overriddenEntityName);
 		assertThat( persister.getGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/Entity.java
index 49de319ab21b..8d19bff4a70a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.sequence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java
index 1411711e84d2..450b5d109566 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.sequence;
 
@@ -11,7 +9,6 @@
 import java.sql.Statement;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.GenericGenerator;
@@ -112,7 +109,7 @@ public void dropDatabaseSequence(SessionFactoryScope scope) {
 
 	@Test
 	public void testSequenceMismatchStrategyNotApplied(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(TestEntity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java
index 1d01bffada4c..b8868ab83e20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.sequence;
 
@@ -31,7 +29,7 @@ public class HiLoSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java
index 6b5beecbfe9e..cd06c8adc91f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.sequence;
 
@@ -32,7 +30,7 @@ public class PooledSequenceTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( SequenceStyleGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java
index a7890a0f5d8a..70c30b257181 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.table;
 
@@ -26,7 +24,7 @@ public class BasicTableTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getGenerator(), instanceOf( TableGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java
index 75ca07615eed..b005203d110d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.table;
 
 import java.util.Properties;
 
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
@@ -30,7 +27,6 @@
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.hibernate.testing.util.uuid.IdGeneratorCreationContext;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Entity.java
index 3a0f42fd61b1..34cbcad08b33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.table;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java
index 98249a9f9fc0..90b441b30a39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.table;
 
@@ -26,7 +24,7 @@
 public class HiLoTableTest {
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( TableGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java
index 98340063c441..e8f751154716 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.enhanced.table;
 
@@ -29,7 +27,7 @@ public class PooledTableTest {
 
 	@Test
 	public void testNormalBoundary(SessionFactoryScope scope) {
-        final EntityPersister persister = scope.getSessionFactory()
+		final EntityPersister persister = scope.getSessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Entity.class.getName());
 		assertThat( persister.getIdentifierGenerator(), instanceOf( TableGenerator.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java
index 768d956fb9a9..9a83a8b2ceab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.foreign;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java
index 163094a2da7b..f335368d24a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.foreign;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java
index a0bb805e520f..b6c475025670 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/CustomIdentityGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/CustomIdentityGenerator.java
index 6f15aa050e88..e44cc6f04c68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/CustomIdentityGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/CustomIdentityGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.hhh10429;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java
index ba32c3865310..00f7fcfd92ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.hhh10429;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java
index 11dd0241fe64..ae301ba8210c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.hhh9983;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java
index 9a90668471da..75101a3892f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.joinedSubClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java
index 8a05ca5b1d46..c3d6bc90b075 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.joinedSubClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java
index 80b039966ab2..f64e1268828b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.identity.joinedSubClass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
index a380ee43f1bb..258b7387755a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java
index 99d4f0d5e922..341a28805c10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.userdefined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGenerator.java
index 99491fde7818..588b28627ecb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGenerator.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import org.hibernate.boot.model.relational.Database;
@@ -15,86 +19,84 @@
 import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 import java.lang.reflect.Member;
 import java.util.EnumSet;
 import java.util.Properties;
 
 public class NativeGenerator
-        implements OnExecutionGenerator, BeforeExecutionGenerator, Configurable, ExportableProducer {
+		implements OnExecutionGenerator, BeforeExecutionGenerator, Configurable, ExportableProducer {
 
-    private final Generator generator;
+	private final Generator generator;
 
-    public NativeGenerator(NativeId nativeId, Member member, GeneratorCreationContext creationContext) {
+	public NativeGenerator(NativeId nativeId, Member member, GeneratorCreationContext creationContext) {
 		final String strategy = creationContext.getDatabase().getDialect().getNativeIdentifierGeneratorStrategy();
-        switch (strategy) {
-            case "sequence":
-                generator = new SequenceStyleGenerator();
-                break;
-            case "identity":
-                creationContext.getProperty().getValue().getColumns().get(0).setIdentity(true);
-                generator = new IdentityGenerator();
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
+		switch (strategy) {
+			case "sequence":
+				generator = new SequenceStyleGenerator();
+				break;
+			case "identity":
+				creationContext.getProperty().getValue().getColumns().get(0).setIdentity(true);
+				generator = new IdentityGenerator();
+				break;
+			default:
+				throw new IllegalArgumentException();
+		}
+	}
 
-    @Override
-    public EnumSet getEventTypes() {
-        return generator.getEventTypes();
-    }
+	@Override
+	public EnumSet getEventTypes() {
+		return generator.getEventTypes();
+	}
 
-    @Override
-    public boolean generatedOnExecution() {
-        return generator.generatedOnExecution();
-    }
+	@Override
+	public boolean generatedOnExecution() {
+		return generator.generatedOnExecution();
+	}
 
-    @Override
-    public void configure(GeneratorCreationContext creationContext, Properties parameters) {
-        if ( generator instanceof Configurable ) {
-            ((Configurable) generator).configure( creationContext, parameters );
-        }
-    }
+	@Override
+	public void configure(GeneratorCreationContext creationContext, Properties parameters) {
+		if ( generator instanceof Configurable ) {
+			((Configurable) generator).configure( creationContext, parameters );
+		}
+	}
 
-    @Override
-    public void registerExportables(Database database) {
-        if ( generator instanceof ExportableProducer ) {
-            ((ExportableProducer) generator).registerExportables(database);
-        }
-    }
+	@Override
+	public void registerExportables(Database database) {
+		if ( generator instanceof ExportableProducer ) {
+			((ExportableProducer) generator).registerExportables(database);
+		}
+	}
 
-    @Override
-    public void initialize(SqlStringGenerationContext context) {
-        if ( generator instanceof Configurable ) {
-            ((Configurable) generator).initialize(context);
-        }
-    }
+	@Override
+	public void initialize(SqlStringGenerationContext context) {
+		if ( generator instanceof Configurable ) {
+			((Configurable) generator).initialize(context);
+		}
+	}
 
-    @Override
-    public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
-        return ((BeforeExecutionGenerator) generator).generate(session, owner, currentValue, eventType);
-    }
+	@Override
+	public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
+		return ((BeforeExecutionGenerator) generator).generate(session, owner, currentValue, eventType);
+	}
 
-    @Override
-    public boolean referenceColumnsInSql(Dialect dialect) {
-        return ((OnExecutionGenerator) generator).referenceColumnsInSql(dialect);
-    }
+	@Override
+	public boolean referenceColumnsInSql(Dialect dialect) {
+		return ((OnExecutionGenerator) generator).referenceColumnsInSql(dialect);
+	}
 
-    @Override
-    public boolean writePropertyValue() {
-        return ((OnExecutionGenerator) generator).writePropertyValue();
-    }
+	@Override
+	public boolean writePropertyValue() {
+		return ((OnExecutionGenerator) generator).writePropertyValue();
+	}
 
-    @Override
-    public String[] getReferencedColumnValues(Dialect dialect) {
-        return ((OnExecutionGenerator) generator).getReferencedColumnValues(dialect);
-    }
+	@Override
+	public String[] getReferencedColumnValues(Dialect dialect) {
+		return ((OnExecutionGenerator) generator).getReferencedColumnValues(dialect);
+	}
 
-    @Override
-    public InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
-        return ((OnExecutionGenerator) generator).getGeneratedIdentifierDelegate(persister);
-    }
+	@Override
+	public InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
+		return ((OnExecutionGenerator) generator).getGeneratedIdentifierDelegate(persister);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGeneratorTest.java
index 9be55ebfab4b..ab788c255b37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeId.java
index 337a67f27c3e..b6dd4c494174 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/NativeId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import org.hibernate.annotations.IdGeneratorType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SequenceOrAssignedGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SequenceOrAssignedGeneratorTest.java
index a752c2c189fe..b46b88f27fff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SequenceOrAssignedGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SequenceOrAssignedGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.userdefined;
 
@@ -11,7 +9,6 @@
 import java.util.EnumSet;
 
 import org.hibernate.HibernateException;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.IdGeneratorType;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
@@ -24,11 +21,9 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java
index ad8fe83be70c..26c6ea746b66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleGenerator.java
index cacb350731f1..eb43bcf0cc18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleGenerator.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import java.util.EnumSet;
@@ -12,23 +16,23 @@
  */
 public class SimpleGenerator implements BeforeExecutionGenerator {
 
-    private final AtomicLong sequence;
+	private final AtomicLong sequence;
 
-    public SimpleGenerator(AtomicLong sequence) {
-        this.sequence = sequence;
-    }
+	public SimpleGenerator(AtomicLong sequence) {
+		this.sequence = sequence;
+	}
 
-    @Override
-    public Object generate(
-            SharedSessionContractImplementor session,
-            Object owner,
-            Object currentValue,
-            EventType eventType) {
-        return sequence.getAndIncrement();
-    }
+	@Override
+	public Object generate(
+			SharedSessionContractImplementor session,
+			Object owner,
+			Object currentValue,
+			EventType eventType) {
+		return sequence.getAndIncrement();
+	}
 
-    @Override
-    public EnumSet getEventTypes() {
-        return EnumSet.of( EventType.INSERT );
-    }
+	@Override
+	public EnumSet getEventTypes() {
+		return EnumSet.of( EventType.INSERT );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleId.java
index 7c26efbb1f81..49c6e5724428 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.idgen.userdefined;
 
 import java.lang.annotation.ElementType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java
index 6519612aa7f6..31dbc2fcaef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idgen.userdefined;
 
@@ -58,7 +56,7 @@ public class UserDefinedGeneratorsTests {
 
 	@Test
 	public void testCreateGeneratorsByBeanContainer() {
-		
+
 		final BeanContainer beanContainer = Mockito.mock( BeanContainer.class );
 		given(beanContainer.getBean( any(), any(), any() ) ).willAnswer( invocation -> {
 			LifecycleOptions options = (LifecycleOptions) invocation.getArguments()[1];
@@ -66,7 +64,7 @@ public void testCreateGeneratorsByBeanContainer() {
 			assertThat( options.useJpaCompliantCreation(), is( true ) );
 			return (ContainedBean) TestIdentifierGenerator::new;
 		} );
-		
+
 		final StandardServiceRegistryBuilder ssrb = ServiceRegistryUtil.serviceRegistryBuilder();
 		ssrb.applySetting( AvailableSettings.BEAN_CONTAINER, beanContainer )
 				.applySetting( AvailableSettings.ALLOW_EXTENSIONS_IN_CDI, "true" );
@@ -110,7 +108,7 @@ public static class Entity1 {
 		@GenericGenerator( name = "test", strategy = "org.hibernate.orm.test.idgen.userdefined.UserDefinedGeneratorsTests$TestIdentifierGenerator" )
 		private Integer id;
 	}
-	
+
 	@Entity( name = "Entity2" )
 	@Table( name = "tbl_2" )
 	public static class Entity2 {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java
index 9a254a1deea9..f2cf3c24cf00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java
index 7fd44ddaeda1..79059f0e0820 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java
index a65af3c19fca..96d7e8005590 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java
index d00ff0b034aa..47096de892c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java
index 74edbb5e1f54..ca545a748211 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 import org.hibernate.Session;
@@ -98,4 +96,4 @@ private long extractCount(Query query) {
 		return ( (Long) query.list().get( 0 ) ).longValue();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItem.java
index 0c619807b442..2e5abea69ba3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItemPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItemPK.java
index 1ae640e8992d..9edf29cb4163 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItemPK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/LineItemPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Order.java
index af19e5ff83b1..6f7a1c54cd9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Person.java
index ca6ca42dd31a..38e17afff006 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java
index c389bb9815dd..d48538478a5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java
index fbd7f926ed09..c1850f03d79f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java
index a6706b5593e2..709907365049 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java
index 013dac3eb0dd..29cbb4b91fad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java
index 5e5fe65a1cd3..ee112db29d67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java
index 00acb6db2038..7b21fc1e5924 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.idprops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java
index bbab9199650c..b3e55ee08312 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Contract.java 7222 2005-06-19 17:22:01Z oneovthafew $
 package org.hibernate.orm.test.immutable;
 
 import java.io.Serializable;
@@ -15,7 +11,7 @@
 import java.util.Set;
 
 public class Contract implements Serializable {
-	
+
 	private long id;
 	private long version;
 	private String customerName;
@@ -52,7 +48,7 @@ public long getVersion() {
 	public void setVersion(long version) {
 		this.version = version;
 	}
-	
+
 	public Set getPlans() {
 		return plans;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java
index 259b801e0c70..6dc53cb39322 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ContractVariation.java 7222 2005-06-19 17:22:01Z oneovthafew $
 package org.hibernate.orm.test.immutable;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 public class ContractVariation implements Serializable {
-	
+
 	private int version;
 	private Contract contract;
 	private String text;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java
index 647fa2a34029..beb9417a89fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable;
 
@@ -1492,4 +1490,3 @@ private void assertAllContractAndVariationsAreDeleted(SessionImplementor s) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Info.java
index 8926d62d01d8..89e1cb39a5d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Info.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Contract.java 7222 2005-06-19 17:22:01Z oneovthafew $
 package org.hibernate.orm.test.immutable;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Party.java
index 945587f04f60..647cf0740950 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Party.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Party.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Contract.java 7222 2005-06-19 17:22:01Z oneovthafew $
 package org.hibernate.orm.test.immutable;
 import java.io.Serializable;
 import java.util.HashSet;
@@ -34,7 +30,7 @@ public long getVersion() {
 	public void setVersion(long version) {
 		this.version = version;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Plan.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Plan.java
index 1fe003199b56..868b1756778a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Plan.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Plan.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ContractVariation.java 7222 2005-06-19 17:22:01Z oneovthafew $
 package org.hibernate.orm.test.immutable;
 
 import java.io.Serializable;
@@ -80,7 +76,7 @@ public void addContract(Contract contract) {
 	public void removeContract(Contract contract) {
 		if ( contract.getParent() != null ) {
 			contract.getParent().getSubcontracts().remove( contract );
-			contract.setParent( null );			
+			contract.setParent( null );
 		}
 		removeSubcontracts( contract );
 		contract.getPlans().remove( this );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
index 339d5826141b..7bd0f6d5848e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 
@@ -16,7 +14,6 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
 
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -64,8 +61,8 @@ protected void prepareTest(SessionFactoryScope scope) throws Exception {
 		catch (IllegalArgumentException ex) {
 			isPlanContractsBidirectional = false;
 		}
-        isPlanVersioned = sessionFactory.getMappingMetamodel().getEntityDescriptor(Plan.class.getName()).isVersioned();
-        isContractVersioned = sessionFactory.getMappingMetamodel().getEntityDescriptor(Contract.class.getName()).isVersioned();
+		isPlanVersioned = sessionFactory.getMappingMetamodel().getEntityDescriptor(Plan.class.getName()).isVersioned();
+		isContractVersioned = sessionFactory.getMappingMetamodel().getEntityDescriptor(Contract.class.getName()).isVersioned();
 		sessionFactory.getStatistics().clear();
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java
index f964563a8604..4571dc1fc520 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java
index bbf19eab076c..6b6bde58497f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
@@ -12,7 +10,7 @@
 import java.util.Set;
 
 public class Contract implements Serializable {
-	
+
 	private long id;
 	private long version;
 	private String customerName;
@@ -49,7 +47,7 @@ public long getVersion() {
 	public void setVersion(long version) {
 		this.version = version;
 	}
-	
+
 	public Set getPlans() {
 		return plans;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java
index c102eb63fe5a..0cfa9b8d53dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
@@ -10,7 +8,7 @@
 import java.util.Set;
 
 public class ContractVariation implements Serializable {
-	
+
 	private int id;
 	private Contract contract;
 	private String text;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Info.java
index 1fb888eb19cb..7ebadf272731 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java
index f73113278985..4c64bf5f995f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Party.java
index 708f8fff6d5a..fbb06c801021 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Party.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Party.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
@@ -32,7 +30,7 @@ public long getVersion() {
 	public void setVersion(long version) {
 		this.version = version;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Plan.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Plan.java
index 78c913fdc26f..462a911e0d8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Plan.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Plan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection;
 import java.io.Serializable;
@@ -78,7 +76,7 @@ public void addContract(Contract contract) {
 	public void removeContract(Contract contract) {
 		if ( contract.getParent() != null ) {
 			contract.getParent().getSubcontracts().remove( contract );
-			contract.setParent( null );			
+			contract.setParent( null );
 		}
 		removeSubcontracts( contract );
 		contract.getPlans().remove( this );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java
index c2a21345bee4..8c300400629c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java
index 1e758be33d81..233ce23201e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java
index 9627f1bca8d4..6eb2b515b6f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java
index bdf293457ec6..cd1279c215e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java
index 155809641dd3..44659cebd04b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java
index e54ab17db0a3..703a286be62d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java
index 414bfec6ded0..eba1e0a316e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java
index 59eeb7758f64..9557555585f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java
index ca6d7eca861d..3a922fac9483 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java
index 5f3bfdde0d17..056b05163213 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java
index f9ef75adbb31..952f6ccb33f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java
index b2023655ba9b..70b48b9a005b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java
index eec3f3d3959c..5c72a84d4252 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java
index 6d7cb4094378..e5fefd034310 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java
index bb82df9dbc55..b15bc9dc554e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java
index 901d16f0e548..2500445fbd6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.immutable.entitywithmutablecollection.noninverse;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTableForeignKeyGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTableForeignKeyGeneratorTest.java
index 68913d2ecc1e..0449d35b7842 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTableForeignKeyGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTableForeignKeyGeneratorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import jakarta.persistence.*;
@@ -18,78 +22,78 @@
  */
 @JiraKey("HHH-18470")
 @Jpa(
-        annotatedClasses = {
-                DenormalizedTableForeignKeyGeneratorTest.Employee.class,
-                DenormalizedTableForeignKeyGeneratorTest.Manager.class,
-                DenormalizedTableForeignKeyGeneratorTest.Address.class,
-                DenormalizedTableForeignKeyGeneratorTest.Territory.class
-        }
+		annotatedClasses = {
+				DenormalizedTableForeignKeyGeneratorTest.Employee.class,
+				DenormalizedTableForeignKeyGeneratorTest.Manager.class,
+				DenormalizedTableForeignKeyGeneratorTest.Address.class,
+				DenormalizedTableForeignKeyGeneratorTest.Territory.class
+		}
 )
 
 @RequiresDialect(H2Dialect.class)
 public class DenormalizedTableForeignKeyGeneratorTest {
 
-    @Test
-    public void shouldCreateForeignKeyForSubclasses(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    String managerQuery = "select CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS " +
-                            "WHERE TABLE_NAME='MANAGER' " +
-                            "AND CONSTRAINT_TYPE='FOREIGN KEY'";
-                    List managerForeignKeyNames = entityManager.createNativeQuery(managerQuery).getResultList();
+	@Test
+	public void shouldCreateForeignKeyForSubclasses(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					String managerQuery = "select CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS " +
+							"WHERE TABLE_NAME='MANAGER' " +
+							"AND CONSTRAINT_TYPE='FOREIGN KEY'";
+					List managerForeignKeyNames = entityManager.createNativeQuery(managerQuery).getResultList();
 
-                    String employeeQuery = "select CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS " +
-                            "WHERE TABLE_NAME='EMPLOYEE' " +
-                            "AND CONSTRAINT_TYPE='FOREIGN KEY'";
-                    String employeeForeignKeyName = entityManager.createNativeQuery(employeeQuery).getSingleResult().toString();
+					String employeeQuery = "select CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS " +
+							"WHERE TABLE_NAME='EMPLOYEE' " +
+							"AND CONSTRAINT_TYPE='FOREIGN KEY'";
+					String employeeForeignKeyName = entityManager.createNativeQuery(employeeQuery).getSingleResult().toString();
 
-                    assertThat(employeeForeignKeyName).isNotNull();
-                    assertThat(managerForeignKeyNames).isNotNull().hasSize(2);
-                    assertThat(managerForeignKeyNames).doesNotContain(employeeForeignKeyName);
-                }
-        );
-    }
+					assertThat(employeeForeignKeyName).isNotNull();
+					assertThat(managerForeignKeyNames).isNotNull().hasSize(2);
+					assertThat(managerForeignKeyNames).doesNotContain(employeeForeignKeyName);
+				}
+		);
+	}
 
-    @Entity(name = "Employee")
-    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-    static class Employee implements Serializable {
+	@Entity(name = "Employee")
+	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+	static class Employee implements Serializable {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
-        private Address address;
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+		private Address address;
 
-    }
+	}
 
-    @Entity(name = "Manager")
-    static class Manager extends Employee {
+	@Entity(name = "Manager")
+	static class Manager extends Employee {
 
-        @OneToOne(fetch = FetchType.EAGER, orphanRemoval = true, cascade = CascadeType.ALL)
-        private Territory territory;
-    }
+		@OneToOne(fetch = FetchType.EAGER, orphanRemoval = true, cascade = CascadeType.ALL)
+		private Territory territory;
+	}
 
-    @Entity(name = "Address")
-    static class Address {
+	@Entity(name = "Address")
+	static class Address {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @Column(nullable = false, columnDefinition = "TEXT")
-        private String address = "";
-    }
+		@Column(nullable = false, columnDefinition = "TEXT")
+		private String address = "";
+	}
 
-    @Entity(name = "Territory")
-    static class Territory {
+	@Entity(name = "Territory")
+	static class Territory {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        @Column
-        private String location = "";
-    }
+		@Column
+		private String location = "";
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java
index d229256846ea..d2c55bc9084a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorNotNullSingleTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorNotNullSingleTableTest.java
index 441973960cb9..ef9cf50e26fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorNotNullSingleTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorNotNullSingleTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java
index 932daf40d4f5..827aaa6d1537 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java
index 490a7196a073..efb35615ea27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceQueryGroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceQueryGroupByTest.java
index 56590e7cc0be..4096712e9e5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceQueryGroupByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceQueryGroupByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java
index b00849ebbcfe..e4584e495d2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
@@ -189,7 +187,7 @@ private static void assertCatInitialized(
 			if ( collection ) {
 				final List kittens = kittenContainer.getKittens();
 				if ( simpleInitialized && animal.getType().equals( CAT ) ||
-					 !simpleInitialized && animal.getType().equals( CAT_EMBEDDED ) ) {
+					!simpleInitialized && animal.getType().equals( CAT_EMBEDDED ) ) {
 					assertThat( Hibernate.isInitialized( kittens ) ).isTrue();
 					assertThat( kittens ).hasSizeBetween( 0, 1 );
 				}
@@ -200,7 +198,7 @@ private static void assertCatInitialized(
 			else {
 				final Kitten kitten = kittenContainer.getSingleKitten();
 				if ( simpleInitialized && animal.getType().equals( CAT ) ||
-					 !simpleInitialized && animal.getType().equals( CAT_EMBEDDED ) ) {
+					!simpleInitialized && animal.getType().equals( CAT_EMBEDDED ) ) {
 					assertThat( Hibernate.isInitialized( kitten ) ).isTrue();
 					assertThat( kitten.getName() ).isEqualTo( simpleInitialized ? "kitten_1" : "kitten_2" );
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTablePrimaryKeyJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTablePrimaryKeyJoinColumnTest.java
index 2780309fbf83..a3e2dad5aa54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTablePrimaryKeyJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTablePrimaryKeyJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTableTest.java
index b2646d67665e..bc4ecd12deb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCircularBiDirectionalFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCircularBiDirectionalFetchTest.java
index eff81038bdec..d3cd1eaa5645 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCircularBiDirectionalFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCircularBiDirectionalFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCollectionSameHierarchyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCollectionSameHierarchyTest.java
index 7861cd363792..f357cf940b58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCollectionSameHierarchyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceCollectionSameHierarchyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
@@ -134,5 +132,3 @@ public String getName() {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java
index 2bb42e5b74eb..1fc15d2016ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDiscriminatorRemovalByTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDiscriminatorRemovalByTypeTest.java
index d35bb6e57fdc..e70d5e428283 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDiscriminatorRemovalByTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDiscriminatorRemovalByTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceToOneSameHierarchyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceToOneSameHierarchyTest.java
index 98fcf3f18909..0e4f68aa37cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceToOneSameHierarchyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceToOneSameHierarchyTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatQueryTest.java
index 72aaaed55477..e6dc5d62443a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatedJoinNullnessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatedJoinNullnessTest.java
index e8a049144a34..2b0bec6044d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatedJoinNullnessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceTreatedJoinNullnessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java
index 271b4bff6ed3..6d73b9697a16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/LeftJoinFetchSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/LeftJoinFetchSubclassesTest.java
index 6b9485a741b9..0bce28215e8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/LeftJoinFetchSubclassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/LeftJoinFetchSubclassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java
index 3ac61804657b..0dc5b934971a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyJoinTableAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyJoinTableAndInheritanceTest.java
index cc91a901d2fa..f1130d9b432a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyJoinTableAndInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyJoinTableAndInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyTreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyTreatJoinTest.java
index 5e83f66318b1..da677ef9e406 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyTreatJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyTreatJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MapManyToManyTreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MapManyToManyTreatJoinTest.java
index e2266e10e41d..77089de5a2cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MapManyToManyTreatJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MapManyToManyTreatJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MappedSuperclassTest.java
index 64940df0cf6c..8c920c8de990 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MultiLevelInheritanceQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MultiLevelInheritanceQueryTest.java
index 327193211919..70f647da0c9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MultiLevelInheritanceQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MultiLevelInheritanceQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java
index 46167af321e5..4db9e5935d8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
@@ -21,7 +19,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyJoinedInheritanceAndDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyJoinedInheritanceAndDiscriminatorTest.java
index e5855eeec459..15d076a834db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyJoinedInheritanceAndDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyJoinedInheritanceAndDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingLeTableWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingLeTableWithEmbeddedIdTest.java
index d7a9d82dbf5b..0a166d05ff1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingLeTableWithEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingLeTableWithEmbeddedIdTest.java
@@ -1,10 +1,13 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.hibernate.orm.test.hql.CompositeIdEntity;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -13,7 +16,6 @@
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableDiscriminatorFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableDiscriminatorFormulaTest.java
index 5590fe9ecfb2..96991817832f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableDiscriminatorFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableDiscriminatorFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java
index e7927369c443..cf73cad6ac15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java
index 018c782cdfa6..cf335236e1f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableTest.java
index 4d4d6d171cd4..1f47ab4927c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TablePerClassTest.java
index cf486cfacaa9..2f98f8e18202 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TablePerClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TablePerClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ToOneSingleTableInheritanceAutoFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ToOneSingleTableInheritanceAutoFlushTest.java
index 085b114d50b2..b23f7f2acefe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ToOneSingleTableInheritanceAutoFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ToOneSingleTableInheritanceAutoFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java
index 95fed5001b2b..09a60e1a9290 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java
index 2bac4df39522..3afc7c04ce8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java
index 75b09d4939a1..4169842ef202 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java
index 0118fdd85461..85183c1702cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java
index 7c8dd4b9557e..5ee92b1f030c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatJoinOptimizationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatJoinOptimizationTest.java
index d4043068adaf..63ab74a06e5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatJoinOptimizationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatJoinOptimizationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftJoinInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftJoinInheritanceTest.java
index 4d52cb7f810f..84d7b1410397 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftJoinInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftJoinInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftPluralJoinInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftPluralJoinInheritanceTest.java
index e378774e4acb..3a983ad32165 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftPluralJoinInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedLeftPluralJoinInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedPluralJoinIsNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedPluralJoinIsNullTest.java
index 8326b428b7de..58ebebc2b8eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedPluralJoinIsNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedPluralJoinIsNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedSubclassSameTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedSubclassSameTypeTest.java
index af2c6b54ab8e..349d08b33579 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedSubclassSameTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TreatedSubclassSameTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/CaseStatementWithTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/CaseStatementWithTypeTest.java
index 9f452d2d0d80..fb9094bde28b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/CaseStatementWithTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/CaseStatementWithTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceDiscriminatorSelectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceDiscriminatorSelectionTest.java
index 932c6ae6ffa9..5a2035d021a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceDiscriminatorSelectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceDiscriminatorSelectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java
index 9df0f06fe477..488db2691595 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceForceDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceForceDiscriminatorTest.java
index a493068030e4..f7222095d260 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceForceDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceForceDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
@@ -204,4 +202,4 @@ public void addElement(ElementEntity element) {
 			elements.add( element );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java
index 34c8570519c5..2319cc57a615 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java
index 55e897fdd713..e54d641d7ba4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java
index 4218bb070857..328c221ad604 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java
@@ -1,276 +1,280 @@
-package org.hibernate.orm.test.inheritance.discriminator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.DiscriminatorColumn;
-import jakarta.persistence.DiscriminatorType;
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@DomainModel(
-		annotatedClasses = {
-				OneToManySubSelectFetchAndInheritanceTest.Parent.class,
-				OneToManySubSelectFetchAndInheritanceTest.AnotherParent.class,
-				OneToManySubSelectFetchAndInheritanceTest.SomeOtherParent.class,
-				OneToManySubSelectFetchAndInheritanceTest.Another.class,
-				OneToManySubSelectFetchAndInheritanceTest.SomeOther.class
-		}
-)
-@SessionFactory
-@JiraKey(value = "HHH-16258")
-public class OneToManySubSelectFetchAndInheritanceTest {
-
-	public static final String ANOTHER_PARENT_NAME = "another parent";
-	public static final String SOME_OTHER_PARENT_NAME = "some other";
-	public static final String ANOTHER_NAME = "another";
-	public static final String SOME_OTHER_NAME = "some other";
-
-	@BeforeEach
-	public void setUp(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					Another another = new Another( ANOTHER_NAME );
-					AnotherParent anotherParent = new AnotherParent( 1, ANOTHER_PARENT_NAME );
-
-					SomeOtherParent someOtherParent = new SomeOtherParent( 2, SOME_OTHER_PARENT_NAME );
-					anotherParent.addAnotherEntity( another );
-
-					session.persist( anotherParent );
-					session.persist( someOtherParent );
-				}
-		);
-	}
-
-	@Test
-	public void testInitializeCollection(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					List parents = session.createQuery(
-							"from Parent p order by p.id",
-							Parent.class
-					).list();
-
-					assertThat( parents ).hasSize( 2 );
-					assertThat( parents.get( 0 ) ).isInstanceOf( AnotherParent.class );
-
-					AnotherParent anotherParent = (AnotherParent) parents.get( 0 );
-					assertThat( anotherParent.getName() ).isEqualTo( ANOTHER_PARENT_NAME );
-
-					List anothers = anotherParent.getAnothers();
-					assertThat( anothers ).hasSize( 1 );
-
-					Another another = anothers.get( 0 );
-
-					assertThat( another.getName() ).isEqualTo( ANOTHER_NAME );
-					assertThat( another.getParent() ).isEqualTo( anotherParent );
-
-					assertThat( parents.get( 1 ) ).isInstanceOf( SomeOtherParent.class );
-
-					SomeOtherParent someOtherParent = (SomeOtherParent) parents.get( 1 );
-					assertThat( someOtherParent.getName() ).isEqualTo( SOME_OTHER_PARENT_NAME );
-					List someOthers = someOtherParent.getSomeOthers();
-					assertThat( someOthers ).hasSize( 0 );
-
-					someOtherParent.addSomeOtherEntity( new SomeOther( SOME_OTHER_NAME ) );
-				}
-		);
-
-		scope.inTransaction(
-				session -> {
-					List parents = session.createQuery(
-							"from Parent p order by p.id",
-							Parent.class
-					).list();
-
-					assertThat( parents ).hasSize( 2 );
-					assertThat( parents.get( 0 ) ).isInstanceOf( AnotherParent.class );
-
-					AnotherParent anotherParent = (AnotherParent) parents.get( 0 );
-					assertThat( anotherParent.getName() ).isEqualTo( ANOTHER_PARENT_NAME );
-					List anothers = anotherParent.getAnothers();
-					assertThat( anothers ).hasSize( 1 );
-
-					Another another = anothers.get( 0 );
-
-					assertThat( another.getName() ).isEqualTo( ANOTHER_NAME );
-					assertThat( another.getParent() ).isEqualTo( anotherParent );
-
-					assertThat( parents.get( 1 ) ).isInstanceOf( SomeOtherParent.class );
-
-					SomeOtherParent someOtherParent = (SomeOtherParent) parents.get( 1 );
-					assertThat( someOtherParent.getName() ).isEqualTo( SOME_OTHER_PARENT_NAME );
-					List someOthers = someOtherParent.getSomeOthers();
-					assertThat( someOthers ).hasSize( 1 );
-
-					SomeOther someOther = someOthers.get( 0 );
-					assertThat( someOther.getName() ).isEqualTo( SOME_OTHER_NAME );
-					assertThat( someOther.getParent() ).isEqualTo( someOtherParent );
-				}
-		);
-	}
-
-
-	@Entity(name = "Parent")
-	@Table(name = "PARENT_TABLE")
-	@DiscriminatorColumn(name = "DISC_COL", discriminatorType = DiscriminatorType.INTEGER)
-	@DiscriminatorValue("0")
-	public static class Parent {
-
-		@Id
-		Integer id;
-
-		String name;
-
-		public Parent() {
-		}
-
-		public Parent(Integer id, String name) {
-			this.id = id;
-			this.name = name;
-		}
-
-		public Integer getId() {
-			return id;
-		}
-
-		public String getName() {
-			return name;
-		}
-	}
-
-	@Entity(name = "AnotherParent")
-	@DiscriminatorValue("1")
-	public static class AnotherParent extends Parent {
-
-		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
-		@Fetch(FetchMode.SUBSELECT)
-		List anothers = new ArrayList<>();
-
-		public AnotherParent() {
-		}
-
-		public AnotherParent(Integer id, String name) {
-			super( id, name );
-		}
-
-		public List getAnothers() {
-			return anothers;
-		}
-
-		public void addAnotherEntity(Another another) {
-			this.anothers.add( another );
-			another.parent = this;
-		}
-	}
-
-	@Entity(name = "SomeOtherParent")
-	@DiscriminatorValue("2")
-	public static class SomeOtherParent extends Parent {
-
-		@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL)
-		@Fetch(FetchMode.SUBSELECT)
-		List someOthers = new ArrayList<>();
-
-		public SomeOtherParent() {
-		}
-
-		public SomeOtherParent(Integer id, String name) {
-			super( id, name );
-		}
-
-		public List getSomeOthers() {
-			return someOthers;
-		}
-
-		public void addSomeOtherEntity(SomeOther someOther) {
-			this.someOthers.add( someOther );
-			someOther.parent = this;
-		}
-	}
-
-	@Entity(name = "Another")
-	@Table(name = "ANOTHER_TABLE")
-	public static class Another {
-
-		@Id
-		@GeneratedValue
-		Integer id;
-
-		String name;
-
-		@ManyToOne
-		Parent parent;
-
-		public Another() {
-		}
-
-		public Another(String name) {
-			this.name = name;
-		}
-
-		public Integer getId() {
-			return id;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public Parent getParent() {
-			return parent;
-		}
-	}
-
-	@Entity(name = "SomeOther")
-	@Table(name = "SOMEOTHER_TABLE")
-	public static class SomeOther {
-
-		@Id
-		@GeneratedValue
-		Integer id;
-
-		String name;
-
-		@ManyToOne
-		Parent parent;
-
-		public SomeOther() {
-		}
-
-		public SomeOther(String name) {
-			this.name = name;
-		}
-
-		public Integer getId() {
-			return id;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public Parent getParent() {
-			return parent;
-		}
-	}
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.inheritance.discriminator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(
+		annotatedClasses = {
+				OneToManySubSelectFetchAndInheritanceTest.Parent.class,
+				OneToManySubSelectFetchAndInheritanceTest.AnotherParent.class,
+				OneToManySubSelectFetchAndInheritanceTest.SomeOtherParent.class,
+				OneToManySubSelectFetchAndInheritanceTest.Another.class,
+				OneToManySubSelectFetchAndInheritanceTest.SomeOther.class
+		}
+)
+@SessionFactory
+@JiraKey(value = "HHH-16258")
+public class OneToManySubSelectFetchAndInheritanceTest {
+
+	public static final String ANOTHER_PARENT_NAME = "another parent";
+	public static final String SOME_OTHER_PARENT_NAME = "some other";
+	public static final String ANOTHER_NAME = "another";
+	public static final String SOME_OTHER_NAME = "some other";
+
+	@BeforeEach
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Another another = new Another( ANOTHER_NAME );
+					AnotherParent anotherParent = new AnotherParent( 1, ANOTHER_PARENT_NAME );
+
+					SomeOtherParent someOtherParent = new SomeOtherParent( 2, SOME_OTHER_PARENT_NAME );
+					anotherParent.addAnotherEntity( another );
+
+					session.persist( anotherParent );
+					session.persist( someOtherParent );
+				}
+		);
+	}
+
+	@Test
+	public void testInitializeCollection(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					List parents = session.createQuery(
+							"from Parent p order by p.id",
+							Parent.class
+					).list();
+
+					assertThat( parents ).hasSize( 2 );
+					assertThat( parents.get( 0 ) ).isInstanceOf( AnotherParent.class );
+
+					AnotherParent anotherParent = (AnotherParent) parents.get( 0 );
+					assertThat( anotherParent.getName() ).isEqualTo( ANOTHER_PARENT_NAME );
+
+					List anothers = anotherParent.getAnothers();
+					assertThat( anothers ).hasSize( 1 );
+
+					Another another = anothers.get( 0 );
+
+					assertThat( another.getName() ).isEqualTo( ANOTHER_NAME );
+					assertThat( another.getParent() ).isEqualTo( anotherParent );
+
+					assertThat( parents.get( 1 ) ).isInstanceOf( SomeOtherParent.class );
+
+					SomeOtherParent someOtherParent = (SomeOtherParent) parents.get( 1 );
+					assertThat( someOtherParent.getName() ).isEqualTo( SOME_OTHER_PARENT_NAME );
+					List someOthers = someOtherParent.getSomeOthers();
+					assertThat( someOthers ).hasSize( 0 );
+
+					someOtherParent.addSomeOtherEntity( new SomeOther( SOME_OTHER_NAME ) );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					List parents = session.createQuery(
+							"from Parent p order by p.id",
+							Parent.class
+					).list();
+
+					assertThat( parents ).hasSize( 2 );
+					assertThat( parents.get( 0 ) ).isInstanceOf( AnotherParent.class );
+
+					AnotherParent anotherParent = (AnotherParent) parents.get( 0 );
+					assertThat( anotherParent.getName() ).isEqualTo( ANOTHER_PARENT_NAME );
+					List anothers = anotherParent.getAnothers();
+					assertThat( anothers ).hasSize( 1 );
+
+					Another another = anothers.get( 0 );
+
+					assertThat( another.getName() ).isEqualTo( ANOTHER_NAME );
+					assertThat( another.getParent() ).isEqualTo( anotherParent );
+
+					assertThat( parents.get( 1 ) ).isInstanceOf( SomeOtherParent.class );
+
+					SomeOtherParent someOtherParent = (SomeOtherParent) parents.get( 1 );
+					assertThat( someOtherParent.getName() ).isEqualTo( SOME_OTHER_PARENT_NAME );
+					List someOthers = someOtherParent.getSomeOthers();
+					assertThat( someOthers ).hasSize( 1 );
+
+					SomeOther someOther = someOthers.get( 0 );
+					assertThat( someOther.getName() ).isEqualTo( SOME_OTHER_NAME );
+					assertThat( someOther.getParent() ).isEqualTo( someOtherParent );
+				}
+		);
+	}
+
+
+	@Entity(name = "Parent")
+	@Table(name = "PARENT_TABLE")
+	@DiscriminatorColumn(name = "DISC_COL", discriminatorType = DiscriminatorType.INTEGER)
+	@DiscriminatorValue("0")
+	public static class Parent {
+
+		@Id
+		Integer id;
+
+		String name;
+
+		public Parent() {
+		}
+
+		public Parent(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+	}
+
+	@Entity(name = "AnotherParent")
+	@DiscriminatorValue("1")
+	public static class AnotherParent extends Parent {
+
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
+		@Fetch(FetchMode.SUBSELECT)
+		List anothers = new ArrayList<>();
+
+		public AnotherParent() {
+		}
+
+		public AnotherParent(Integer id, String name) {
+			super( id, name );
+		}
+
+		public List getAnothers() {
+			return anothers;
+		}
+
+		public void addAnotherEntity(Another another) {
+			this.anothers.add( another );
+			another.parent = this;
+		}
+	}
+
+	@Entity(name = "SomeOtherParent")
+	@DiscriminatorValue("2")
+	public static class SomeOtherParent extends Parent {
+
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL)
+		@Fetch(FetchMode.SUBSELECT)
+		List someOthers = new ArrayList<>();
+
+		public SomeOtherParent() {
+		}
+
+		public SomeOtherParent(Integer id, String name) {
+			super( id, name );
+		}
+
+		public List getSomeOthers() {
+			return someOthers;
+		}
+
+		public void addSomeOtherEntity(SomeOther someOther) {
+			this.someOthers.add( someOther );
+			someOther.parent = this;
+		}
+	}
+
+	@Entity(name = "Another")
+	@Table(name = "ANOTHER_TABLE")
+	public static class Another {
+
+		@Id
+		@GeneratedValue
+		Integer id;
+
+		String name;
+
+		@ManyToOne
+		Parent parent;
+
+		public Another() {
+		}
+
+		public Another(String name) {
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Parent getParent() {
+			return parent;
+		}
+	}
+
+	@Entity(name = "SomeOther")
+	@Table(name = "SOMEOTHER_TABLE")
+	public static class SomeOther {
+
+		@Id
+		@GeneratedValue
+		Integer id;
+
+		String name;
+
+		@ManyToOne
+		Parent parent;
+
+		public SomeOther() {
+		}
+
+		public SomeOther(String name) {
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Parent getParent() {
+			return parent;
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java
index 0faf74f7c515..5d6c5e670981 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
index c5a7eaf0cc4f..eb64b20d6463 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance.discriminator;
 
 import org.hibernate.annotations.JdbcTypeCode;
@@ -92,4 +96,3 @@ public void setPayload(T payload) {
 	public static class A extends B {
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java
index 86de4cc6c342..0cef97874c9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java
index 35b62c068192..a2a0c42130e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java
@@ -1,21 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
-import java.sql.Statement;
-import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
@@ -61,13 +55,13 @@ public void test(SessionFactoryScope scope) {
 
 			Val2Entity val2 = new Val2Entity();
 			val2.setId( 2L );
-			
+
 			RootEntity root = new RootEntity();
 			root.setId( 3L );
 
 			OtherEntity otherEntity = new OtherEntity();
 			otherEntity.setId( 4L );
-			
+
 			session.persist( val1 );
 			session.persist( val2 );
 			session.persist( root );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java
index 4668b3bf8c36..afd798103e66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java
index 352fbd85f9d2..ff49552c2dd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java
index 5d6574299e33..4cb854ab36f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java
index e8461c76ee91..2dec161eec03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/NestedOneToOneDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/NestedOneToOneDiscriminatorTest.java
index 99d30b620ec9..e22abfe01c15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/NestedOneToOneDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/NestedOneToOneDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyEagerDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyEagerDiscriminatorTest.java
index 158a36e28119..0f315320b88b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyEagerDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyEagerDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.associations;
 
@@ -27,7 +25,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyJoinFetchDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyJoinFetchDiscriminatorTest.java
index 0ddc414eb815..b2318245c51f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyJoinFetchDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/associations/OneToManyJoinFetchDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.associations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
index 1e7b42bee795..de08facef8fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
index 81905f3b1906..cdd0dc10edb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.embeddable;
 
@@ -28,7 +26,6 @@
 import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderColumn;
-import jakarta.persistence.Table;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
index bdea3c443b70..ea8ea7d1ff4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/Common.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/Common.java
index 8af03faece2c..8ef5b5a23280 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/Common.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/Common.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java
index fcaf5c8e8e78..7589b1a13eae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java
index 729d5dc23f83..bb9720660989 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java
index 2902ca925629..17749847e5f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java
index 5fc245dc97f8..1cb37cbb5d8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java
index 7c640c5291ba..5f1077a152f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java
index d9f2ae551dba..542178d37b12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java
index b7c1ea6f207a..a5748c570bb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntity.java
index 1341417a48e0..1cfa5559d2ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java
index 1ea9320e2d47..8e77e02053bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java
index 934bfcebc872..212bf56f43e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/BasicEmbeddableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/BasicEmbeddableInheritanceTest.java
index cd1c033d08ef..0584cdc737b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/BasicEmbeddableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/BasicEmbeddableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildOneEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildOneEmbeddable.java
index f46bd6aed0d0..79ee0e1e1c7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildOneEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildOneEmbeddable.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
-import org.hibernate.annotations.Imported;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildTwoEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildTwoEmbeddable.java
index 03cdc2dbe0ea..774f2dcccb7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildTwoEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ChildTwoEmbeddable.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
-import org.hibernate.annotations.Imported;
 
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ElementCollectionEmbeddableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ElementCollectionEmbeddableInheritanceTest.java
index f702373d11ee..e99571c40edc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ElementCollectionEmbeddableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ElementCollectionEmbeddableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritance2LCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritance2LCTest.java
index 77e22e215d61..13fdb61de9bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritance2LCTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritance2LCTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAssciationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAssciationsTest.java
index 2f19b7138cdc..15cc27708fe3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAssciationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAssciationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAttributeOverrideTest.java
index 2a6a098441b3..5a9d5af8b05e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceDiscriminatorFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceDiscriminatorFormulaTest.java
index 60d7f5749767..dd4d4c69ce8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceDiscriminatorFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceDiscriminatorFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceMappedSuperclassAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceMappedSuperclassAndGenericsTest.java
index 49700080f6ee..5098bd394f4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceMappedSuperclassAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableInheritanceMappedSuperclassAndGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableTypeAndTreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableTypeAndTreatTest.java
index 0d7cfbe88140..d8e64d5691e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableTypeAndTreatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/EmbeddableTypeAndTreatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JsonAggregateEmbeddableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JsonAggregateEmbeddableInheritanceTest.java
index b098f90539fa..e34c1236f6a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JsonAggregateEmbeddableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JsonAggregateEmbeddableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ParentEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ParentEmbeddable.java
index 139f6039232c..0b7659b3fa52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ParentEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/ParentEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SimpleEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SimpleEmbeddable.java
index 70166dfd115e..3e983c5272c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SimpleEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SimpleEmbeddable.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
-import org.hibernate.annotations.Imported;
 
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java
index 903911d5cb14..988fb8f52044 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SubChildOneEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SubChildOneEmbeddable.java
index b2ea4a704876..dc4ec10c5740 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SubChildOneEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/SubChildOneEmbeddable.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.embeddable;
 
-import org.hibernate.annotations.Imported;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/Inheriting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/Inheriting.java
index 51c02cdd4a2a..ebe8b82fd1ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/Inheriting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/Inheriting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.hhh16711;
 
@@ -21,4 +19,4 @@ class Inheriting extends Inherited {
 
 	Inheriting() {
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
index 1ac45d55894c..27348ac89e03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.hhh16711;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/otherPackage/Inherited.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/otherPackage/Inherited.java
index a9e3450e8270..5c69f88b6583 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/otherPackage/Inherited.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/otherPackage/Inherited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.hhh16711.otherPackage;
 
@@ -38,4 +36,4 @@ protected void setId(String id) {
 	protected void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
index c5ff0c9d3715..464ae783e19c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithNaturalJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithNaturalJoinedInheritanceTest.java
index 08ef6698e023..423b39c81ea3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithNaturalJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithNaturalJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java
index 4e64027d59e4..a020ddac8450 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithSingleTableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithSingleTableInheritanceTest.java
index 522f20baabcb..14660d0ce9e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithSingleTableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithSingleTableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithTablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithTablePerClassInheritanceTest.java
index 661be8dae292..b4980966d861 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithTablePerClassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithTablePerClassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithJoinedInheritanceTest.java
index af280f6efb8b..7ecef413b588 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithSingleTableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithSingleTableInheritanceTest.java
index 8b192aa32dc9..efe9ba563849 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithSingleTableInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithSingleTableInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithTablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithTablePerClassInheritanceTest.java
index 344b27c0ca1a..8c496f6442e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithTablePerClassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/EntityJoinWithTablePerClassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/JoinedHierarchyDiscIdSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/JoinedHierarchyDiscIdSelectTest.java
index d7e7dc3b8afc..26186a92463d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/JoinedHierarchyDiscIdSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/JoinedHierarchyDiscIdSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/ReloadMultipleCollectionElementsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/ReloadMultipleCollectionElementsTest.java
index 516bf16c9f33..d55604847871 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/ReloadMultipleCollectionElementsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/ReloadMultipleCollectionElementsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java
index 8713780a2d39..2840c63a4935 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.relationship;
 
@@ -135,4 +133,3 @@ public Town(Long id, String name, Integer population) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java
index 33cd760737fb..5dfe645a594d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.inheritance.relationship;
 
@@ -208,4 +206,3 @@ public void setDelayed(boolean delayed) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java
index 259246452b62..3bf3f24d7092 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance.repeatedtable;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedSubclassTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedSubclassTableTest.java
index 2b0c4b84e1c2..8553a44e84fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedSubclassTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedSubclassTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance.repeatedtable;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java
index d7e8751c1dda..d5e6a3437718 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.inheritance.repeatedtable;
 
 import org.hibernate.Session;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java
index 3786d0334d94..459e78821cb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.insertordering;
 
 import java.sql.PreparedStatement;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java
index f9c45cc6e276..9bf0057eb13b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java
index 9e0c387e3995..a7d121b394a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Group.java
index 8943475d8e32..1c2c3126dc5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java
index eae1d0ae51f4..5eb9c2b210b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
@@ -34,145 +32,145 @@
 @RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class InsertOrderingCircularDependencyFalsePositiveTest extends BaseNonConfigCoreFunctionalTestCase {
 
-    private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-            Wrapper.class,
-            Condition.class,
-            SimpleCondition.class,
-            Expression.class,
-            ConstantExpression.class,
-            Condition.class,
-            CompoundCondition.class,
-        };
-    }
-
-    @Override
-    protected void addSettings(Map settings) {
-        settings.put(Environment.ORDER_INSERTS, "true");
-        settings.put(Environment.ORDER_UPDATES, "true");
-        settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
-        settings.put(
-            org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-            connectionProvider
-        );
-    }
-
-    @Override
-    public void releaseResources() {
-        super.releaseResources();
-        connectionProvider.stop();
-    }
-
-    @Override
-    protected boolean rebuildSessionFactoryOnError() {
-        return false;
-    }
-
-    @Test
-    public void testBatching() throws SQLException {
-        doInHibernate(this::sessionFactory, session -> {
-            connectionProvider.clear();
-            // This should be persistable but currently reports that it might be circular
-            session.persist(Wrapper.create());
-        });
-    }
-
-    @Entity(name = "Wrapper")
-    public static class Wrapper {
-        @Id
-        private String id;
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        private Condition condition;
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        private Set constantExpressions;
-
-        public Wrapper() {
-        }
-
-        public static Wrapper create() {
-            final Wrapper w = new Wrapper();
-            final CompoundCondition cc = new CompoundCondition();
-            final SimpleCondition c1 = new SimpleCondition();
-            final SimpleCondition c2 = new SimpleCondition();
-            final ConstantExpression e1 = new ConstantExpression();
-            final ConstantExpression e2 = new ConstantExpression();
-            final ConstantExpression e3 = new ConstantExpression();
-            final ConstantExpression e4 = new ConstantExpression();
-            final ConstantExpression e5 = new ConstantExpression();
-            w.id = "w";
-            w.condition = cc;
-            cc.id = "cc";
-            cc.first = c1;
-            cc.second = c2;
-            c1.id = "c1";
-            c1.left = e1;
-            c1.right = e2;
-            c2.id = "c2";
-            c2.left = e3;
-            c2.right = e4;
-            e1.id = "e1";
-            e1.value = "e1";
-            e2.id = "e2";
-            e2.value = "e2";
-            e3.id = "e3";
-            e3.value = "e3";
-            e4.id = "e4";
-            e4.value = "e4";
-            e5.id = "e5";
-            e5.value = "e5";
-            w.constantExpressions = new HashSet<>();
-            w.constantExpressions.add(e5);
-            return w;
-        }
-    }
-
-    @Entity(name = "Condition")
+	private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+			Wrapper.class,
+			Condition.class,
+			SimpleCondition.class,
+			Expression.class,
+			ConstantExpression.class,
+			Condition.class,
+			CompoundCondition.class,
+		};
+	}
+
+	@Override
+	protected void addSettings(Map settings) {
+		settings.put(Environment.ORDER_INSERTS, "true");
+		settings.put(Environment.ORDER_UPDATES, "true");
+		settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
+		settings.put(
+			org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
+			connectionProvider
+		);
+	}
+
+	@Override
+	public void releaseResources() {
+		super.releaseResources();
+		connectionProvider.stop();
+	}
+
+	@Override
+	protected boolean rebuildSessionFactoryOnError() {
+		return false;
+	}
+
+	@Test
+	public void testBatching() throws SQLException {
+		doInHibernate(this::sessionFactory, session -> {
+			connectionProvider.clear();
+			// This should be persistable but currently reports that it might be circular
+			session.persist(Wrapper.create());
+		});
+	}
+
+	@Entity(name = "Wrapper")
+	public static class Wrapper {
+		@Id
+		private String id;
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		private Condition condition;
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		private Set constantExpressions;
+
+		public Wrapper() {
+		}
+
+		public static Wrapper create() {
+			final Wrapper w = new Wrapper();
+			final CompoundCondition cc = new CompoundCondition();
+			final SimpleCondition c1 = new SimpleCondition();
+			final SimpleCondition c2 = new SimpleCondition();
+			final ConstantExpression e1 = new ConstantExpression();
+			final ConstantExpression e2 = new ConstantExpression();
+			final ConstantExpression e3 = new ConstantExpression();
+			final ConstantExpression e4 = new ConstantExpression();
+			final ConstantExpression e5 = new ConstantExpression();
+			w.id = "w";
+			w.condition = cc;
+			cc.id = "cc";
+			cc.first = c1;
+			cc.second = c2;
+			c1.id = "c1";
+			c1.left = e1;
+			c1.right = e2;
+			c2.id = "c2";
+			c2.left = e3;
+			c2.right = e4;
+			e1.id = "e1";
+			e1.value = "e1";
+			e2.id = "e2";
+			e2.value = "e2";
+			e3.id = "e3";
+			e3.value = "e3";
+			e4.id = "e4";
+			e4.value = "e4";
+			e5.id = "e5";
+			e5.value = "e5";
+			w.constantExpressions = new HashSet<>();
+			w.constantExpressions.add(e5);
+			return w;
+		}
+	}
+
+	@Entity(name = "Condition")
 	@Table(name = "cond")
-    public static abstract class Condition {
-        @Id
-        protected String id;
-
-        public Condition() {
-        }
-    }
-    @Entity(name = "SimpleCondition")
-    public static class SimpleCondition extends Condition {
-        @OneToOne(cascade = CascadeType.ALL)
-        private Expression left;
-        @OneToOne(cascade = CascadeType.ALL)
-        private Expression right;
-
-        public SimpleCondition() {
-        }
-    }
-    @Entity(name = "Expression")
-    public static abstract class Expression {
-        @Id
-        protected String id;
-
-        protected Expression() {
-        }
-
-    }
-    @Entity(name = "ConstantExpression")
-    public static class ConstantExpression extends Expression {
-        @Column(name = "val")
-        private String value;
-
-        public ConstantExpression() {
-        }
-    }
-    @Entity(name = "CompoundCondition")
-    public static class CompoundCondition extends Condition {
-        @OneToOne(cascade = CascadeType.ALL)
-        protected Condition first;
-        @OneToOne(cascade = CascadeType.ALL)
-        protected Condition second;
-
-        public CompoundCondition() {
-        }
-    }
+	public static abstract class Condition {
+		@Id
+		protected String id;
+
+		public Condition() {
+		}
+	}
+	@Entity(name = "SimpleCondition")
+	public static class SimpleCondition extends Condition {
+		@OneToOne(cascade = CascadeType.ALL)
+		private Expression left;
+		@OneToOne(cascade = CascadeType.ALL)
+		private Expression right;
+
+		public SimpleCondition() {
+		}
+	}
+	@Entity(name = "Expression")
+	public static abstract class Expression {
+		@Id
+		protected String id;
+
+		protected Expression() {
+		}
+
+	}
+	@Entity(name = "ConstantExpression")
+	public static class ConstantExpression extends Expression {
+		@Column(name = "val")
+		private String value;
+
+		public ConstantExpression() {
+		}
+	}
+	@Entity(name = "CompoundCondition")
+	public static class CompoundCondition extends Condition {
+		@OneToOne(cascade = CascadeType.ALL)
+		protected Condition first;
+		@OneToOne(cascade = CascadeType.ALL)
+		protected Condition second;
+
+		public CompoundCondition() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java
index 9662380710f4..729d6d8a4948 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java
index d529f4caa1a6..7eb046a92412 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java
index 9cd35def32dd..2e4db7c1dd64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
 import org.hibernate.cfg.Environment;
-import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider;
-import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -43,2093 +39,2093 @@
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class)
 public class InsertOrderingRCATest extends BaseNonConfigCoreFunctionalTestCase {
 
-    private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-            WeightedCause.class,
-            TimeManipulation.class,
-            Symptom.class,
-            SimpleCondition.class,
-            RCATemplate.class,
-            ParameterExpression.class,
-            NumberedExpression.class,
-            MathExpression.class,
-            FieldExpression.class,
-            Expression.class,
-            ConstantExpression.class,
-            ConditionAndExpression.class,
-            ConditionalExpression.class,
-            Condition.class,
-            CompoundCondition.class,
-            Cause.class,
-            CalculationExpression.class,
-            AlertCondition.class,
-            BaseEntity.class
-        };
-    }
-
-    @Override
-    protected void addSettings(Map settings) {
-        settings.put(Environment.ORDER_INSERTS, "true");
-        settings.put(Environment.ORDER_UPDATES, "true");
-        settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
-        settings.put(
-            org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-            connectionProvider
-        );
-    }
-
-    @Override
-    public void releaseResources() {
-        super.releaseResources();
-        connectionProvider.stop();
-    }
-
-    @Override
-    protected boolean rebuildSessionFactoryOnError() {
-        return false;
-    }
-
-    @Test
-    public void testBatching() throws SQLException {
-        doInHibernate(this::sessionFactory, session -> {
-            connectionProvider.clear();
-            for (RCATemplate template : DefaultTemplatesVault.getDefaultRCATemplates()) {
-                session.persist(template);
-            }
-        });
-    }
-
-    @Entity(name = "WeightedCause")
-    @Table(name = "rca_weighted_cause")
-    public static class WeightedCause extends BaseEntity {
-        private Cause cause;
-        private Integer weight;
-
-        public WeightedCause() {
-        }
-
-        public WeightedCause(Cause cause, Integer weight) {
-            this.cause = cause;
-            this.weight = weight;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "cause_id")
-        public Cause getCause() {
-            return cause;
-        }
-
-        public void setCause(Cause cause) {
-            this.cause = cause;
-        }
-
-        public Integer getWeight() {
-            return weight;
-        }
-
-        public void setWeight(Integer weight) {
-            this.weight = weight;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            WeightedCause cause1 = (WeightedCause) o;
-
-            if (cause != null ? !cause.equals(cause1.cause) : cause1.cause != null) {
-                return false;
-            }
-            if (weight != null ? !weight.equals(cause1.weight) : cause1.weight != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (cause != null ? cause.hashCode() : 0);
-            result = 31 * result + (weight != null ? weight.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "TimeManipulation")
-    @Table(name = "rca_time_manipulation")
-    public static class TimeManipulation extends BaseEntity implements Serializable {
-        private ManipulationType type;
-        private MathOperator op;
-        private Long time;
-        private RelativeToType relativeToType;
-        private String paramName;
-
-        public TimeManipulation() {
-        }
-
-        public TimeManipulation(ManipulationType type, MathOperator op, Long time, RelativeToType relativeToType, String paramName) {
-            this.type = type;
-            this.op = op;
-            this.time = time;
-            this.relativeToType = relativeToType;
-            this.paramName = paramName;
-        }
-
-        public ManipulationType getType() {
-            return type;
-        }
-
-        public void setType(ManipulationType type) {
-            this.type = type;
-        }
-
-        public MathOperator getOp() {
-            return op;
-        }
-
-        public void setOp(MathOperator op) {
-            this.op = op;
-        }
-
-        public Long getTime() {
-            return time;
-        }
-
-        public void setTime(Long time) {
-            this.time = time;
-        }
-
-        public RelativeToType getRelativeToType() {
-            return relativeToType;
-        }
-
-        public void setRelativeToType(RelativeToType relativeToType) {
-            this.relativeToType = relativeToType;
-        }
-
-        public String getParamName() {
-            return paramName;
-        }
-
-        public void setParamName(String paramName) {
-            this.paramName = paramName;
-        }
-    }
-    @Entity(name = "Symptom")
-    @Table(name = "rca_symptom")
-    public static class Symptom extends BaseEntity implements Serializable {
-        private String name;
-        private String objectType;
-        private Condition condition;
-        private String nodeTypeString;
-        private String processTypeString;
-        private String filterString;
-
-        public Symptom() {
-        }
-
-        public Symptom(String name, String objectType, Condition condition) {
-            this.name = name;
-            this.objectType = objectType;
-            this.condition = condition;
-        }
-
-        public String getObjectType() {
-            return objectType;
-        }
-
-        public void setObjectType(String objectType) {
-            this.objectType = objectType;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "condition_id")
-        public Condition getCondition() {
-            return condition;
-        }
-
-        public void setCondition(Condition condition) {
-            this.condition = condition;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getNodeTypeString() {
-            return nodeTypeString;
-        }
-
-        public void setNodeTypeString(String nodeTypeString) {
-            this.nodeTypeString = nodeTypeString;
-        }
-
-        public String getProcessTypeString() {
-            return processTypeString;
-        }
-
-        public void setProcessTypeString(String processTypeString) {
-            this.processTypeString = processTypeString;
-        }
-
-        public String getFilterString() {
-            return filterString;
-        }
-
-        public void setFilterString(String filterString) {
-            this.filterString = filterString;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            Symptom symptom = (Symptom) o;
-
-            if (condition != null ? !condition.equals(symptom.condition) : symptom.condition != null) {
-                return false;
-            }
-            if (name != null ? !name.equals(symptom.name) : symptom.name != null) {
-                return false;
-            }
-            if (objectType != null ? !objectType.equals(symptom.objectType) : symptom.objectType != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (name != null ? name.hashCode() : 0);
-            result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
-            result = 31 * result + (condition != null ? condition.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "SimpleCondition")
-    public static class SimpleCondition extends Condition {
-        private Expression left;
-        private Operator op;
-        private Expression right;
-
-        public SimpleCondition() {
-        }
-
-        public SimpleCondition(Expression left, Operator op, Expression right) {
-            this.left = left;
-            this.op = op;
-            this.right = right;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "left_expression_id")
-        public Expression getLeft() {
-            return left;
-        }
-
-        public void setLeft(Expression left) {
-            this.left = left;
-        }
-
-        public Operator getOp() {
-            return op;
-        }
-
-        public void setOp(Operator op) {
-            this.op = op;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "right_expression_id")
-        public Expression getRight() {
-            return right;
-        }
-
-        public void setRight(Expression right) {
-            this.right = right;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            SimpleCondition that = (SimpleCondition) o;
-
-            if (left != null ? !left.equals(that.left) : that.left != null) {
-                return false;
-            }
-            if (op != that.op) {
-                return false;
-            }
-            if (right != null ? !right.equals(that.right) : that.right != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (left != null ? left.hashCode() : 0);
-            result = 31 * result + (op != null ? op.hashCode() : 0);
-            result = 31 * result + (right != null ? right.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "RCATemplate")
-    public static class RCATemplate extends BaseEntity {
-        private String name;
-        private Symptom symptom;
-        private Set possibleCauses;
-
-        public RCATemplate() {
-        }
-
-        public RCATemplate(String name, Symptom symptom, Set possibleCauses) {
-            this.name = name;
-            this.symptom = symptom;
-            this.possibleCauses = possibleCauses;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "symptom_id")
-        public Symptom getSymptom() {
-            return symptom;
-
-        }
-
-        public void setSymptom(Symptom symptom) {
-            this.symptom = symptom;
-        }
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinTable(name = "template_cause", joinColumns = {
-            @JoinColumn(name = "f_template_id")}, inverseJoinColumns = {
-            @JoinColumn(name = "f_cause_id")})
-        public Set getPossibleCauses() {
-            return possibleCauses;
-        }
-
-        public void setPossibleCauses(Set possibleCauses) {
-            this.possibleCauses = possibleCauses;
-        }
-
-    }
-    @Entity(name = "ParameterExpression")
-    public static class ParameterExpression extends Expression {
-        private String parameterName;
-        private String defaultValue;
-
-
-        public ParameterExpression() {
-        }
-
-        public ParameterExpression(String parameterName, String defaultValue, MetadataFieldType type) {
-            this.parameterName = parameterName;
-            this.defaultValue = defaultValue;
-            this.type = type;
-        }
-
-        public String getParameterName() {
-            return parameterName;
-        }
-
-        public void setParameterName(String parameterName) {
-            this.parameterName = parameterName;
-        }
-
-        public String getDefaultValue() {
-            return defaultValue;
-        }
-
-        public void setDefaultValue(String defaultValue) {
-            this.defaultValue = defaultValue;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            ParameterExpression that = (ParameterExpression) o;
-
-            if (defaultValue != null ? !defaultValue.equals(that.defaultValue) : that.defaultValue != null) {
-                return false;
-            }
-            if (parameterName != null ? !parameterName.equals(that.parameterName) : that.parameterName != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (parameterName != null ? parameterName.hashCode() : 0);
-            result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "NumberedExpression")
-    @Table(name = "rca_numbered_exception")
-    public static class NumberedExpression extends BaseEntity implements Comparable {
-        private Long num;
-        private Expression expression;
-
-        public NumberedExpression() {
-        }
-
-        public NumberedExpression(Long num, Expression expression) {
-            this.num = num;
-            this.expression = expression;
-        }
-
-        public Long getNum() {
-            return num;
-        }
-
-        public void setNum(Long num) {
-            this.num = num;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "num_expression_id")
-        public Expression getExpression() {
-            return expression;
-        }
-
-        public void setExpression(Expression expression) {
-            this.expression = expression;
-        }
-
-        @Override
-        public int compareTo(Object o) {
-            NumberedExpression other = (NumberedExpression) o;
-            return (int) (this.num - other.num);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            NumberedExpression that = (NumberedExpression) o;
-
-            if (expression != null ? !expression.equals(that.expression) : that.expression != null) {
-                return false;
-            }
-            if (num != null ? !num.equals(that.num) : that.num != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (num != null ? num.hashCode() : 0);
-            result = 31 * result + (expression != null ? expression.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "MathExpression")
-    public static class MathExpression extends Expression {
-        private Expression left;
-        private Expression right;
-        private MathOperator op;
-
-        public MathExpression() {
-        }
-
-        public MathExpression(Expression left, Expression right, MathOperator op) {
-            this.left = left;
-            this.right = right;
-            this.op = op;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "left_expression_id")
-        public Expression getLeft() {
-            return left;
-        }
-
-        public void setLeft(Expression left) {
-            this.left = left;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "right_expression_id")
-        public Expression getRight() {
-            return right;
-        }
-
-        public void setRight(Expression right) {
-            this.right = right;
-        }
-
-        public MathOperator getOp() {
-            return op;
-        }
-
-        public void setOp(MathOperator op) {
-            this.op = op;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            MathExpression that = (MathExpression) o;
-
-            if (left != null ? !left.equals(that.left) : that.left != null) {
-                return false;
-            }
-            if (op != that.op) {
-                return false;
-            }
-            if (right != null ? !right.equals(that.right) : that.right != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (left != null ? left.hashCode() : 0);
-            result = 31 * result + (right != null ? right.hashCode() : 0);
-            result = 31 * result + (op != null ? op.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "FieldExpression")
-    public static class FieldExpression extends Expression {
-        private String objectType;
-        private String name;
-
-        public FieldExpression() {
-        }
-
-        public FieldExpression(String objectType, String name) {
-            this.objectType = objectType;
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getObjectType() {
-            return objectType;
-        }
-
-        public void setObjectType(String objectType) {
-            this.objectType = objectType;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            FieldExpression that = (FieldExpression) o;
-
-            if (name != null ? !name.equals(that.name) : that.name != null) {
-                return false;
-            }
-            if (objectType != null ? !objectType.equals(that.objectType) : that.objectType != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
-            result = 31 * result + (name != null ? name.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "Expression")
-    @Table(name = "rca_expression")
-    public static abstract class Expression extends BaseEntity implements Serializable {
-        protected MetadataFieldType type;
-
-        protected Expression() {
-        }
-
-        protected Expression(MetadataFieldType type) {
-            this.type = type;
-        }
-
-        public MetadataFieldType getType() {
-            return type;
-        }
-
-        public void setType(MetadataFieldType type) {
-            this.type = type;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            Expression that = (Expression) o;
-
-            if (type != that.type) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (type != null ? type.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "ConstantExpression")
-    public static class ConstantExpression extends Expression {
-        private String value;
-
-        public ConstantExpression() {
-        }
-
-        public ConstantExpression(String value, MetadataFieldType type) {
-            super(type);
-            this.value = value;
-        }
-
-        @Column(name = "val")
-        public String getValue() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            ConstantExpression that = (ConstantExpression) o;
-
-            if (value != null ? !value.equals(that.value) : that.value != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (value != null ? value.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "ConditionAndExpression")
-    @Table(name = "rca_cond_and_expr")
-    public static class ConditionAndExpression extends BaseEntity {
-        private Condition condition;
-        private Expression expression;
-
-        public ConditionAndExpression() {
-        }
-
-        public ConditionAndExpression(Condition condition, Expression expression) {
-            this.condition = condition;
-            this.expression = expression;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "cond_cond_id")
-        public Condition getCondition() {
-            return condition;
-        }
-
-        public void setCondition(Condition condition) {
-            this.condition = condition;
-        }
-
-        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinColumn(name = "cond_expression_id")
-        public Expression getExpression() {
-            return expression;
-        }
-
-        public void setExpression(Expression expression) {
-            this.expression = expression;
-        }
-    }
-    @Entity(name = "ConditionalExpression")
-    public static class ConditionalExpression extends Expression {
-        private Set possibilities;
-
-        public ConditionalExpression() {
-        }
-
-        public ConditionalExpression(MetadataFieldType type, Set possibilities) {
-            super(type);
-            this.possibilities = possibilities;
-        }
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinTable(name = "rca_cond_posssibility", joinColumns = {
-            @JoinColumn(name = "f_cond_id")}, inverseJoinColumns = {
-            @JoinColumn(name = "f_pos_id")})
-        public Set getPossibilities() {
-            return possibilities;
-        }
-
-        public void setPossibilities(Set possibilities) {
-            this.possibilities = possibilities;
-        }
-    }
-    @Entity(name = "Condition")
-    @Table(name = "rca_condition")
-    public static abstract class Condition extends BaseEntity implements Serializable {
-    }
-    @Entity(name = "CompoundCondition")
-    public static class CompoundCondition extends Condition {
-        private Condition first;
-        private Condition second;
-        private LogicalOperator op;
-
-        public CompoundCondition() {
-        }
-
-        public CompoundCondition(Condition first, Condition second) {
-            this.first = first;
-            this.second = second;
-            this.op = LogicalOperator.AND;
-        }
-
-        public CompoundCondition(Condition first, Condition second, LogicalOperator op) {
-            this.first = first;
-            this.second = second;
-            this.op = op;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "first_id")
-        public Condition getFirst() {
-            return first;
-        }
-
-        public void setFirst(Condition first) {
-            this.first = first;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "second_id")
-        public Condition getSecond() {
-            return second;
-        }
-
-        public void setSecond(Condition second) {
-            this.second = second;
-        }
-
-        public LogicalOperator getOp() {
-            return op;
-        }
-
-        public void setOp(LogicalOperator op) {
-            this.op = op;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            CompoundCondition that = (CompoundCondition) o;
-
-            if (first != null ? !first.equals(that.first) : that.first != null) {
-                return false;
-            }
-            if (op != that.op) {
-                return false;
-            }
-            if (second != null ? !second.equals(that.second) : that.second != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (first != null ? first.hashCode() : 0);
-            result = 31 * result + (second != null ? second.hashCode() : 0);
-            result = 31 * result + (op != null ? op.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity
-    @Table(name = "rca_cause")
-    public static class Cause extends BaseEntity implements Serializable {
-        private String name;
-        private String nodeType;
-        private MappingRelationType relationType;
-        private Set fetchConditions;
-        private Condition condition;
-        private Condition auxCondition;
-        private String messageTemplate;
-        private String generalMessageTemplate;
-        private DataManipulationFunction function;
-        private Set messageTemplateParams;
-        private Set generalMessageTemplateParams;
-        private TimeManipulation startTimeManipulation;
-        private TimeManipulation endTimeManipulation;
-        private String plugin;
-
-        public Cause() {
-        }
-
-        public Cause(String name, String nodeType, MappingRelationType relationType, Set fetchConditions,
-                     Condition condition, String messageTemplate, DataManipulationFunction function, Set messageTemplateParams, String plugin) {
-            this.name = name;
-            this.nodeType = nodeType;
-            this.relationType = relationType;
-            this.fetchConditions = fetchConditions;
-            this.condition = condition;
-            this.messageTemplate = messageTemplate;
-            this.function = function;
-            this.messageTemplateParams = messageTemplateParams;
-            this.plugin = plugin;
-        }
-
-        public String getNodeType() {
-            return nodeType;
-        }
-
-        public void setNodeType(String nodeType) {
-            this.nodeType = nodeType;
-        }
-
-        public String getPlugin() {
-            return plugin;
-        }
-
-        public void setPlugin(String plugin) {
-            this.plugin = plugin;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "condition_id")
-        public Condition getCondition() {
-            return condition;
-        }
-
-        public void setCondition(Condition condition) {
-            this.condition = condition;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "aux_condition_id")
-        public Condition getAuxCondition() {
-            return auxCondition;
-        }
-
-        public void setAuxCondition(Condition auxCondition) {
-            this.auxCondition = auxCondition;
-        }
-
-        public String getMessageTemplate() {
-            return messageTemplate;
-        }
-
-        public void setMessageTemplate(String messageTemplate) {
-            this.messageTemplate = messageTemplate;
-        }
-
-        public String getGeneralMessageTemplate() {
-            return generalMessageTemplate;
-        }
-
-        public void setGeneralMessageTemplate(String generalMessageTemplate) {
-            this.generalMessageTemplate = generalMessageTemplate;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        @Column(name = "functionName")
-        public DataManipulationFunction getFunction() {
-            return function;
-        }
-
-        public void setFunction(DataManipulationFunction function) {
-            this.function = function;
-        }
-
-        public MappingRelationType getRelationType() {
-            return relationType;
-        }
-
-        public void setRelationType(MappingRelationType relationType) {
-            this.relationType = relationType;
-        }
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinTable(name = "rca_cause_param", joinColumns = {
-            @JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
-            @JoinColumn(name = "f_param_id")})
-        public Set getMessageTemplateParams() {
-            return messageTemplateParams;
-        }
-
-        public void setMessageTemplateParams(Set messageTemplateParams) {
-            this.messageTemplateParams = messageTemplateParams;
-        }
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinTable(name = "rca_cause_general_param", joinColumns = {
-            @JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
-            @JoinColumn(name = "f_param_id")})
-        public Set getGeneralMessageTemplateParams() {
-            return generalMessageTemplateParams;
-        }
-
-        public void setGeneralMessageTemplateParams(Set generalMessageTemplateParams) {
-            this.generalMessageTemplateParams = generalMessageTemplateParams;
-        }
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        @JoinTable(name = "rca_cause_fetch", joinColumns = {
-            @JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
-            @JoinColumn(name = "f_fetch_id")})
-        public Set getFetchConditions() {
-            return fetchConditions;
-        }
-
-        public void setFetchConditions(Set fetchConditions) {
-            this.fetchConditions = fetchConditions;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "start_time_manip_id")
-        public TimeManipulation getStartTimeManipulation() {
-            return startTimeManipulation;
-        }
-
-        public void setStartTimeManipulation(TimeManipulation startTimeManipulation) {
-            this.startTimeManipulation = startTimeManipulation;
-        }
-
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        @JoinColumn(name = "end_time_manip_id")
-        public TimeManipulation getEndTimeManipulation() {
-            return endTimeManipulation;
-        }
-
-        public void setEndTimeManipulation(TimeManipulation endTimeManipulation) {
-            this.endTimeManipulation = endTimeManipulation;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            Cause cause = (Cause) o;
-
-            if (function != cause.function) {
-                return false;
-            }
-            if (messageTemplate != null ? !messageTemplate.equals(cause.messageTemplate) : cause.messageTemplate != null) {
-                return false;
-            }
-            if (name != null ? !name.equals(cause.name) : cause.name != null) {
-                return false;
-            }
-            if (nodeType != null ? !nodeType.equals(cause.nodeType) : cause.nodeType != null) {
-                return false;
-            }
-            if (relationType != cause.relationType) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (name != null ? name.hashCode() : 0);
-            result = 31 * result + (nodeType != null ? nodeType.hashCode() : 0);
-            result = 31 * result + (relationType != null ? relationType.hashCode() : 0);
-            result = 31 * result + (messageTemplate != null ? messageTemplate.hashCode() : 0);
-            result = 31 * result + (function != null ? function.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "CalculationExpression")
-    public static class CalculationExpression extends Expression {
-        private DataManipulationFunction function;
-        private String objectType;
-        private String fieldName;
-
-        public CalculationExpression() {
-        }
-
-        public CalculationExpression(DataManipulationFunction function, String objectType, String fieldName) {
-            this.function = function;
-            this.objectType = objectType;
-            this.fieldName = fieldName;
-        }
-
-        @Column(name = "functionName")
-        public DataManipulationFunction getFunction() {
-            return function;
-        }
-
-        public void setFunction(DataManipulationFunction function) {
-            this.function = function;
-        }
-
-        public String getObjectType() {
-            return objectType;
-        }
-
-        public void setObjectType(String objectType) {
-            this.objectType = objectType;
-        }
-
-        public String getFieldName() {
-            return fieldName;
-        }
-
-        public void setFieldName(String fieldName) {
-            this.fieldName = fieldName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            CalculationExpression that = (CalculationExpression) o;
-
-            if (fieldName != null ? !fieldName.equals(that.fieldName) : that.fieldName != null) {
-                return false;
-            }
-            if (function != that.function) {
-                return false;
-            }
-            if (objectType != null ? !objectType.equals(that.objectType) : that.objectType != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (function != null ? function.hashCode() : 0);
-            result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
-            result = 31 * result + (fieldName != null ? fieldName.hashCode() : 0);
-            return result;
-        }
-    }
-    @Entity(name = "AlertCondition")
-    public static class AlertCondition extends Condition {
-        private String ruleName;
-
-        public AlertCondition() {
-        }
-
-        public String getRuleName() {
-            return ruleName;
-        }
-
-        public void setRuleName(String ruleName) {
-            this.ruleName = ruleName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            if (!super.equals(o)) {
-                return false;
-            }
-
-            AlertCondition that = (AlertCondition) o;
-
-            if (ruleName != null ? !ruleName.equals(that.ruleName) : that.ruleName != null) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + (ruleName != null ? ruleName.hashCode() : 0);
-            return result;
-        }
-    }
-    @MappedSuperclass
-    public static abstract class BaseEntity implements Serializable {
-        private Long id;
-
-        @Id
-        @Column(name = "f_id")
-        @GeneratedValue
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            BaseEntity that = (BaseEntity) o;
-
-            // noinspection SimplifiableIfStatement
-            if (id == null || that.id == null) {
-                return false; // null != everything (including null)
-            }
-            return id.equals(that.id);
-        }
-
-        @Override
-        public int hashCode() {
-            return id != null ? id.hashCode() : 0;
-        }
-
-    }
-
-    public enum RelativeToType {
-        START,
-        END
-    }
-
-    public enum Operator {
-        EQUALS(" = "),
-        NOT_EQUALS(" != "),
-        GREATER_THAN(" > "),
-        SMALLER_THAN(" < "),
-        CONTAINS(" contains "),
-        BEGINS_WITH(" begins with "),
-        ENDS_WITH(" ends with ");
-
-        private String readable;
-
-        private Operator(String readable) {
-            this.readable = readable;
-        }
-
-        @Override
-        public String toString() {
-            return readable;
-        }
-    }
-
-    public enum MathOperator {
-        ADD,
-        SUBTRACT,
-        MULTIPLY,
-        DIVIDE,
-        MAX;
-
-        @Override
-        public String toString() {
-            switch (this) {
-                case ADD:
-                    return "+";
-                case SUBTRACT:
-                    return "-";
-                case MULTIPLY:
-                    return "*";
-                case DIVIDE:
-                    return "/";
-                case MAX:
-                    return "max";
-            }
-            return null;
-        }
-
-
-    }
-
-    public enum ManipulationType {
-        MOVE_IT_BY_ABSOLUTE_TIME,
-        MOVE_IT_RELATIVE_TO_OTHER_TIME,
-        ABSOLUTE
-    }
-
-    public enum LogicalOperator {
-        AND,
-        OR
-    }
-
-    public enum MetadataFieldType {
-        BOOLEAN, STRING, NULL, NUMERIC
-    }
-
-    public enum DataManipulationFunction {
-        AVG,
-        MAX,
-        MIN,
-        COUNT,
-        SUM,
-        EXISTS,
-        LAST,
-        FIRST,
-        INCREASED_BY
-    }
-
-    public enum MappingRelationType {
-        JOB_BACKING_UP_HOST, JOB_USES_BACKUPCLIENT, JOB_USES_BACKUP_POOL, JOB_USES_MEDIA_SERVER, RECOVERPOINT_CG_COPY_ACTIVE_RPA, JOB_USES_TAPE_DRIVE
-    }
-
-    public static class DefaultTemplatesVault {
-
-        public static final String NO_AGENT_RAN_ON_CLIENT = "No agent ran on client";
-        public static final String BACKUP_AGENT_IS_DOWN_ON_BACKUP_CLIENT = "Backup agent is down on backup client";
-        public static final String BACKUP_FAILED_SYMPTOM_NAME = "Backup failed";
-        public static final String CG_COPY_RPO_VIOLATION_SYMPTOM_NAME = "CG Copy RPO Violation";
-        public static final String PACKET_LOSS = "Packet Loss";
-
-        private static RCATemplate buildBackupFailedTemplate() {
-            Symptom symptom = new Symptom(BACKUP_FAILED_SYMPTOM_NAME, "Backupjob",
-                new SimpleCondition(new FieldExpression("Backupjob", "status"), Operator.EQUALS, new ConstantExpression("failed", MetadataFieldType.STRING)));
-            symptom.setFilterString("status = 'failed'");
-            symptom.setNodeTypeString("clients");
-            symptom.setProcessTypeString("backup jobs");
-
-            // high client cpu                                                                                                               '
-            WeightedCause cause1 = buildHighClientCpu();
-
-            // high storage node cpu
-            WeightedCause cause2 = buildHighStorageNodeCpu();
-
-            // no space left on device
-            WeightedCause cause3 = buildNoSpaceOnPool();
-
-            // no space left on data domain
-            WeightedCause cause4 = buildNoSpaceOnDD();
-
-            // no agent ran on client
-            WeightedCause cause5 = buildNoAgentOnClient();
-
-            //  no agent ran on client
-            WeightedCause cause6 = buildNoAgentOnClient2();
-
-            // errors on tape
-            WeightedCause errorsOnTapeCause = buildErrorsOnTape();
-
-            //  switch port for ethernet
-            WeightedCause cause7 = buildPortSwitchForEthernet();
-
-            //  switch port for fibre channel
-            WeightedCause cause8 = buildPortSwitchForFibreChannel();
-
-            //  port settings for ethernet
-            WeightedCause cause9 = buildDifferentPortSettings();
-
-            //  no space on client
-            WeightedCause noSpaceOnClientCause = buildNoSpaceOnClient();
-
-            // todo -all other causes
-            Set causes = new HashSet<>();
-            causes.add(cause1);
-            causes.add(cause2);
-            causes.add(cause3);
-            causes.add(cause4);
-            causes.add(cause5);
-            causes.add(cause6);
-            //causes.add(errorsOnTapeCause);
-            causes.add(cause7);
-            causes.add(cause8);
-            causes.add(cause9);
-            causes.add(noSpaceOnClientCause);
-            return new RCATemplate("Backup failed RCA template", symptom, causes);
-        }
-
-        private static WeightedCause buildNoSpaceOnClient() {
-            Expression clientName = new FieldExpression("Host", "name");
-            NumberedExpression nameFirst = new NumberedExpression(1L, clientName);
-
-            Expression mountpointName = new FieldExpression("FilesystemConfig", "mountpoint");
-            NumberedExpression mountpointSecond = new NumberedExpression(2L, mountpointName);
-
-            Expression leftSpace = new MathExpression(new FieldExpression("FilesystemConfig", "totalSpace"),
-                new FieldExpression("FilesystemStatus", "usedSpace"),
-                MathOperator.SUBTRACT);
-            ParameterExpression leftSpaceOnClient = new ParameterExpression("leftSpaceOnClient", "50", MetadataFieldType.NUMERIC);
-            NumberedExpression spaceThird = new NumberedExpression(3L, leftSpace);
-
-
-            Set messageArgs = new HashSet<>();
-            messageArgs.add(nameFirst);
-            messageArgs.add(mountpointSecond);
-            messageArgs.add(spaceThird);
-
-            Condition fetchCondition1 = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("FilesystemStatus", "mountpoint"), Operator.EQUALS, new ConstantExpression("C:", MetadataFieldType.STRING)),
-                new SimpleCondition(new FieldExpression("FilesystemStatus", "agentId"), Operator.EQUALS, new FieldExpression("Host", "id"))
-            );
-            Condition fetchCondition2 = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("FilesystemConfig", "mountpoint"), Operator.EQUALS, new ConstantExpression("C:", MetadataFieldType.STRING)),
-                new SimpleCondition(new FieldExpression("FilesystemConfig", "agentId"), Operator.EQUALS, new FieldExpression("Host", "id"))
-            );
-
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition1);
-            fetchConditions.add(fetchCondition2);
-
-            SimpleCondition condition = new SimpleCondition(leftSpace, Operator.SMALLER_THAN, leftSpaceOnClient);
-
-            Cause noSpaceOnClient = new Cause("No space on Client", "Host", MappingRelationType.JOB_BACKING_UP_HOST,
-                fetchConditions, condition, "There is a lack of free space in {param}:{param}. The current free space is {param} MB", DataManipulationFunction.LAST, messageArgs, null);
-
-            return new WeightedCause(noSpaceOnClient, 95);
-        }
-
-        private static WeightedCause buildErrorsOnTape() {
-
-            Expression tapeDriveNameExp = new FieldExpression("TapeDrive", "name");
-            NumberedExpression tapeDriveName = new NumberedExpression(1L, tapeDriveNameExp);
-
-            Expression errorsExp = new FieldExpression("TapedriveStatus", "correctedReadErrors");
-
-            Set messageArgs = new HashSet<>();
-            messageArgs.add(tapeDriveName);
-
-            Condition fetchCondition = new SimpleCondition(new FieldExpression("TapedriveStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("TapeDrive", "id"));
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition);
-
-            ConstantExpression zero = new ConstantExpression("0", MetadataFieldType.NUMERIC);
-
-            Cause errorsOnTape = new Cause("Errors on tape", "TapeDrive", MappingRelationType.JOB_USES_TAPE_DRIVE, fetchConditions,
-                new CompoundCondition(
-                    new CompoundCondition(
-                        new CompoundCondition(
-                            new SimpleCondition(new FieldExpression("TapedriveStatus", "correctedReadErrors"), Operator.GREATER_THAN, zero),
-                            new SimpleCondition(new FieldExpression("TapedriveStatus", "correctedWriteErrors"), Operator.GREATER_THAN, zero),
-                            LogicalOperator.OR),
-                        new SimpleCondition(new FieldExpression("TapedriveStatus", "uncorrectedReadErrors"), Operator.GREATER_THAN, zero),
-                        LogicalOperator.OR),
-                    new SimpleCondition(new FieldExpression("TapedriveStatus", "uncorrectedWriteErrors"), Operator.GREATER_THAN, zero),
-                    LogicalOperator.OR),
-                "Tape drive {param} had errors", DataManipulationFunction.INCREASED_BY, messageArgs, null);
-            return new WeightedCause(errorsOnTape, 70);
-        }
-
-        private static WeightedCause buildNoSpaceOnDD() {
-            Expression ddName = new FieldExpression("DataDomain", "name");
-            NumberedExpression ddFirst = new NumberedExpression(1L, ddName);
-
-
-            Expression ddUsage = new MathExpression(new MathExpression(
-                new FieldExpression("FilesystemStatus", "usedSpace"),
-                new FieldExpression("FilesystemConfig", "totalSpace"),
-                MathOperator.DIVIDE
-            ),
-                new ConstantExpression("100", MetadataFieldType.NUMERIC), MathOperator.MULTIPLY);
-            NumberedExpression ddSecond = new NumberedExpression(2L, ddUsage);
-            ParameterExpression ddUsageThreshold = new ParameterExpression("ddUsageThreshold", "80", MetadataFieldType.NUMERIC);
-            NumberedExpression ddThird = new NumberedExpression(3L, ddUsageThreshold);
-            Set messageArgs4 = new HashSet<>();
-            messageArgs4.add(ddFirst);
-            messageArgs4.add(ddSecond);
-            messageArgs4.add(ddThird);
-
-            Condition fetchCondition4 = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("FilesystemStatus", "mountpoint"), Operator.EQUALS, new ConstantExpression("Data", MetadataFieldType.STRING)),
-                new SimpleCondition(new FieldExpression("FilesystemStatus", "agentId"), Operator.EQUALS, new FieldExpression("DataDomain", "id"))
-            );
-            Condition fetchCondition5 = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("FilesystemConfig", "mountpoint"), Operator.EQUALS, new ConstantExpression("Data", MetadataFieldType.STRING)),
-                new SimpleCondition(new FieldExpression("FilesystemConfig", "agentId"), Operator.EQUALS, new FieldExpression("DataDomain", "id"))
-            );
-            Set fetchConditions4 = new HashSet<>();
-            fetchConditions4.add(fetchCondition4);
-            fetchConditions4.add(fetchCondition5);
-
-            Cause noSpaceOnDD = new Cause("No space on data domain", "DataDomain", MappingRelationType.JOB_USES_BACKUPCLIENT,
-                fetchConditions4, new SimpleCondition(ddUsage, Operator.GREATER_THAN, ddUsageThreshold),
-                "The capacity utilization for DataDomain {param} is {param}% which is the above threshold {param}%", DataManipulationFunction.LAST, messageArgs4, null);
-
-            noSpaceOnDD.setGeneralMessageTemplate("The capacity utilization for DataDomain {param} is the above threshold {param}%");
-
-            Set generalMessageParams = new HashSet<>();
-            generalMessageParams.add(ddFirst);
-            NumberedExpression ddThirdWhichIsNowSecond = new NumberedExpression(2L, new ParameterExpression("ddUsageThreshold", "80", MetadataFieldType.NUMERIC));
-            generalMessageParams.add(ddThirdWhichIsNowSecond);
-            noSpaceOnDD.setGeneralMessageTemplateParams(generalMessageParams);
-
-            return new WeightedCause(noSpaceOnDD, 90);
-        }
-
-        private static WeightedCause buildNoSpaceOnPool() {
-            Expression poolName = new FieldExpression("BackupPool", "name");
-            NumberedExpression deviceFirst = new NumberedExpression(1L, poolName);
-            Expression numOfEmptyVolumes = new CalculationExpression(DataManipulationFunction.COUNT, "VolumeStatus", "id");
-            NumberedExpression deviceSecond = new NumberedExpression(2L, numOfEmptyVolumes);
-            Set messageArgs3 = new HashSet<>();
-            messageArgs3.add(deviceFirst);
-            messageArgs3.add(deviceSecond);
-
-            Condition fetchCondition3 = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("VolumeStatus", "pool"), Operator.EQUALS, new FieldExpression("BackupPool", "name")),
-                new SimpleCondition(new FieldExpression("VolumeStatus", "agentId"), Operator.EQUALS, new FieldExpression("Backupjob", "agentId"))
-            );
-            Set fetchConditions3 = new HashSet<>();
-            fetchConditions3.add(fetchCondition3);
-
-            ConstantExpression threshold = new ConstantExpression("5", MetadataFieldType.NUMERIC);
-            Cause noSpaceOnDevice = new Cause("No space left on device", "BackupPool", MappingRelationType.JOB_USES_BACKUP_POOL,
-                fetchConditions3,
-                new SimpleCondition(
-                    new FieldExpression("VolumeStatus", "state"),
-                    Operator.SMALLER_THAN,
-                    threshold),
-                "Pool {param} has only {param} empty volumes left", DataManipulationFunction.COUNT, messageArgs3, null);
-            noSpaceOnDevice.setAuxCondition(new SimpleCondition(new FieldExpression("VolumeStatus", "state"),
-                Operator.EQUALS, new ConstantExpression("Empty", MetadataFieldType.STRING)));
-
-            noSpaceOnDevice.setGeneralMessageTemplate("Pool {param} has less than {param} empty volumes left");
-            Set generalMessageParams = new HashSet<>();
-            generalMessageParams.add(deviceFirst);
-            generalMessageParams.add(new NumberedExpression(2L, threshold));
-            noSpaceOnDevice.setGeneralMessageTemplateParams(generalMessageParams);
-
-            return new WeightedCause(noSpaceOnDevice, 80);
-        }
-
-        private static WeightedCause buildHighStorageNodeCpu() {
-            Expression storageName = new FieldExpression("Host", "name");
-            NumberedExpression storageFirst = new NumberedExpression(1L, storageName);
-            Expression avgCpuStorage = new CalculationExpression(DataManipulationFunction.AVG, "HostStatus", "cpuUsed");
-            NumberedExpression storageSecond = new NumberedExpression(2L, avgCpuStorage);
-            Set messageArgs2 = new HashSet<>();
-            messageArgs2.add(storageFirst);
-            messageArgs2.add(storageSecond);
-
-            Condition fetchCondition2 = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("Host", "id"));
-            Set fetchConditions2 = new HashSet<>();
-            fetchConditions2.add(fetchCondition2);
-
-            ParameterExpression storageNodeHighCPUThreshold = new ParameterExpression("storageNodeHighCPUThreshold", "95", MetadataFieldType.NUMERIC);
-            Cause highCpuOnStorageNode = new Cause("High storage node CPU", "Host", MappingRelationType.JOB_USES_MEDIA_SERVER,
-                fetchConditions2,
-                new SimpleCondition(new FieldExpression("HostStatus", "cpuUsed"), Operator.GREATER_THAN,
-                    storageNodeHighCPUThreshold), "Storage node {param} CPU was {param}", DataManipulationFunction.AVG,
-                messageArgs2, null);
-            TimeManipulation startTimeManipulation = new TimeManipulation(ManipulationType.MOVE_IT_RELATIVE_TO_OTHER_TIME,
-                MathOperator.SUBTRACT, 3600L, RelativeToType.END, "job_cpu_offset");
-            highCpuOnStorageNode.setStartTimeManipulation(startTimeManipulation);
-
-            highCpuOnStorageNode.setGeneralMessageTemplate("Storage node {param} CPU was higher than {param}");
-            Set generalMessageParams = new HashSet<>();
-            generalMessageParams.add(storageFirst);
-            generalMessageParams.add(new NumberedExpression(2L, storageNodeHighCPUThreshold));
-            highCpuOnStorageNode.setGeneralMessageTemplateParams(generalMessageParams);
-
-            return new WeightedCause(highCpuOnStorageNode, 60);
-        }
-
-        private static WeightedCause buildHighClientCpu() {
-            Expression clientName = new FieldExpression("Host", "name");
-            NumberedExpression clientFirst = new NumberedExpression(1L, clientName);
-            Expression avgCpu = new CalculationExpression(DataManipulationFunction.AVG, "HostStatus", "cpuUsed");
-            NumberedExpression clientSecond = new NumberedExpression(2L, avgCpu);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(clientFirst);
-            messageArgs1.add(clientSecond);
-
-            Condition fetchCondition = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("Host", "id"));
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition);
-
-
-            ParameterExpression clientHighCPUThreshold = new ParameterExpression("clientHighCPUThreshold", "95", MetadataFieldType.NUMERIC);
-            Cause highCpuOnClient = new Cause("High client CPU", "Host", MappingRelationType.JOB_BACKING_UP_HOST,
-                new HashSet<>(fetchConditions),
-                new SimpleCondition(new FieldExpression("HostStatus", "cpuUsed"), Operator.GREATER_THAN,
-                    clientHighCPUThreshold), "Client {param} CPU was {param}", DataManipulationFunction.AVG,
-                messageArgs1, null);
-
-            TimeManipulation startTimeManipulation = new TimeManipulation(ManipulationType.MOVE_IT_RELATIVE_TO_OTHER_TIME,
-                MathOperator.SUBTRACT, 3600L, RelativeToType.END, "job_cpu_offset");
-            highCpuOnClient.setStartTimeManipulation(startTimeManipulation);
-
-            highCpuOnClient.setGeneralMessageTemplate("Client {param} CPU was higher than {param}");
-            Set generalMessageParams = new HashSet<>();
-            generalMessageParams.add(clientFirst);
-            generalMessageParams.add(new NumberedExpression(2L, clientHighCPUThreshold));
-            highCpuOnClient.setGeneralMessageTemplateParams(generalMessageParams);
-
-            return new WeightedCause(highCpuOnClient, 50);
-        }
-
-        private static WeightedCause buildNoAgentOnClient() {
-            Expression clientName = new FieldExpression("Host", "name");
-            NumberedExpression clientFirst = new NumberedExpression(1L, clientName);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(clientFirst);
-
-            Condition fetchHostStatus = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("Host", "id"));
-
-            ConditionAndExpression netbackup = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("NetBackupModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("bpinetd", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression networker = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("NetWorkerModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("nsrexecd", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression backupExec = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("BackupExecModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("beremote", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression dataProtector = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("DataProtectorModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("omniinet", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression tsm = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("TSMModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("dsmcsvc", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression arcServe = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("ArcserveModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("UnivAgent", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression commVault = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("CommvaultModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("evmgrc", MetadataFieldType.STRING)
-            );
-
-            ConditionAndExpression avamar = new ConditionAndExpression(
-                new SimpleCondition(
-                    new FieldExpression("Backupjob", "module"),
-                    Operator.EQUALS,
-                    new ConstantExpression("AvamarModule", MetadataFieldType.STRING)
-                ),
-                new ConstantExpression("avagent", MetadataFieldType.STRING)
-            );
-
-            Set possibilities = new HashSet<>();
-            possibilities.add(netbackup);
-            possibilities.add(networker);
-            possibilities.add(backupExec);
-            possibilities.add(dataProtector);
-            possibilities.add(tsm);
-            possibilities.add(arcServe);
-            possibilities.add(commVault);
-            possibilities.add(avamar);
-
-            Condition fetchProcessStatus = new CompoundCondition(
-                new SimpleCondition(new FieldExpression("ProcessStatus", "nodeId"),
-                    Operator.EQUALS, new FieldExpression("Host", "id")),
-                new SimpleCondition(new FieldExpression("ProcessStatus", "name"),
-                    Operator.CONTAINS, new ConditionalExpression(MetadataFieldType.STRING, possibilities)),
-                LogicalOperator.AND
-            );
-
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchHostStatus);
-            fetchConditions.add(fetchProcessStatus);
-
-            Condition condition = new CompoundCondition(
-                new SimpleCondition(
-                    new CalculationExpression(DataManipulationFunction.COUNT, "HostStatus", "id"),
-                    Operator.GREATER_THAN,
-                    new ConstantExpression("0", MetadataFieldType.NUMERIC)
-                ),
-                new SimpleCondition(
-                    new CalculationExpression(DataManipulationFunction.COUNT, "ProcessStatus", "id"),
-                    Operator.EQUALS,
-                    new ConstantExpression("0", MetadataFieldType.NUMERIC)
-                ),
-                LogicalOperator.AND
-            );
-
-            Cause noAgentOnClient = new Cause(
-                NO_AGENT_RAN_ON_CLIENT, "Host", MappingRelationType.JOB_BACKING_UP_HOST,
-                fetchConditions, condition, "Backup agent was down on host: {param}", DataManipulationFunction.LAST,
-                messageArgs1, null);
-
-            return new WeightedCause(noAgentOnClient, 100);
-        }
-
-        private static WeightedCause buildNoAgentOnClient2() {
-
-            Expression agentName = new FieldExpression("BackupClient", "name");
-            NumberedExpression agentFirst = new NumberedExpression(1L, agentName);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(agentFirst);
-
-            Condition fetchCondition6 = new SimpleCondition(new FieldExpression("ClientStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("BackupClient", "id"));
-
-            Set fetchConditions6 = new HashSet<>();
-            fetchConditions6.add(fetchCondition6);
-
-
-            Cause AgentDown = new Cause(BACKUP_AGENT_IS_DOWN_ON_BACKUP_CLIENT, "BackupClient", MappingRelationType.JOB_USES_BACKUPCLIENT,
-                fetchConditions6,
-                new CompoundCondition(
-                    new SimpleCondition(new FieldExpression("ClientStatus", "responding"), Operator.EQUALS, new ConstantExpression("true", MetadataFieldType.BOOLEAN)),
-                    new SimpleCondition(new FieldExpression("ClientStatus", "daemonRunning"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN))),
-                "Backup agent {param} is down on backup client", DataManipulationFunction.LAST, messageArgs1, null);
-
-            return new WeightedCause(AgentDown, 101);
-        }
-
-        private static WeightedCause buildPortSwitchForEthernet() {
-            Expression portName = new FieldExpression("EthernetPort", "name");
-            Expression nodeType = new FieldExpression("NetintStatus", "module");
-            Expression nodeName = new FieldExpression("NetintStatus", "agentName");
-            NumberedExpression portNameFirst = new NumberedExpression(1L, portName);
-            NumberedExpression nodeTypeSecond = new NumberedExpression(2L, nodeType);
-            NumberedExpression nodeNameThird = new NumberedExpression(3L, nodeName);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(portNameFirst);
-            messageArgs1.add(nodeTypeSecond);
-            messageArgs1.add(nodeNameThird);
-
-            Condition fetchCondition7 = new SimpleCondition(new FieldExpression("NetintStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
-
-            Set fetchConditions7 = new HashSet<>();
-            fetchConditions7.add(fetchCondition7);
-
-
-            Cause SwitchPortDown = new Cause("Switch port is down for ethernet", "EthernetPort", null,
-                fetchConditions7,
-                new SimpleCondition(new FieldExpression("NetintStatus", "linkup"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN)),
-                "Ethernet port:{param} for {param}:{param} is down", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCAPortSwitchIsDownPlugin");
-
-            return new WeightedCause(SwitchPortDown, 61);
-        }
-
-
-        private static WeightedCause buildDifferentPortSettings() {
-            Set messageArgs1 = new HashSet<>();
-
-            Condition fetchCondition1 = new SimpleCondition(new FieldExpression("NetintStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
-
-            Condition fetchCondition2 = new SimpleCondition(new FieldExpression("NetintConfig", "nodeId"),
-                Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
-
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition1);
-            fetchConditions.add(fetchCondition2);
-
-            Cause PortSettings = new Cause("Different Port Settings", "EthernetPort", null,
-                fetchConditions,
-                new SimpleCondition(new FieldExpression("NetintStatus", "speed"), Operator.NOT_EQUALS,
-                    new ConstantExpression("0", MetadataFieldType.NUMERIC)),
-                "", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCASwitchSettingsPlugin");
-
-            return new WeightedCause(PortSettings, 63);
-        }
-
-
-        private static WeightedCause buildPortSwitchForFibreChannel() {
-            Expression portName = new FieldExpression("FibreChannelPort", "name");
-            Expression nodeType = new FieldExpression("FcportStatus", "module");
-            Expression nodeName = new FieldExpression("FcportStatus", "agentName");
-            NumberedExpression portNameFirst = new NumberedExpression(1L, portName);
-            NumberedExpression nodeTypeSecond = new NumberedExpression(2L, nodeType);
-            NumberedExpression nodeNameThird = new NumberedExpression(3L, nodeName);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(portNameFirst);
-            messageArgs1.add(nodeTypeSecond);
-            messageArgs1.add(nodeNameThird);
-
-            Condition fetchCondition7 = new SimpleCondition(new FieldExpression("FcportStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("FibreChannelPort", "id"));
-
-            Set fetchConditions7 = new HashSet<>();
-            fetchConditions7.add(fetchCondition7);
-
-
-            Cause SwitchPortDown = new Cause("Switch port is down for fibre channel", "FibreChannelPort", null,
-                fetchConditions7,
-                new SimpleCondition(new FieldExpression("FcportStatus", "linkup"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN)),
-                "Fibre channel port:{param} for {param}:{param} is down", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCAPortSwitchIsDownPlugin");
-
-            return new WeightedCause(SwitchPortDown, 60);
-
-        }
-
-
-        private static RCATemplate buildRPAHighLoadTemplate() {
-            Symptom symptom = new Symptom("CG Copy high load", "CgCopyPerf",
-                new SimpleCondition(new FieldExpression("CgCopyPerf", "highLoadTime"), Operator.GREATER_THAN, new ConstantExpression("0", MetadataFieldType.NUMERIC)));
-            symptom.setFilterString("highLoadTime > 0");
-            symptom.setNodeTypeString("cg copies");
-            symptom.setProcessTypeString("replications");
-
-
-            WeightedCause cause1 = buildHighRPAThroughput();
-            WeightedCause cause2 = buildCGCopyFF();
-            WeightedCause cause3 = buildPacketLoss();
-
-            Set causes = new HashSet<>();
-            causes.add(cause1);
-            causes.add(cause2);
-            causes.add(cause3);
-
-            return new RCATemplate("CG copy High load template", symptom, causes);
-        }
-
-        private static WeightedCause buildHighRPAThroughput() {
-
-            ParameterExpression highThroughputThreshold = new ParameterExpression("highThroughputThreshold", "122880", MetadataFieldType.NUMERIC);
-            ConstantExpression megaSize = new ConstantExpression("1024", MetadataFieldType.NUMERIC);
-
-            Expression agentName = new FieldExpression("RpaPerfView", "agentName");
-            NumberedExpression rpaFirst = new NumberedExpression(1L, agentName);
-            Expression rpaName = new FieldExpression("AbstractRecoverPointAppliance", "name");
-            NumberedExpression rpaSecond = new NumberedExpression(2L, rpaName);
-            Expression site = new FieldExpression("RpaPerfView", "site");
-            NumberedExpression rpaThird = new NumberedExpression(3L, site);
-
-            MathExpression multiplyWanCompression = new MathExpression(
-                new FieldExpression("RpaPerfView", "wanThroughput"),
-                new FieldExpression("RpaPerfView", "compression"),
-                MathOperator.MULTIPLY);
-
-            Expression wanThroughput = new MathExpression(new FieldExpression("RpaPerfView", "wanThroughput"), multiplyWanCompression, MathOperator.MAX);
-            Expression maxThroughput = new MathExpression(new FieldExpression("RpaPerfView", "sanThroughput"), wanThroughput, MathOperator.MAX);
-            Expression maxThroughputMB = new MathExpression(maxThroughput, megaSize, MathOperator.DIVIDE);
-            NumberedExpression rpaFourth = new NumberedExpression(4L, maxThroughputMB);
-            Expression limitThroughputMB = new MathExpression(highThroughputThreshold, megaSize, MathOperator.DIVIDE);
-            NumberedExpression rpaFifth = new NumberedExpression(5L, limitThroughputMB);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(rpaFirst);
-            messageArgs1.add(rpaSecond);
-            messageArgs1.add(rpaThird);
-            messageArgs1.add(rpaFourth);
-            messageArgs1.add(rpaFifth);
-
-            Condition fetchCondition = new SimpleCondition(new FieldExpression("RpaPerfView", "nodeId"),
-                Operator.EQUALS, new FieldExpression("AbstractRecoverPointAppliance", "id"));
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition);
-
-
-            ///(san != null and san>120) || (wan != null and (((compression = null || compression = 0) and wan > 120) || ((compression != null and compression != 0) and wan*compression > 120)))
-            Condition condition = new CompoundCondition(
-                new CompoundCondition(
-                    new SimpleCondition(new FieldExpression("RpaPerfView", "sanThroughput"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
-                    new SimpleCondition(new FieldExpression("RpaPerfView", "sanThroughput"), Operator.GREATER_THAN, highThroughputThreshold),
-                    LogicalOperator.AND),
-                new CompoundCondition(
-                    new SimpleCondition(new FieldExpression("RpaPerfView", "wanThroughput"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
-                    new CompoundCondition(
-                        new CompoundCondition(
-                            new SimpleCondition(new FieldExpression("RpaPerfView", "wanThroughput"), Operator.GREATER_THAN, highThroughputThreshold),
-                            new CompoundCondition(
-                                new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
-                                new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.EQUALS, new ConstantExpression("0", MetadataFieldType.NUMERIC)),
-                                LogicalOperator.OR),
-                            LogicalOperator.AND),
-                        new CompoundCondition(
-                            new CompoundCondition(
-                                new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
-                                new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.NOT_EQUALS, new ConstantExpression("0", MetadataFieldType.NUMERIC)),
-                                LogicalOperator.AND),
-                            new SimpleCondition(multiplyWanCompression, Operator.GREATER_THAN, highThroughputThreshold),
-                            LogicalOperator.AND),
-                        LogicalOperator.OR),
-                    LogicalOperator.AND),
-                LogicalOperator.OR);
-
-            Cause rpaThroughputHigh = new Cause("High RPA throughput", "AbstractRecoverPointAppliance", MappingRelationType.RECOVERPOINT_CG_COPY_ACTIVE_RPA,
-                fetchConditions, condition, "The throughput for RPA: {param}:{param} at site {param} was {param}MB, above the RPA throughput limitation ({param}MB)", DataManipulationFunction.EXISTS,
-                messageArgs1, null);
-
-            TimeManipulation startTimeManipulation = new TimeManipulation(
-                ManipulationType.MOVE_IT_BY_ABSOLUTE_TIME,
-                MathOperator.SUBTRACT,
-                5 * 60L,
-                null,
-                "rpa_throughput_offset"
-            );
-            rpaThroughputHigh.setStartTimeManipulation(startTimeManipulation);
-
-            rpaThroughputHigh.setGeneralMessageTemplate("The throughput for RPA: {param}:{param} at site {param} was above the RPA throughput limitation ({param}MB)");
-            Set generalMessageParams = new HashSet<>();
-            generalMessageParams.add(rpaFirst);
-            generalMessageParams.add(rpaSecond);
-            generalMessageParams.add(rpaThird);
-            NumberedExpression rpaFifthWichIsNowForth = new NumberedExpression(4L, new MathExpression(highThroughputThreshold, megaSize, MathOperator.DIVIDE));
-            generalMessageParams.add(rpaFifthWichIsNowForth);
-            rpaThroughputHigh.setGeneralMessageTemplateParams(generalMessageParams);
-
-            WeightedCause cause = new WeightedCause(rpaThroughputHigh, 100);
-            return cause;
-        }
-
-        private static WeightedCause buildCGCopyFF() {
-            Expression cgCopyName = new FieldExpression("AbstractRecoverPointConsistencyGroupCopy", "name");
-            NumberedExpression cgCopyFirst = new NumberedExpression(1L, cgCopyName);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(cgCopyFirst);
-
-            Condition fetchCondition = new SimpleCondition(new FieldExpression("CgCopyStatus", "nodeId"),
-                Operator.EQUALS, new FieldExpression("AbstractRecoverPointConsistencyGroupCopy", "id"));
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition);
-
-            Condition condition =
-                new CompoundCondition(
-                    new SimpleCondition(new FieldExpression("CgCopyStatus", "journalMode"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
-                    new SimpleCondition(new FieldExpression("CgCopyStatus", "journalMode"), Operator.EQUALS, new ConstantExpression("Fast Forward", MetadataFieldType.STRING)),
-                    LogicalOperator.AND);
-
-            Cause rpaFastForward = new Cause("High RPA throughput", "AbstractRecoverPointConsistencyGroupCopy", null,
-                fetchConditions, condition, "Cg Copy {param} has a high latency on writing to remote storage (Fast Forward)", DataManipulationFunction.EXISTS,
-                messageArgs1, null);
-
-            WeightedCause cause = new WeightedCause(rpaFastForward, 80);
-            return cause;
-        }
-
-        private static RCATemplate buildRPOViolationTemplate() {
-            Symptom symptom = new Symptom(CG_COPY_RPO_VIOLATION_SYMPTOM_NAME, "AnalysisAlert",
-                new CompoundCondition(
-                    // todo - check state - not closed, currently don't bother
-                    new SimpleCondition(new FieldExpression("AnalysisAlert", "message"), Operator.EQUALS, new ConstantExpression("RPO Violation", MetadataFieldType.STRING)),
-                    new SimpleCondition(new FieldExpression("AnalysisAlert", "component"), Operator.CONTAINS, new ConstantExpression("CG Copy", MetadataFieldType.STRING))
-                )
-            );
-            symptom.setFilterString("message = 'RPO Violation' AND component like '%CG Copy%'");
-            symptom.setNodeTypeString("cg copies");
-            symptom.setProcessTypeString("replications");
-
-
-            WeightedCause cause1 = buildHighRPAThroughput();
-            WeightedCause cause2 = buildCGCopyFF();
-            WeightedCause cause3 = buildPacketLoss();
-
-            Set causes = new HashSet<>();
-            causes.add(cause1);
-            causes.add(cause2);
-            causes.add(cause3);
-
-            return new RCATemplate("CG copy RPO Violation template", symptom, causes);
-        }
-
-        private static WeightedCause buildPacketLoss() {
-
-            Expression packetLossSize = new FieldExpression("RpaPerfView", "packetLoss");
-            NumberedExpression clientFirst = new NumberedExpression(1L, packetLossSize);
-            Set messageArgs1 = new HashSet<>();
-            messageArgs1.add(clientFirst);
-
-            Condition fetchCondition = new SimpleCondition(new FieldExpression("RpaPerfView", "nodeId"),
-                Operator.EQUALS, new FieldExpression("AbstractRecoverPointAppliance", "id"));
-            Set fetchConditions = new HashSet<>();
-            fetchConditions.add(fetchCondition);
-            Condition condition = new SimpleCondition(new FieldExpression("RpaPerfView", "packetLoss"), Operator.GREATER_THAN,
-                new ConstantExpression("1", MetadataFieldType.NUMERIC));
-
-            Cause packetLoss = new Cause(PACKET_LOSS, "AbstractRecoverPointAppliance", MappingRelationType.RECOVERPOINT_CG_COPY_ACTIVE_RPA,
-                fetchConditions, condition,
-                "There is a bottleneck on the bandwidth. Found packet-loss ({param}) on the link.", DataManipulationFunction.EXISTS,
-                messageArgs1, null);
-
-            packetLoss.setGeneralMessageTemplate("There is a bottleneck on the bandwidth. Found packet-loss (>1) on the link.");
-
-            return new WeightedCause(packetLoss, 200);
-        }
-
-        public static List getDefaultRCATemplates() {
-            return Arrays.asList(buildBackupFailedTemplate(), buildRPAHighLoadTemplate(), buildRPOViolationTemplate());
-        }
-
-    }
+	private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+			WeightedCause.class,
+			TimeManipulation.class,
+			Symptom.class,
+			SimpleCondition.class,
+			RCATemplate.class,
+			ParameterExpression.class,
+			NumberedExpression.class,
+			MathExpression.class,
+			FieldExpression.class,
+			Expression.class,
+			ConstantExpression.class,
+			ConditionAndExpression.class,
+			ConditionalExpression.class,
+			Condition.class,
+			CompoundCondition.class,
+			Cause.class,
+			CalculationExpression.class,
+			AlertCondition.class,
+			BaseEntity.class
+		};
+	}
+
+	@Override
+	protected void addSettings(Map settings) {
+		settings.put(Environment.ORDER_INSERTS, "true");
+		settings.put(Environment.ORDER_UPDATES, "true");
+		settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
+		settings.put(
+			org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
+			connectionProvider
+		);
+	}
+
+	@Override
+	public void releaseResources() {
+		super.releaseResources();
+		connectionProvider.stop();
+	}
+
+	@Override
+	protected boolean rebuildSessionFactoryOnError() {
+		return false;
+	}
+
+	@Test
+	public void testBatching() throws SQLException {
+		doInHibernate(this::sessionFactory, session -> {
+			connectionProvider.clear();
+			for (RCATemplate template : DefaultTemplatesVault.getDefaultRCATemplates()) {
+				session.persist(template);
+			}
+		});
+	}
+
+	@Entity(name = "WeightedCause")
+	@Table(name = "rca_weighted_cause")
+	public static class WeightedCause extends BaseEntity {
+		private Cause cause;
+		private Integer weight;
+
+		public WeightedCause() {
+		}
+
+		public WeightedCause(Cause cause, Integer weight) {
+			this.cause = cause;
+			this.weight = weight;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "cause_id")
+		public Cause getCause() {
+			return cause;
+		}
+
+		public void setCause(Cause cause) {
+			this.cause = cause;
+		}
+
+		public Integer getWeight() {
+			return weight;
+		}
+
+		public void setWeight(Integer weight) {
+			this.weight = weight;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			WeightedCause cause1 = (WeightedCause) o;
+
+			if (cause != null ? !cause.equals(cause1.cause) : cause1.cause != null) {
+				return false;
+			}
+			if (weight != null ? !weight.equals(cause1.weight) : cause1.weight != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (cause != null ? cause.hashCode() : 0);
+			result = 31 * result + (weight != null ? weight.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "TimeManipulation")
+	@Table(name = "rca_time_manipulation")
+	public static class TimeManipulation extends BaseEntity implements Serializable {
+		private ManipulationType type;
+		private MathOperator op;
+		private Long time;
+		private RelativeToType relativeToType;
+		private String paramName;
+
+		public TimeManipulation() {
+		}
+
+		public TimeManipulation(ManipulationType type, MathOperator op, Long time, RelativeToType relativeToType, String paramName) {
+			this.type = type;
+			this.op = op;
+			this.time = time;
+			this.relativeToType = relativeToType;
+			this.paramName = paramName;
+		}
+
+		public ManipulationType getType() {
+			return type;
+		}
+
+		public void setType(ManipulationType type) {
+			this.type = type;
+		}
+
+		public MathOperator getOp() {
+			return op;
+		}
+
+		public void setOp(MathOperator op) {
+			this.op = op;
+		}
+
+		public Long getTime() {
+			return time;
+		}
+
+		public void setTime(Long time) {
+			this.time = time;
+		}
+
+		public RelativeToType getRelativeToType() {
+			return relativeToType;
+		}
+
+		public void setRelativeToType(RelativeToType relativeToType) {
+			this.relativeToType = relativeToType;
+		}
+
+		public String getParamName() {
+			return paramName;
+		}
+
+		public void setParamName(String paramName) {
+			this.paramName = paramName;
+		}
+	}
+	@Entity(name = "Symptom")
+	@Table(name = "rca_symptom")
+	public static class Symptom extends BaseEntity implements Serializable {
+		private String name;
+		private String objectType;
+		private Condition condition;
+		private String nodeTypeString;
+		private String processTypeString;
+		private String filterString;
+
+		public Symptom() {
+		}
+
+		public Symptom(String name, String objectType, Condition condition) {
+			this.name = name;
+			this.objectType = objectType;
+			this.condition = condition;
+		}
+
+		public String getObjectType() {
+			return objectType;
+		}
+
+		public void setObjectType(String objectType) {
+			this.objectType = objectType;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "condition_id")
+		public Condition getCondition() {
+			return condition;
+		}
+
+		public void setCondition(Condition condition) {
+			this.condition = condition;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getNodeTypeString() {
+			return nodeTypeString;
+		}
+
+		public void setNodeTypeString(String nodeTypeString) {
+			this.nodeTypeString = nodeTypeString;
+		}
+
+		public String getProcessTypeString() {
+			return processTypeString;
+		}
+
+		public void setProcessTypeString(String processTypeString) {
+			this.processTypeString = processTypeString;
+		}
+
+		public String getFilterString() {
+			return filterString;
+		}
+
+		public void setFilterString(String filterString) {
+			this.filterString = filterString;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			Symptom symptom = (Symptom) o;
+
+			if (condition != null ? !condition.equals(symptom.condition) : symptom.condition != null) {
+				return false;
+			}
+			if (name != null ? !name.equals(symptom.name) : symptom.name != null) {
+				return false;
+			}
+			if (objectType != null ? !objectType.equals(symptom.objectType) : symptom.objectType != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (name != null ? name.hashCode() : 0);
+			result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
+			result = 31 * result + (condition != null ? condition.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "SimpleCondition")
+	public static class SimpleCondition extends Condition {
+		private Expression left;
+		private Operator op;
+		private Expression right;
+
+		public SimpleCondition() {
+		}
+
+		public SimpleCondition(Expression left, Operator op, Expression right) {
+			this.left = left;
+			this.op = op;
+			this.right = right;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "left_expression_id")
+		public Expression getLeft() {
+			return left;
+		}
+
+		public void setLeft(Expression left) {
+			this.left = left;
+		}
+
+		public Operator getOp() {
+			return op;
+		}
+
+		public void setOp(Operator op) {
+			this.op = op;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "right_expression_id")
+		public Expression getRight() {
+			return right;
+		}
+
+		public void setRight(Expression right) {
+			this.right = right;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			SimpleCondition that = (SimpleCondition) o;
+
+			if (left != null ? !left.equals(that.left) : that.left != null) {
+				return false;
+			}
+			if (op != that.op) {
+				return false;
+			}
+			if (right != null ? !right.equals(that.right) : that.right != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (left != null ? left.hashCode() : 0);
+			result = 31 * result + (op != null ? op.hashCode() : 0);
+			result = 31 * result + (right != null ? right.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "RCATemplate")
+	public static class RCATemplate extends BaseEntity {
+		private String name;
+		private Symptom symptom;
+		private Set possibleCauses;
+
+		public RCATemplate() {
+		}
+
+		public RCATemplate(String name, Symptom symptom, Set possibleCauses) {
+			this.name = name;
+			this.symptom = symptom;
+			this.possibleCauses = possibleCauses;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "symptom_id")
+		public Symptom getSymptom() {
+			return symptom;
+
+		}
+
+		public void setSymptom(Symptom symptom) {
+			this.symptom = symptom;
+		}
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinTable(name = "template_cause", joinColumns = {
+			@JoinColumn(name = "f_template_id")}, inverseJoinColumns = {
+			@JoinColumn(name = "f_cause_id")})
+		public Set getPossibleCauses() {
+			return possibleCauses;
+		}
+
+		public void setPossibleCauses(Set possibleCauses) {
+			this.possibleCauses = possibleCauses;
+		}
+
+	}
+	@Entity(name = "ParameterExpression")
+	public static class ParameterExpression extends Expression {
+		private String parameterName;
+		private String defaultValue;
+
+
+		public ParameterExpression() {
+		}
+
+		public ParameterExpression(String parameterName, String defaultValue, MetadataFieldType type) {
+			this.parameterName = parameterName;
+			this.defaultValue = defaultValue;
+			this.type = type;
+		}
+
+		public String getParameterName() {
+			return parameterName;
+		}
+
+		public void setParameterName(String parameterName) {
+			this.parameterName = parameterName;
+		}
+
+		public String getDefaultValue() {
+			return defaultValue;
+		}
+
+		public void setDefaultValue(String defaultValue) {
+			this.defaultValue = defaultValue;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			ParameterExpression that = (ParameterExpression) o;
+
+			if (defaultValue != null ? !defaultValue.equals(that.defaultValue) : that.defaultValue != null) {
+				return false;
+			}
+			if (parameterName != null ? !parameterName.equals(that.parameterName) : that.parameterName != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (parameterName != null ? parameterName.hashCode() : 0);
+			result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "NumberedExpression")
+	@Table(name = "rca_numbered_exception")
+	public static class NumberedExpression extends BaseEntity implements Comparable {
+		private Long num;
+		private Expression expression;
+
+		public NumberedExpression() {
+		}
+
+		public NumberedExpression(Long num, Expression expression) {
+			this.num = num;
+			this.expression = expression;
+		}
+
+		public Long getNum() {
+			return num;
+		}
+
+		public void setNum(Long num) {
+			this.num = num;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "num_expression_id")
+		public Expression getExpression() {
+			return expression;
+		}
+
+		public void setExpression(Expression expression) {
+			this.expression = expression;
+		}
+
+		@Override
+		public int compareTo(Object o) {
+			NumberedExpression other = (NumberedExpression) o;
+			return (int) (this.num - other.num);
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			NumberedExpression that = (NumberedExpression) o;
+
+			if (expression != null ? !expression.equals(that.expression) : that.expression != null) {
+				return false;
+			}
+			if (num != null ? !num.equals(that.num) : that.num != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (num != null ? num.hashCode() : 0);
+			result = 31 * result + (expression != null ? expression.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "MathExpression")
+	public static class MathExpression extends Expression {
+		private Expression left;
+		private Expression right;
+		private MathOperator op;
+
+		public MathExpression() {
+		}
+
+		public MathExpression(Expression left, Expression right, MathOperator op) {
+			this.left = left;
+			this.right = right;
+			this.op = op;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "left_expression_id")
+		public Expression getLeft() {
+			return left;
+		}
+
+		public void setLeft(Expression left) {
+			this.left = left;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "right_expression_id")
+		public Expression getRight() {
+			return right;
+		}
+
+		public void setRight(Expression right) {
+			this.right = right;
+		}
+
+		public MathOperator getOp() {
+			return op;
+		}
+
+		public void setOp(MathOperator op) {
+			this.op = op;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			MathExpression that = (MathExpression) o;
+
+			if (left != null ? !left.equals(that.left) : that.left != null) {
+				return false;
+			}
+			if (op != that.op) {
+				return false;
+			}
+			if (right != null ? !right.equals(that.right) : that.right != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (left != null ? left.hashCode() : 0);
+			result = 31 * result + (right != null ? right.hashCode() : 0);
+			result = 31 * result + (op != null ? op.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "FieldExpression")
+	public static class FieldExpression extends Expression {
+		private String objectType;
+		private String name;
+
+		public FieldExpression() {
+		}
+
+		public FieldExpression(String objectType, String name) {
+			this.objectType = objectType;
+			this.name = name;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getObjectType() {
+			return objectType;
+		}
+
+		public void setObjectType(String objectType) {
+			this.objectType = objectType;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			FieldExpression that = (FieldExpression) o;
+
+			if (name != null ? !name.equals(that.name) : that.name != null) {
+				return false;
+			}
+			if (objectType != null ? !objectType.equals(that.objectType) : that.objectType != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
+			result = 31 * result + (name != null ? name.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "Expression")
+	@Table(name = "rca_expression")
+	public static abstract class Expression extends BaseEntity implements Serializable {
+		protected MetadataFieldType type;
+
+		protected Expression() {
+		}
+
+		protected Expression(MetadataFieldType type) {
+			this.type = type;
+		}
+
+		public MetadataFieldType getType() {
+			return type;
+		}
+
+		public void setType(MetadataFieldType type) {
+			this.type = type;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			Expression that = (Expression) o;
+
+			if (type != that.type) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (type != null ? type.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "ConstantExpression")
+	public static class ConstantExpression extends Expression {
+		private String value;
+
+		public ConstantExpression() {
+		}
+
+		public ConstantExpression(String value, MetadataFieldType type) {
+			super(type);
+			this.value = value;
+		}
+
+		@Column(name = "val")
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			ConstantExpression that = (ConstantExpression) o;
+
+			if (value != null ? !value.equals(that.value) : that.value != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (value != null ? value.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "ConditionAndExpression")
+	@Table(name = "rca_cond_and_expr")
+	public static class ConditionAndExpression extends BaseEntity {
+		private Condition condition;
+		private Expression expression;
+
+		public ConditionAndExpression() {
+		}
+
+		public ConditionAndExpression(Condition condition, Expression expression) {
+			this.condition = condition;
+			this.expression = expression;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "cond_cond_id")
+		public Condition getCondition() {
+			return condition;
+		}
+
+		public void setCondition(Condition condition) {
+			this.condition = condition;
+		}
+
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinColumn(name = "cond_expression_id")
+		public Expression getExpression() {
+			return expression;
+		}
+
+		public void setExpression(Expression expression) {
+			this.expression = expression;
+		}
+	}
+	@Entity(name = "ConditionalExpression")
+	public static class ConditionalExpression extends Expression {
+		private Set possibilities;
+
+		public ConditionalExpression() {
+		}
+
+		public ConditionalExpression(MetadataFieldType type, Set possibilities) {
+			super(type);
+			this.possibilities = possibilities;
+		}
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinTable(name = "rca_cond_posssibility", joinColumns = {
+			@JoinColumn(name = "f_cond_id")}, inverseJoinColumns = {
+			@JoinColumn(name = "f_pos_id")})
+		public Set getPossibilities() {
+			return possibilities;
+		}
+
+		public void setPossibilities(Set possibilities) {
+			this.possibilities = possibilities;
+		}
+	}
+	@Entity(name = "Condition")
+	@Table(name = "rca_condition")
+	public static abstract class Condition extends BaseEntity implements Serializable {
+	}
+	@Entity(name = "CompoundCondition")
+	public static class CompoundCondition extends Condition {
+		private Condition first;
+		private Condition second;
+		private LogicalOperator op;
+
+		public CompoundCondition() {
+		}
+
+		public CompoundCondition(Condition first, Condition second) {
+			this.first = first;
+			this.second = second;
+			this.op = LogicalOperator.AND;
+		}
+
+		public CompoundCondition(Condition first, Condition second, LogicalOperator op) {
+			this.first = first;
+			this.second = second;
+			this.op = op;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "first_id")
+		public Condition getFirst() {
+			return first;
+		}
+
+		public void setFirst(Condition first) {
+			this.first = first;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "second_id")
+		public Condition getSecond() {
+			return second;
+		}
+
+		public void setSecond(Condition second) {
+			this.second = second;
+		}
+
+		public LogicalOperator getOp() {
+			return op;
+		}
+
+		public void setOp(LogicalOperator op) {
+			this.op = op;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			CompoundCondition that = (CompoundCondition) o;
+
+			if (first != null ? !first.equals(that.first) : that.first != null) {
+				return false;
+			}
+			if (op != that.op) {
+				return false;
+			}
+			if (second != null ? !second.equals(that.second) : that.second != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (first != null ? first.hashCode() : 0);
+			result = 31 * result + (second != null ? second.hashCode() : 0);
+			result = 31 * result + (op != null ? op.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity
+	@Table(name = "rca_cause")
+	public static class Cause extends BaseEntity implements Serializable {
+		private String name;
+		private String nodeType;
+		private MappingRelationType relationType;
+		private Set fetchConditions;
+		private Condition condition;
+		private Condition auxCondition;
+		private String messageTemplate;
+		private String generalMessageTemplate;
+		private DataManipulationFunction function;
+		private Set messageTemplateParams;
+		private Set generalMessageTemplateParams;
+		private TimeManipulation startTimeManipulation;
+		private TimeManipulation endTimeManipulation;
+		private String plugin;
+
+		public Cause() {
+		}
+
+		public Cause(String name, String nodeType, MappingRelationType relationType, Set fetchConditions,
+					Condition condition, String messageTemplate, DataManipulationFunction function, Set messageTemplateParams, String plugin) {
+			this.name = name;
+			this.nodeType = nodeType;
+			this.relationType = relationType;
+			this.fetchConditions = fetchConditions;
+			this.condition = condition;
+			this.messageTemplate = messageTemplate;
+			this.function = function;
+			this.messageTemplateParams = messageTemplateParams;
+			this.plugin = plugin;
+		}
+
+		public String getNodeType() {
+			return nodeType;
+		}
+
+		public void setNodeType(String nodeType) {
+			this.nodeType = nodeType;
+		}
+
+		public String getPlugin() {
+			return plugin;
+		}
+
+		public void setPlugin(String plugin) {
+			this.plugin = plugin;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "condition_id")
+		public Condition getCondition() {
+			return condition;
+		}
+
+		public void setCondition(Condition condition) {
+			this.condition = condition;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "aux_condition_id")
+		public Condition getAuxCondition() {
+			return auxCondition;
+		}
+
+		public void setAuxCondition(Condition auxCondition) {
+			this.auxCondition = auxCondition;
+		}
+
+		public String getMessageTemplate() {
+			return messageTemplate;
+		}
+
+		public void setMessageTemplate(String messageTemplate) {
+			this.messageTemplate = messageTemplate;
+		}
+
+		public String getGeneralMessageTemplate() {
+			return generalMessageTemplate;
+		}
+
+		public void setGeneralMessageTemplate(String generalMessageTemplate) {
+			this.generalMessageTemplate = generalMessageTemplate;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Column(name = "functionName")
+		public DataManipulationFunction getFunction() {
+			return function;
+		}
+
+		public void setFunction(DataManipulationFunction function) {
+			this.function = function;
+		}
+
+		public MappingRelationType getRelationType() {
+			return relationType;
+		}
+
+		public void setRelationType(MappingRelationType relationType) {
+			this.relationType = relationType;
+		}
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinTable(name = "rca_cause_param", joinColumns = {
+			@JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
+			@JoinColumn(name = "f_param_id")})
+		public Set getMessageTemplateParams() {
+			return messageTemplateParams;
+		}
+
+		public void setMessageTemplateParams(Set messageTemplateParams) {
+			this.messageTemplateParams = messageTemplateParams;
+		}
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinTable(name = "rca_cause_general_param", joinColumns = {
+			@JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
+			@JoinColumn(name = "f_param_id")})
+		public Set getGeneralMessageTemplateParams() {
+			return generalMessageTemplateParams;
+		}
+
+		public void setGeneralMessageTemplateParams(Set generalMessageTemplateParams) {
+			this.generalMessageTemplateParams = generalMessageTemplateParams;
+		}
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		@JoinTable(name = "rca_cause_fetch", joinColumns = {
+			@JoinColumn(name = "f_cause_id")}, inverseJoinColumns = {
+			@JoinColumn(name = "f_fetch_id")})
+		public Set getFetchConditions() {
+			return fetchConditions;
+		}
+
+		public void setFetchConditions(Set fetchConditions) {
+			this.fetchConditions = fetchConditions;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "start_time_manip_id")
+		public TimeManipulation getStartTimeManipulation() {
+			return startTimeManipulation;
+		}
+
+		public void setStartTimeManipulation(TimeManipulation startTimeManipulation) {
+			this.startTimeManipulation = startTimeManipulation;
+		}
+
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		@JoinColumn(name = "end_time_manip_id")
+		public TimeManipulation getEndTimeManipulation() {
+			return endTimeManipulation;
+		}
+
+		public void setEndTimeManipulation(TimeManipulation endTimeManipulation) {
+			this.endTimeManipulation = endTimeManipulation;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			Cause cause = (Cause) o;
+
+			if (function != cause.function) {
+				return false;
+			}
+			if (messageTemplate != null ? !messageTemplate.equals(cause.messageTemplate) : cause.messageTemplate != null) {
+				return false;
+			}
+			if (name != null ? !name.equals(cause.name) : cause.name != null) {
+				return false;
+			}
+			if (nodeType != null ? !nodeType.equals(cause.nodeType) : cause.nodeType != null) {
+				return false;
+			}
+			if (relationType != cause.relationType) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (name != null ? name.hashCode() : 0);
+			result = 31 * result + (nodeType != null ? nodeType.hashCode() : 0);
+			result = 31 * result + (relationType != null ? relationType.hashCode() : 0);
+			result = 31 * result + (messageTemplate != null ? messageTemplate.hashCode() : 0);
+			result = 31 * result + (function != null ? function.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "CalculationExpression")
+	public static class CalculationExpression extends Expression {
+		private DataManipulationFunction function;
+		private String objectType;
+		private String fieldName;
+
+		public CalculationExpression() {
+		}
+
+		public CalculationExpression(DataManipulationFunction function, String objectType, String fieldName) {
+			this.function = function;
+			this.objectType = objectType;
+			this.fieldName = fieldName;
+		}
+
+		@Column(name = "functionName")
+		public DataManipulationFunction getFunction() {
+			return function;
+		}
+
+		public void setFunction(DataManipulationFunction function) {
+			this.function = function;
+		}
+
+		public String getObjectType() {
+			return objectType;
+		}
+
+		public void setObjectType(String objectType) {
+			this.objectType = objectType;
+		}
+
+		public String getFieldName() {
+			return fieldName;
+		}
+
+		public void setFieldName(String fieldName) {
+			this.fieldName = fieldName;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			CalculationExpression that = (CalculationExpression) o;
+
+			if (fieldName != null ? !fieldName.equals(that.fieldName) : that.fieldName != null) {
+				return false;
+			}
+			if (function != that.function) {
+				return false;
+			}
+			if (objectType != null ? !objectType.equals(that.objectType) : that.objectType != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (function != null ? function.hashCode() : 0);
+			result = 31 * result + (objectType != null ? objectType.hashCode() : 0);
+			result = 31 * result + (fieldName != null ? fieldName.hashCode() : 0);
+			return result;
+		}
+	}
+	@Entity(name = "AlertCondition")
+	public static class AlertCondition extends Condition {
+		private String ruleName;
+
+		public AlertCondition() {
+		}
+
+		public String getRuleName() {
+			return ruleName;
+		}
+
+		public void setRuleName(String ruleName) {
+			this.ruleName = ruleName;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			if (!super.equals(o)) {
+				return false;
+			}
+
+			AlertCondition that = (AlertCondition) o;
+
+			if (ruleName != null ? !ruleName.equals(that.ruleName) : that.ruleName != null) {
+				return false;
+			}
+
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + (ruleName != null ? ruleName.hashCode() : 0);
+			return result;
+		}
+	}
+	@MappedSuperclass
+	public static abstract class BaseEntity implements Serializable {
+		private Long id;
+
+		@Id
+		@Column(name = "f_id")
+		@GeneratedValue
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+
+			BaseEntity that = (BaseEntity) o;
+
+			// noinspection SimplifiableIfStatement
+			if (id == null || that.id == null) {
+				return false; // null != everything (including null)
+			}
+			return id.equals(that.id);
+		}
+
+		@Override
+		public int hashCode() {
+			return id != null ? id.hashCode() : 0;
+		}
+
+	}
+
+	public enum RelativeToType {
+		START,
+		END
+	}
+
+	public enum Operator {
+		EQUALS(" = "),
+		NOT_EQUALS(" != "),
+		GREATER_THAN(" > "),
+		SMALLER_THAN(" < "),
+		CONTAINS(" contains "),
+		BEGINS_WITH(" begins with "),
+		ENDS_WITH(" ends with ");
+
+		private String readable;
+
+		private Operator(String readable) {
+			this.readable = readable;
+		}
+
+		@Override
+		public String toString() {
+			return readable;
+		}
+	}
+
+	public enum MathOperator {
+		ADD,
+		SUBTRACT,
+		MULTIPLY,
+		DIVIDE,
+		MAX;
+
+		@Override
+		public String toString() {
+			switch (this) {
+				case ADD:
+					return "+";
+				case SUBTRACT:
+					return "-";
+				case MULTIPLY:
+					return "*";
+				case DIVIDE:
+					return "/";
+				case MAX:
+					return "max";
+			}
+			return null;
+		}
+
+
+	}
+
+	public enum ManipulationType {
+		MOVE_IT_BY_ABSOLUTE_TIME,
+		MOVE_IT_RELATIVE_TO_OTHER_TIME,
+		ABSOLUTE
+	}
+
+	public enum LogicalOperator {
+		AND,
+		OR
+	}
+
+	public enum MetadataFieldType {
+		BOOLEAN, STRING, NULL, NUMERIC
+	}
+
+	public enum DataManipulationFunction {
+		AVG,
+		MAX,
+		MIN,
+		COUNT,
+		SUM,
+		EXISTS,
+		LAST,
+		FIRST,
+		INCREASED_BY
+	}
+
+	public enum MappingRelationType {
+		JOB_BACKING_UP_HOST, JOB_USES_BACKUPCLIENT, JOB_USES_BACKUP_POOL, JOB_USES_MEDIA_SERVER, RECOVERPOINT_CG_COPY_ACTIVE_RPA, JOB_USES_TAPE_DRIVE
+	}
+
+	public static class DefaultTemplatesVault {
+
+		public static final String NO_AGENT_RAN_ON_CLIENT = "No agent ran on client";
+		public static final String BACKUP_AGENT_IS_DOWN_ON_BACKUP_CLIENT = "Backup agent is down on backup client";
+		public static final String BACKUP_FAILED_SYMPTOM_NAME = "Backup failed";
+		public static final String CG_COPY_RPO_VIOLATION_SYMPTOM_NAME = "CG Copy RPO Violation";
+		public static final String PACKET_LOSS = "Packet Loss";
+
+		private static RCATemplate buildBackupFailedTemplate() {
+			Symptom symptom = new Symptom(BACKUP_FAILED_SYMPTOM_NAME, "Backupjob",
+				new SimpleCondition(new FieldExpression("Backupjob", "status"), Operator.EQUALS, new ConstantExpression("failed", MetadataFieldType.STRING)));
+			symptom.setFilterString("status = 'failed'");
+			symptom.setNodeTypeString("clients");
+			symptom.setProcessTypeString("backup jobs");
+
+			// high client cpu                                                                                                               '
+			WeightedCause cause1 = buildHighClientCpu();
+
+			// high storage node cpu
+			WeightedCause cause2 = buildHighStorageNodeCpu();
+
+			// no space left on device
+			WeightedCause cause3 = buildNoSpaceOnPool();
+
+			// no space left on data domain
+			WeightedCause cause4 = buildNoSpaceOnDD();
+
+			// no agent ran on client
+			WeightedCause cause5 = buildNoAgentOnClient();
+
+			//  no agent ran on client
+			WeightedCause cause6 = buildNoAgentOnClient2();
+
+			// errors on tape
+			WeightedCause errorsOnTapeCause = buildErrorsOnTape();
+
+			//  switch port for ethernet
+			WeightedCause cause7 = buildPortSwitchForEthernet();
+
+			//  switch port for fibre channel
+			WeightedCause cause8 = buildPortSwitchForFibreChannel();
+
+			//  port settings for ethernet
+			WeightedCause cause9 = buildDifferentPortSettings();
+
+			//  no space on client
+			WeightedCause noSpaceOnClientCause = buildNoSpaceOnClient();
+
+			// todo -all other causes
+			Set causes = new HashSet<>();
+			causes.add(cause1);
+			causes.add(cause2);
+			causes.add(cause3);
+			causes.add(cause4);
+			causes.add(cause5);
+			causes.add(cause6);
+			//causes.add(errorsOnTapeCause);
+			causes.add(cause7);
+			causes.add(cause8);
+			causes.add(cause9);
+			causes.add(noSpaceOnClientCause);
+			return new RCATemplate("Backup failed RCA template", symptom, causes);
+		}
+
+		private static WeightedCause buildNoSpaceOnClient() {
+			Expression clientName = new FieldExpression("Host", "name");
+			NumberedExpression nameFirst = new NumberedExpression(1L, clientName);
+
+			Expression mountpointName = new FieldExpression("FilesystemConfig", "mountpoint");
+			NumberedExpression mountpointSecond = new NumberedExpression(2L, mountpointName);
+
+			Expression leftSpace = new MathExpression(new FieldExpression("FilesystemConfig", "totalSpace"),
+				new FieldExpression("FilesystemStatus", "usedSpace"),
+				MathOperator.SUBTRACT);
+			ParameterExpression leftSpaceOnClient = new ParameterExpression("leftSpaceOnClient", "50", MetadataFieldType.NUMERIC);
+			NumberedExpression spaceThird = new NumberedExpression(3L, leftSpace);
+
+
+			Set messageArgs = new HashSet<>();
+			messageArgs.add(nameFirst);
+			messageArgs.add(mountpointSecond);
+			messageArgs.add(spaceThird);
+
+			Condition fetchCondition1 = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("FilesystemStatus", "mountpoint"), Operator.EQUALS, new ConstantExpression("C:", MetadataFieldType.STRING)),
+				new SimpleCondition(new FieldExpression("FilesystemStatus", "agentId"), Operator.EQUALS, new FieldExpression("Host", "id"))
+			);
+			Condition fetchCondition2 = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("FilesystemConfig", "mountpoint"), Operator.EQUALS, new ConstantExpression("C:", MetadataFieldType.STRING)),
+				new SimpleCondition(new FieldExpression("FilesystemConfig", "agentId"), Operator.EQUALS, new FieldExpression("Host", "id"))
+			);
+
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition1);
+			fetchConditions.add(fetchCondition2);
+
+			SimpleCondition condition = new SimpleCondition(leftSpace, Operator.SMALLER_THAN, leftSpaceOnClient);
+
+			Cause noSpaceOnClient = new Cause("No space on Client", "Host", MappingRelationType.JOB_BACKING_UP_HOST,
+				fetchConditions, condition, "There is a lack of free space in {param}:{param}. The current free space is {param} MB", DataManipulationFunction.LAST, messageArgs, null);
+
+			return new WeightedCause(noSpaceOnClient, 95);
+		}
+
+		private static WeightedCause buildErrorsOnTape() {
+
+			Expression tapeDriveNameExp = new FieldExpression("TapeDrive", "name");
+			NumberedExpression tapeDriveName = new NumberedExpression(1L, tapeDriveNameExp);
+
+			Expression errorsExp = new FieldExpression("TapedriveStatus", "correctedReadErrors");
+
+			Set messageArgs = new HashSet<>();
+			messageArgs.add(tapeDriveName);
+
+			Condition fetchCondition = new SimpleCondition(new FieldExpression("TapedriveStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("TapeDrive", "id"));
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition);
+
+			ConstantExpression zero = new ConstantExpression("0", MetadataFieldType.NUMERIC);
+
+			Cause errorsOnTape = new Cause("Errors on tape", "TapeDrive", MappingRelationType.JOB_USES_TAPE_DRIVE, fetchConditions,
+				new CompoundCondition(
+					new CompoundCondition(
+						new CompoundCondition(
+							new SimpleCondition(new FieldExpression("TapedriveStatus", "correctedReadErrors"), Operator.GREATER_THAN, zero),
+							new SimpleCondition(new FieldExpression("TapedriveStatus", "correctedWriteErrors"), Operator.GREATER_THAN, zero),
+							LogicalOperator.OR),
+						new SimpleCondition(new FieldExpression("TapedriveStatus", "uncorrectedReadErrors"), Operator.GREATER_THAN, zero),
+						LogicalOperator.OR),
+					new SimpleCondition(new FieldExpression("TapedriveStatus", "uncorrectedWriteErrors"), Operator.GREATER_THAN, zero),
+					LogicalOperator.OR),
+				"Tape drive {param} had errors", DataManipulationFunction.INCREASED_BY, messageArgs, null);
+			return new WeightedCause(errorsOnTape, 70);
+		}
+
+		private static WeightedCause buildNoSpaceOnDD() {
+			Expression ddName = new FieldExpression("DataDomain", "name");
+			NumberedExpression ddFirst = new NumberedExpression(1L, ddName);
+
+
+			Expression ddUsage = new MathExpression(new MathExpression(
+				new FieldExpression("FilesystemStatus", "usedSpace"),
+				new FieldExpression("FilesystemConfig", "totalSpace"),
+				MathOperator.DIVIDE
+			),
+				new ConstantExpression("100", MetadataFieldType.NUMERIC), MathOperator.MULTIPLY);
+			NumberedExpression ddSecond = new NumberedExpression(2L, ddUsage);
+			ParameterExpression ddUsageThreshold = new ParameterExpression("ddUsageThreshold", "80", MetadataFieldType.NUMERIC);
+			NumberedExpression ddThird = new NumberedExpression(3L, ddUsageThreshold);
+			Set messageArgs4 = new HashSet<>();
+			messageArgs4.add(ddFirst);
+			messageArgs4.add(ddSecond);
+			messageArgs4.add(ddThird);
+
+			Condition fetchCondition4 = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("FilesystemStatus", "mountpoint"), Operator.EQUALS, new ConstantExpression("Data", MetadataFieldType.STRING)),
+				new SimpleCondition(new FieldExpression("FilesystemStatus", "agentId"), Operator.EQUALS, new FieldExpression("DataDomain", "id"))
+			);
+			Condition fetchCondition5 = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("FilesystemConfig", "mountpoint"), Operator.EQUALS, new ConstantExpression("Data", MetadataFieldType.STRING)),
+				new SimpleCondition(new FieldExpression("FilesystemConfig", "agentId"), Operator.EQUALS, new FieldExpression("DataDomain", "id"))
+			);
+			Set fetchConditions4 = new HashSet<>();
+			fetchConditions4.add(fetchCondition4);
+			fetchConditions4.add(fetchCondition5);
+
+			Cause noSpaceOnDD = new Cause("No space on data domain", "DataDomain", MappingRelationType.JOB_USES_BACKUPCLIENT,
+				fetchConditions4, new SimpleCondition(ddUsage, Operator.GREATER_THAN, ddUsageThreshold),
+				"The capacity utilization for DataDomain {param} is {param}% which is the above threshold {param}%", DataManipulationFunction.LAST, messageArgs4, null);
+
+			noSpaceOnDD.setGeneralMessageTemplate("The capacity utilization for DataDomain {param} is the above threshold {param}%");
+
+			Set generalMessageParams = new HashSet<>();
+			generalMessageParams.add(ddFirst);
+			NumberedExpression ddThirdWhichIsNowSecond = new NumberedExpression(2L, new ParameterExpression("ddUsageThreshold", "80", MetadataFieldType.NUMERIC));
+			generalMessageParams.add(ddThirdWhichIsNowSecond);
+			noSpaceOnDD.setGeneralMessageTemplateParams(generalMessageParams);
+
+			return new WeightedCause(noSpaceOnDD, 90);
+		}
+
+		private static WeightedCause buildNoSpaceOnPool() {
+			Expression poolName = new FieldExpression("BackupPool", "name");
+			NumberedExpression deviceFirst = new NumberedExpression(1L, poolName);
+			Expression numOfEmptyVolumes = new CalculationExpression(DataManipulationFunction.COUNT, "VolumeStatus", "id");
+			NumberedExpression deviceSecond = new NumberedExpression(2L, numOfEmptyVolumes);
+			Set messageArgs3 = new HashSet<>();
+			messageArgs3.add(deviceFirst);
+			messageArgs3.add(deviceSecond);
+
+			Condition fetchCondition3 = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("VolumeStatus", "pool"), Operator.EQUALS, new FieldExpression("BackupPool", "name")),
+				new SimpleCondition(new FieldExpression("VolumeStatus", "agentId"), Operator.EQUALS, new FieldExpression("Backupjob", "agentId"))
+			);
+			Set fetchConditions3 = new HashSet<>();
+			fetchConditions3.add(fetchCondition3);
+
+			ConstantExpression threshold = new ConstantExpression("5", MetadataFieldType.NUMERIC);
+			Cause noSpaceOnDevice = new Cause("No space left on device", "BackupPool", MappingRelationType.JOB_USES_BACKUP_POOL,
+				fetchConditions3,
+				new SimpleCondition(
+					new FieldExpression("VolumeStatus", "state"),
+					Operator.SMALLER_THAN,
+					threshold),
+				"Pool {param} has only {param} empty volumes left", DataManipulationFunction.COUNT, messageArgs3, null);
+			noSpaceOnDevice.setAuxCondition(new SimpleCondition(new FieldExpression("VolumeStatus", "state"),
+				Operator.EQUALS, new ConstantExpression("Empty", MetadataFieldType.STRING)));
+
+			noSpaceOnDevice.setGeneralMessageTemplate("Pool {param} has less than {param} empty volumes left");
+			Set generalMessageParams = new HashSet<>();
+			generalMessageParams.add(deviceFirst);
+			generalMessageParams.add(new NumberedExpression(2L, threshold));
+			noSpaceOnDevice.setGeneralMessageTemplateParams(generalMessageParams);
+
+			return new WeightedCause(noSpaceOnDevice, 80);
+		}
+
+		private static WeightedCause buildHighStorageNodeCpu() {
+			Expression storageName = new FieldExpression("Host", "name");
+			NumberedExpression storageFirst = new NumberedExpression(1L, storageName);
+			Expression avgCpuStorage = new CalculationExpression(DataManipulationFunction.AVG, "HostStatus", "cpuUsed");
+			NumberedExpression storageSecond = new NumberedExpression(2L, avgCpuStorage);
+			Set messageArgs2 = new HashSet<>();
+			messageArgs2.add(storageFirst);
+			messageArgs2.add(storageSecond);
+
+			Condition fetchCondition2 = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("Host", "id"));
+			Set fetchConditions2 = new HashSet<>();
+			fetchConditions2.add(fetchCondition2);
+
+			ParameterExpression storageNodeHighCPUThreshold = new ParameterExpression("storageNodeHighCPUThreshold", "95", MetadataFieldType.NUMERIC);
+			Cause highCpuOnStorageNode = new Cause("High storage node CPU", "Host", MappingRelationType.JOB_USES_MEDIA_SERVER,
+				fetchConditions2,
+				new SimpleCondition(new FieldExpression("HostStatus", "cpuUsed"), Operator.GREATER_THAN,
+					storageNodeHighCPUThreshold), "Storage node {param} CPU was {param}", DataManipulationFunction.AVG,
+				messageArgs2, null);
+			TimeManipulation startTimeManipulation = new TimeManipulation(ManipulationType.MOVE_IT_RELATIVE_TO_OTHER_TIME,
+				MathOperator.SUBTRACT, 3600L, RelativeToType.END, "job_cpu_offset");
+			highCpuOnStorageNode.setStartTimeManipulation(startTimeManipulation);
+
+			highCpuOnStorageNode.setGeneralMessageTemplate("Storage node {param} CPU was higher than {param}");
+			Set generalMessageParams = new HashSet<>();
+			generalMessageParams.add(storageFirst);
+			generalMessageParams.add(new NumberedExpression(2L, storageNodeHighCPUThreshold));
+			highCpuOnStorageNode.setGeneralMessageTemplateParams(generalMessageParams);
+
+			return new WeightedCause(highCpuOnStorageNode, 60);
+		}
+
+		private static WeightedCause buildHighClientCpu() {
+			Expression clientName = new FieldExpression("Host", "name");
+			NumberedExpression clientFirst = new NumberedExpression(1L, clientName);
+			Expression avgCpu = new CalculationExpression(DataManipulationFunction.AVG, "HostStatus", "cpuUsed");
+			NumberedExpression clientSecond = new NumberedExpression(2L, avgCpu);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(clientFirst);
+			messageArgs1.add(clientSecond);
+
+			Condition fetchCondition = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("Host", "id"));
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition);
+
+
+			ParameterExpression clientHighCPUThreshold = new ParameterExpression("clientHighCPUThreshold", "95", MetadataFieldType.NUMERIC);
+			Cause highCpuOnClient = new Cause("High client CPU", "Host", MappingRelationType.JOB_BACKING_UP_HOST,
+				new HashSet<>(fetchConditions),
+				new SimpleCondition(new FieldExpression("HostStatus", "cpuUsed"), Operator.GREATER_THAN,
+					clientHighCPUThreshold), "Client {param} CPU was {param}", DataManipulationFunction.AVG,
+				messageArgs1, null);
+
+			TimeManipulation startTimeManipulation = new TimeManipulation(ManipulationType.MOVE_IT_RELATIVE_TO_OTHER_TIME,
+				MathOperator.SUBTRACT, 3600L, RelativeToType.END, "job_cpu_offset");
+			highCpuOnClient.setStartTimeManipulation(startTimeManipulation);
+
+			highCpuOnClient.setGeneralMessageTemplate("Client {param} CPU was higher than {param}");
+			Set generalMessageParams = new HashSet<>();
+			generalMessageParams.add(clientFirst);
+			generalMessageParams.add(new NumberedExpression(2L, clientHighCPUThreshold));
+			highCpuOnClient.setGeneralMessageTemplateParams(generalMessageParams);
+
+			return new WeightedCause(highCpuOnClient, 50);
+		}
+
+		private static WeightedCause buildNoAgentOnClient() {
+			Expression clientName = new FieldExpression("Host", "name");
+			NumberedExpression clientFirst = new NumberedExpression(1L, clientName);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(clientFirst);
+
+			Condition fetchHostStatus = new SimpleCondition(new FieldExpression("HostStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("Host", "id"));
+
+			ConditionAndExpression netbackup = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("NetBackupModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("bpinetd", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression networker = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("NetWorkerModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("nsrexecd", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression backupExec = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("BackupExecModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("beremote", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression dataProtector = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("DataProtectorModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("omniinet", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression tsm = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("TSMModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("dsmcsvc", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression arcServe = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("ArcserveModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("UnivAgent", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression commVault = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("CommvaultModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("evmgrc", MetadataFieldType.STRING)
+			);
+
+			ConditionAndExpression avamar = new ConditionAndExpression(
+				new SimpleCondition(
+					new FieldExpression("Backupjob", "module"),
+					Operator.EQUALS,
+					new ConstantExpression("AvamarModule", MetadataFieldType.STRING)
+				),
+				new ConstantExpression("avagent", MetadataFieldType.STRING)
+			);
+
+			Set possibilities = new HashSet<>();
+			possibilities.add(netbackup);
+			possibilities.add(networker);
+			possibilities.add(backupExec);
+			possibilities.add(dataProtector);
+			possibilities.add(tsm);
+			possibilities.add(arcServe);
+			possibilities.add(commVault);
+			possibilities.add(avamar);
+
+			Condition fetchProcessStatus = new CompoundCondition(
+				new SimpleCondition(new FieldExpression("ProcessStatus", "nodeId"),
+					Operator.EQUALS, new FieldExpression("Host", "id")),
+				new SimpleCondition(new FieldExpression("ProcessStatus", "name"),
+					Operator.CONTAINS, new ConditionalExpression(MetadataFieldType.STRING, possibilities)),
+				LogicalOperator.AND
+			);
+
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchHostStatus);
+			fetchConditions.add(fetchProcessStatus);
+
+			Condition condition = new CompoundCondition(
+				new SimpleCondition(
+					new CalculationExpression(DataManipulationFunction.COUNT, "HostStatus", "id"),
+					Operator.GREATER_THAN,
+					new ConstantExpression("0", MetadataFieldType.NUMERIC)
+				),
+				new SimpleCondition(
+					new CalculationExpression(DataManipulationFunction.COUNT, "ProcessStatus", "id"),
+					Operator.EQUALS,
+					new ConstantExpression("0", MetadataFieldType.NUMERIC)
+				),
+				LogicalOperator.AND
+			);
+
+			Cause noAgentOnClient = new Cause(
+				NO_AGENT_RAN_ON_CLIENT, "Host", MappingRelationType.JOB_BACKING_UP_HOST,
+				fetchConditions, condition, "Backup agent was down on host: {param}", DataManipulationFunction.LAST,
+				messageArgs1, null);
+
+			return new WeightedCause(noAgentOnClient, 100);
+		}
+
+		private static WeightedCause buildNoAgentOnClient2() {
+
+			Expression agentName = new FieldExpression("BackupClient", "name");
+			NumberedExpression agentFirst = new NumberedExpression(1L, agentName);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(agentFirst);
+
+			Condition fetchCondition6 = new SimpleCondition(new FieldExpression("ClientStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("BackupClient", "id"));
+
+			Set fetchConditions6 = new HashSet<>();
+			fetchConditions6.add(fetchCondition6);
+
+
+			Cause AgentDown = new Cause(BACKUP_AGENT_IS_DOWN_ON_BACKUP_CLIENT, "BackupClient", MappingRelationType.JOB_USES_BACKUPCLIENT,
+				fetchConditions6,
+				new CompoundCondition(
+					new SimpleCondition(new FieldExpression("ClientStatus", "responding"), Operator.EQUALS, new ConstantExpression("true", MetadataFieldType.BOOLEAN)),
+					new SimpleCondition(new FieldExpression("ClientStatus", "daemonRunning"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN))),
+				"Backup agent {param} is down on backup client", DataManipulationFunction.LAST, messageArgs1, null);
+
+			return new WeightedCause(AgentDown, 101);
+		}
+
+		private static WeightedCause buildPortSwitchForEthernet() {
+			Expression portName = new FieldExpression("EthernetPort", "name");
+			Expression nodeType = new FieldExpression("NetintStatus", "module");
+			Expression nodeName = new FieldExpression("NetintStatus", "agentName");
+			NumberedExpression portNameFirst = new NumberedExpression(1L, portName);
+			NumberedExpression nodeTypeSecond = new NumberedExpression(2L, nodeType);
+			NumberedExpression nodeNameThird = new NumberedExpression(3L, nodeName);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(portNameFirst);
+			messageArgs1.add(nodeTypeSecond);
+			messageArgs1.add(nodeNameThird);
+
+			Condition fetchCondition7 = new SimpleCondition(new FieldExpression("NetintStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
+
+			Set fetchConditions7 = new HashSet<>();
+			fetchConditions7.add(fetchCondition7);
+
+
+			Cause SwitchPortDown = new Cause("Switch port is down for ethernet", "EthernetPort", null,
+				fetchConditions7,
+				new SimpleCondition(new FieldExpression("NetintStatus", "linkup"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN)),
+				"Ethernet port:{param} for {param}:{param} is down", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCAPortSwitchIsDownPlugin");
+
+			return new WeightedCause(SwitchPortDown, 61);
+		}
+
+
+		private static WeightedCause buildDifferentPortSettings() {
+			Set messageArgs1 = new HashSet<>();
+
+			Condition fetchCondition1 = new SimpleCondition(new FieldExpression("NetintStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
+
+			Condition fetchCondition2 = new SimpleCondition(new FieldExpression("NetintConfig", "nodeId"),
+				Operator.EQUALS, new FieldExpression("EthernetPort", "id"));
+
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition1);
+			fetchConditions.add(fetchCondition2);
+
+			Cause PortSettings = new Cause("Different Port Settings", "EthernetPort", null,
+				fetchConditions,
+				new SimpleCondition(new FieldExpression("NetintStatus", "speed"), Operator.NOT_EQUALS,
+					new ConstantExpression("0", MetadataFieldType.NUMERIC)),
+				"", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCASwitchSettingsPlugin");
+
+			return new WeightedCause(PortSettings, 63);
+		}
+
+
+		private static WeightedCause buildPortSwitchForFibreChannel() {
+			Expression portName = new FieldExpression("FibreChannelPort", "name");
+			Expression nodeType = new FieldExpression("FcportStatus", "module");
+			Expression nodeName = new FieldExpression("FcportStatus", "agentName");
+			NumberedExpression portNameFirst = new NumberedExpression(1L, portName);
+			NumberedExpression nodeTypeSecond = new NumberedExpression(2L, nodeType);
+			NumberedExpression nodeNameThird = new NumberedExpression(3L, nodeName);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(portNameFirst);
+			messageArgs1.add(nodeTypeSecond);
+			messageArgs1.add(nodeNameThird);
+
+			Condition fetchCondition7 = new SimpleCondition(new FieldExpression("FcportStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("FibreChannelPort", "id"));
+
+			Set fetchConditions7 = new HashSet<>();
+			fetchConditions7.add(fetchCondition7);
+
+
+			Cause SwitchPortDown = new Cause("Switch port is down for fibre channel", "FibreChannelPort", null,
+				fetchConditions7,
+				new SimpleCondition(new FieldExpression("FcportStatus", "linkup"), Operator.EQUALS, new ConstantExpression("false", MetadataFieldType.BOOLEAN)),
+				"Fibre channel port:{param} for {param}:{param} is down", DataManipulationFunction.EXISTS, messageArgs1, "com.emc.dpa.analysis.rca.RCAPortSwitchIsDownPlugin");
+
+			return new WeightedCause(SwitchPortDown, 60);
+
+		}
+
+
+		private static RCATemplate buildRPAHighLoadTemplate() {
+			Symptom symptom = new Symptom("CG Copy high load", "CgCopyPerf",
+				new SimpleCondition(new FieldExpression("CgCopyPerf", "highLoadTime"), Operator.GREATER_THAN, new ConstantExpression("0", MetadataFieldType.NUMERIC)));
+			symptom.setFilterString("highLoadTime > 0");
+			symptom.setNodeTypeString("cg copies");
+			symptom.setProcessTypeString("replications");
+
+
+			WeightedCause cause1 = buildHighRPAThroughput();
+			WeightedCause cause2 = buildCGCopyFF();
+			WeightedCause cause3 = buildPacketLoss();
+
+			Set causes = new HashSet<>();
+			causes.add(cause1);
+			causes.add(cause2);
+			causes.add(cause3);
+
+			return new RCATemplate("CG copy High load template", symptom, causes);
+		}
+
+		private static WeightedCause buildHighRPAThroughput() {
+
+			ParameterExpression highThroughputThreshold = new ParameterExpression("highThroughputThreshold", "122880", MetadataFieldType.NUMERIC);
+			ConstantExpression megaSize = new ConstantExpression("1024", MetadataFieldType.NUMERIC);
+
+			Expression agentName = new FieldExpression("RpaPerfView", "agentName");
+			NumberedExpression rpaFirst = new NumberedExpression(1L, agentName);
+			Expression rpaName = new FieldExpression("AbstractRecoverPointAppliance", "name");
+			NumberedExpression rpaSecond = new NumberedExpression(2L, rpaName);
+			Expression site = new FieldExpression("RpaPerfView", "site");
+			NumberedExpression rpaThird = new NumberedExpression(3L, site);
+
+			MathExpression multiplyWanCompression = new MathExpression(
+				new FieldExpression("RpaPerfView", "wanThroughput"),
+				new FieldExpression("RpaPerfView", "compression"),
+				MathOperator.MULTIPLY);
+
+			Expression wanThroughput = new MathExpression(new FieldExpression("RpaPerfView", "wanThroughput"), multiplyWanCompression, MathOperator.MAX);
+			Expression maxThroughput = new MathExpression(new FieldExpression("RpaPerfView", "sanThroughput"), wanThroughput, MathOperator.MAX);
+			Expression maxThroughputMB = new MathExpression(maxThroughput, megaSize, MathOperator.DIVIDE);
+			NumberedExpression rpaFourth = new NumberedExpression(4L, maxThroughputMB);
+			Expression limitThroughputMB = new MathExpression(highThroughputThreshold, megaSize, MathOperator.DIVIDE);
+			NumberedExpression rpaFifth = new NumberedExpression(5L, limitThroughputMB);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(rpaFirst);
+			messageArgs1.add(rpaSecond);
+			messageArgs1.add(rpaThird);
+			messageArgs1.add(rpaFourth);
+			messageArgs1.add(rpaFifth);
+
+			Condition fetchCondition = new SimpleCondition(new FieldExpression("RpaPerfView", "nodeId"),
+				Operator.EQUALS, new FieldExpression("AbstractRecoverPointAppliance", "id"));
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition);
+
+
+			///(san != null and san>120) || (wan != null and (((compression = null || compression = 0) and wan > 120) || ((compression != null and compression != 0) and wan*compression > 120)))
+			Condition condition = new CompoundCondition(
+				new CompoundCondition(
+					new SimpleCondition(new FieldExpression("RpaPerfView", "sanThroughput"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
+					new SimpleCondition(new FieldExpression("RpaPerfView", "sanThroughput"), Operator.GREATER_THAN, highThroughputThreshold),
+					LogicalOperator.AND),
+				new CompoundCondition(
+					new SimpleCondition(new FieldExpression("RpaPerfView", "wanThroughput"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
+					new CompoundCondition(
+						new CompoundCondition(
+							new SimpleCondition(new FieldExpression("RpaPerfView", "wanThroughput"), Operator.GREATER_THAN, highThroughputThreshold),
+							new CompoundCondition(
+								new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
+								new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.EQUALS, new ConstantExpression("0", MetadataFieldType.NUMERIC)),
+								LogicalOperator.OR),
+							LogicalOperator.AND),
+						new CompoundCondition(
+							new CompoundCondition(
+								new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
+								new SimpleCondition(new FieldExpression("RpaPerfView", "compression"), Operator.NOT_EQUALS, new ConstantExpression("0", MetadataFieldType.NUMERIC)),
+								LogicalOperator.AND),
+							new SimpleCondition(multiplyWanCompression, Operator.GREATER_THAN, highThroughputThreshold),
+							LogicalOperator.AND),
+						LogicalOperator.OR),
+					LogicalOperator.AND),
+				LogicalOperator.OR);
+
+			Cause rpaThroughputHigh = new Cause("High RPA throughput", "AbstractRecoverPointAppliance", MappingRelationType.RECOVERPOINT_CG_COPY_ACTIVE_RPA,
+				fetchConditions, condition, "The throughput for RPA: {param}:{param} at site {param} was {param}MB, above the RPA throughput limitation ({param}MB)", DataManipulationFunction.EXISTS,
+				messageArgs1, null);
+
+			TimeManipulation startTimeManipulation = new TimeManipulation(
+				ManipulationType.MOVE_IT_BY_ABSOLUTE_TIME,
+				MathOperator.SUBTRACT,
+				5 * 60L,
+				null,
+				"rpa_throughput_offset"
+			);
+			rpaThroughputHigh.setStartTimeManipulation(startTimeManipulation);
+
+			rpaThroughputHigh.setGeneralMessageTemplate("The throughput for RPA: {param}:{param} at site {param} was above the RPA throughput limitation ({param}MB)");
+			Set generalMessageParams = new HashSet<>();
+			generalMessageParams.add(rpaFirst);
+			generalMessageParams.add(rpaSecond);
+			generalMessageParams.add(rpaThird);
+			NumberedExpression rpaFifthWichIsNowForth = new NumberedExpression(4L, new MathExpression(highThroughputThreshold, megaSize, MathOperator.DIVIDE));
+			generalMessageParams.add(rpaFifthWichIsNowForth);
+			rpaThroughputHigh.setGeneralMessageTemplateParams(generalMessageParams);
+
+			WeightedCause cause = new WeightedCause(rpaThroughputHigh, 100);
+			return cause;
+		}
+
+		private static WeightedCause buildCGCopyFF() {
+			Expression cgCopyName = new FieldExpression("AbstractRecoverPointConsistencyGroupCopy", "name");
+			NumberedExpression cgCopyFirst = new NumberedExpression(1L, cgCopyName);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(cgCopyFirst);
+
+			Condition fetchCondition = new SimpleCondition(new FieldExpression("CgCopyStatus", "nodeId"),
+				Operator.EQUALS, new FieldExpression("AbstractRecoverPointConsistencyGroupCopy", "id"));
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition);
+
+			Condition condition =
+				new CompoundCondition(
+					new SimpleCondition(new FieldExpression("CgCopyStatus", "journalMode"), Operator.NOT_EQUALS, new ConstantExpression("null", MetadataFieldType.NULL)),
+					new SimpleCondition(new FieldExpression("CgCopyStatus", "journalMode"), Operator.EQUALS, new ConstantExpression("Fast Forward", MetadataFieldType.STRING)),
+					LogicalOperator.AND);
+
+			Cause rpaFastForward = new Cause("High RPA throughput", "AbstractRecoverPointConsistencyGroupCopy", null,
+				fetchConditions, condition, "Cg Copy {param} has a high latency on writing to remote storage (Fast Forward)", DataManipulationFunction.EXISTS,
+				messageArgs1, null);
+
+			WeightedCause cause = new WeightedCause(rpaFastForward, 80);
+			return cause;
+		}
+
+		private static RCATemplate buildRPOViolationTemplate() {
+			Symptom symptom = new Symptom(CG_COPY_RPO_VIOLATION_SYMPTOM_NAME, "AnalysisAlert",
+				new CompoundCondition(
+					// todo - check state - not closed, currently don't bother
+					new SimpleCondition(new FieldExpression("AnalysisAlert", "message"), Operator.EQUALS, new ConstantExpression("RPO Violation", MetadataFieldType.STRING)),
+					new SimpleCondition(new FieldExpression("AnalysisAlert", "component"), Operator.CONTAINS, new ConstantExpression("CG Copy", MetadataFieldType.STRING))
+				)
+			);
+			symptom.setFilterString("message = 'RPO Violation' AND component like '%CG Copy%'");
+			symptom.setNodeTypeString("cg copies");
+			symptom.setProcessTypeString("replications");
+
+
+			WeightedCause cause1 = buildHighRPAThroughput();
+			WeightedCause cause2 = buildCGCopyFF();
+			WeightedCause cause3 = buildPacketLoss();
+
+			Set causes = new HashSet<>();
+			causes.add(cause1);
+			causes.add(cause2);
+			causes.add(cause3);
+
+			return new RCATemplate("CG copy RPO Violation template", symptom, causes);
+		}
+
+		private static WeightedCause buildPacketLoss() {
+
+			Expression packetLossSize = new FieldExpression("RpaPerfView", "packetLoss");
+			NumberedExpression clientFirst = new NumberedExpression(1L, packetLossSize);
+			Set messageArgs1 = new HashSet<>();
+			messageArgs1.add(clientFirst);
+
+			Condition fetchCondition = new SimpleCondition(new FieldExpression("RpaPerfView", "nodeId"),
+				Operator.EQUALS, new FieldExpression("AbstractRecoverPointAppliance", "id"));
+			Set fetchConditions = new HashSet<>();
+			fetchConditions.add(fetchCondition);
+			Condition condition = new SimpleCondition(new FieldExpression("RpaPerfView", "packetLoss"), Operator.GREATER_THAN,
+				new ConstantExpression("1", MetadataFieldType.NUMERIC));
+
+			Cause packetLoss = new Cause(PACKET_LOSS, "AbstractRecoverPointAppliance", MappingRelationType.RECOVERPOINT_CG_COPY_ACTIVE_RPA,
+				fetchConditions, condition,
+				"There is a bottleneck on the bandwidth. Found packet-loss ({param}) on the link.", DataManipulationFunction.EXISTS,
+				messageArgs1, null);
+
+			packetLoss.setGeneralMessageTemplate("There is a bottleneck on the bandwidth. Found packet-loss (>1) on the link.");
+
+			return new WeightedCause(packetLoss, 200);
+		}
+
+		public static List getDefaultRCATemplates() {
+			return Arrays.asList(buildBackupFailedTemplate(), buildRPAHighLoadTemplate(), buildRPOViolationTemplate());
+		}
+
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java
index 58975e8af782..985525b0cb18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.insertordering;
 
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java
index 3b98ca091788..42d2e25f6006 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
@@ -33,159 +31,159 @@
 @RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class InsertOrderingRootEntityNameDependencyTest extends BaseNonConfigCoreFunctionalTestCase {
 
-    private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-            Wrapper.class,
-            Condition.class,
-            SimpleCondition.class,
-            Expression.class,
-            ConstantExpression.class,
-            Condition.class,
-            CompoundCondition.class,
-        };
-    }
-
-    @Override
-    protected void addSettings(Map settings) {
-        settings.put(Environment.ORDER_INSERTS, "true");
-        settings.put(Environment.ORDER_UPDATES, "true");
-        settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
-        settings.put(
-            org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-            connectionProvider
-        );
-    }
-
-    @Override
-    public void releaseResources() {
-        super.releaseResources();
-        connectionProvider.stop();
-    }
-
-    @Override
-    protected boolean rebuildSessionFactoryOnError() {
-        return false;
-    }
-
-    @Test
-    public void testBatching() throws SQLException {
-        doInHibernate(this::sessionFactory, session -> {
-            connectionProvider.clear();
-            session.persist(Wrapper.create());
-        });
-    }
-
-    @Entity(name = "Wrapper")
-    public static class Wrapper {
-        @Id
-        private String id;
-        @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-        private Condition condition;
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        private Set constantExpressions;
-
-        @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-        private Set otherConditions;
-
-        public Wrapper() {
-        }
-
-        public static Wrapper create() {
-            final Wrapper w = new Wrapper();
-            final CompoundCondition cc = new CompoundCondition();
-            final SimpleCondition c1 = new SimpleCondition();
-            final SimpleCondition c2 = new SimpleCondition();
-            final SimpleCondition c3 = new SimpleCondition();
-            final ConstantExpression e1 = new ConstantExpression();
-            final ConstantExpression e2 = new ConstantExpression();
-            final ConstantExpression e3 = new ConstantExpression();
-            final ConstantExpression e4 = new ConstantExpression();
-            final ConstantExpression e5 = new ConstantExpression();
-            final ConstantExpression e6 = new ConstantExpression();
-            final ConstantExpression e7 = new ConstantExpression();
-            w.id = "w";
-            w.condition = cc;
-            cc.id = "cc";
-            cc.first = c1;
-            cc.second = c2;
-            c1.id = "c1";
-            c1.left = e1;
-            c1.right = e2;
-            c2.id = "c2";
-            c2.left = e3;
-            c2.right = e4;
-            c3.id = "c3";
-            c3.left = e6;
-            c3.right = e7;
-            e1.id = "e1";
-            e1.value = "e1";
-            e2.id = "e2";
-            e2.value = "e2";
-            e3.id = "e3";
-            e3.value = "e3";
-            e4.id = "e4";
-            e4.value = "e4";
-            e5.id = "e5";
-            e5.value = "e5";
-            e6.id = "e6";
-            e6.value = "e6";
-            e7.id = "e7";
-            e7.value = "e7";
-            w.constantExpressions = new HashSet<>();
-            w.constantExpressions.add(e5);
-            w.otherConditions = new HashSet<>();
-            w.otherConditions.add(c3);
-            return w;
-        }
-    }
-
-    @Entity(name = "Condition")
-    @Table(name = "cond")
-    public static abstract class Condition {
-        @Id
-        protected String id;
-
-        public Condition() {
-        }
-    }
-    @Entity(name = "SimpleCondition")
-    public static class SimpleCondition extends Condition {
-        @OneToOne(cascade = CascadeType.ALL)
-        private Expression left;
-        @OneToOne(cascade = CascadeType.ALL)
-        private Expression right;
-
-        public SimpleCondition() {
-        }
-    }
-    @Entity(name = "Expression")
-    public static abstract class Expression {
-        @Id
-        protected String id;
-
-        protected Expression() {
-        }
-
-    }
-    @Entity(name = "ConstantExpression")
-    public static class ConstantExpression extends Expression {
-        @Column(name = "val")
-        private String value;
-
-        public ConstantExpression() {
-        }
-    }
-    @Entity(name = "CompoundCondition")
-    public static class CompoundCondition extends Condition {
-        @OneToOne(cascade = CascadeType.ALL)
-        protected Condition first;
-        @OneToOne(cascade = CascadeType.ALL)
-        protected Condition second;
-
-        public CompoundCondition() {
-        }
-    }
+	private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+			Wrapper.class,
+			Condition.class,
+			SimpleCondition.class,
+			Expression.class,
+			ConstantExpression.class,
+			Condition.class,
+			CompoundCondition.class,
+		};
+	}
+
+	@Override
+	protected void addSettings(Map settings) {
+		settings.put(Environment.ORDER_INSERTS, "true");
+		settings.put(Environment.ORDER_UPDATES, "true");
+		settings.put(Environment.STATEMENT_BATCH_SIZE, "50");
+		settings.put(
+			org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
+			connectionProvider
+		);
+	}
+
+	@Override
+	public void releaseResources() {
+		super.releaseResources();
+		connectionProvider.stop();
+	}
+
+	@Override
+	protected boolean rebuildSessionFactoryOnError() {
+		return false;
+	}
+
+	@Test
+	public void testBatching() throws SQLException {
+		doInHibernate(this::sessionFactory, session -> {
+			connectionProvider.clear();
+			session.persist(Wrapper.create());
+		});
+	}
+
+	@Entity(name = "Wrapper")
+	public static class Wrapper {
+		@Id
+		private String id;
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+		private Condition condition;
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		private Set constantExpressions;
+
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+		private Set otherConditions;
+
+		public Wrapper() {
+		}
+
+		public static Wrapper create() {
+			final Wrapper w = new Wrapper();
+			final CompoundCondition cc = new CompoundCondition();
+			final SimpleCondition c1 = new SimpleCondition();
+			final SimpleCondition c2 = new SimpleCondition();
+			final SimpleCondition c3 = new SimpleCondition();
+			final ConstantExpression e1 = new ConstantExpression();
+			final ConstantExpression e2 = new ConstantExpression();
+			final ConstantExpression e3 = new ConstantExpression();
+			final ConstantExpression e4 = new ConstantExpression();
+			final ConstantExpression e5 = new ConstantExpression();
+			final ConstantExpression e6 = new ConstantExpression();
+			final ConstantExpression e7 = new ConstantExpression();
+			w.id = "w";
+			w.condition = cc;
+			cc.id = "cc";
+			cc.first = c1;
+			cc.second = c2;
+			c1.id = "c1";
+			c1.left = e1;
+			c1.right = e2;
+			c2.id = "c2";
+			c2.left = e3;
+			c2.right = e4;
+			c3.id = "c3";
+			c3.left = e6;
+			c3.right = e7;
+			e1.id = "e1";
+			e1.value = "e1";
+			e2.id = "e2";
+			e2.value = "e2";
+			e3.id = "e3";
+			e3.value = "e3";
+			e4.id = "e4";
+			e4.value = "e4";
+			e5.id = "e5";
+			e5.value = "e5";
+			e6.id = "e6";
+			e6.value = "e6";
+			e7.id = "e7";
+			e7.value = "e7";
+			w.constantExpressions = new HashSet<>();
+			w.constantExpressions.add(e5);
+			w.otherConditions = new HashSet<>();
+			w.otherConditions.add(c3);
+			return w;
+		}
+	}
+
+	@Entity(name = "Condition")
+	@Table(name = "cond")
+	public static abstract class Condition {
+		@Id
+		protected String id;
+
+		public Condition() {
+		}
+	}
+	@Entity(name = "SimpleCondition")
+	public static class SimpleCondition extends Condition {
+		@OneToOne(cascade = CascadeType.ALL)
+		private Expression left;
+		@OneToOne(cascade = CascadeType.ALL)
+		private Expression right;
+
+		public SimpleCondition() {
+		}
+	}
+	@Entity(name = "Expression")
+	public static abstract class Expression {
+		@Id
+		protected String id;
+
+		protected Expression() {
+		}
+
+	}
+	@Entity(name = "ConstantExpression")
+	public static class ConstantExpression extends Expression {
+		@Column(name = "val")
+		private String value;
+
+		public ConstantExpression() {
+		}
+	}
+	@Entity(name = "CompoundCondition")
+	public static class CompoundCondition extends Condition {
+		@OneToOne(cascade = CascadeType.ALL)
+		protected Condition first;
+		@OneToOne(cascade = CascadeType.ALL)
+		protected Condition second;
+
+		public CompoundCondition() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java
index fa771396df5c..ba31e56fb35a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
index fee0ec122ff1..e9028276a929 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.insertordering;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java
index 72cd5c4c16cd..615cfa98a216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
@@ -10,8 +8,6 @@
 import java.util.function.Supplier;
 
 import org.hibernate.cfg.BatchSettings;
-import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
 import org.hibernate.engine.jdbc.batch.internal.BatchImpl;
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java
index 936afb91fb70..5e2f9c17349c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java
index c68e8d783dc5..e0be178074d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java
index 44ae2b7170f5..20b62dbbf527 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java
index 0d5fa33c74a2..975462baa051 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java
index fa2d80ef6094..50ec779554f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java
index d167f31f9e02..dae1e9fce775 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java
index 412ccfb16023..39b3146fb780 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java
index 97fe493a6df7..5f690d2d5020 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java
index f7a245c5b0e5..c2383708a0b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java
index df55a8c594f9..e3aa58a76b46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java
index 8fe73d02626a..b2feee63f362 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java
index cf52d07b13aa..69c4d01ee17f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java
index cb83f1a87330..381153786822 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java
index 598c69a8480c..dfc888189e22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java
index 9736b277803d..3200e7861463 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java
index 22aaf1dd2c71..6befd667d9f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java
index 9ad94807b6bc..8eb9995cebb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java
index afea1a0a6102..0292b97aca49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Membership.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Membership.java
index 58fef1b1dd28..b151bf4058dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Membership.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/Membership.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java
index d2182b762858..d1e44bd1fb59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/User.java
index 150fdc86ddeb..1b252926de96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.insertordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/CollectionInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/CollectionInterceptor.java
index eb69177e8acd..cf0ab5dfd25f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/CollectionInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/CollectionInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: CollectionInterceptor.java 7700 2005-07-30 05:02:47Z oneovthafew $
 package org.hibernate.orm.test.interceptor;
 
 import org.hibernate.Interceptor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Image.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Image.java
index 08f25b87cbd0..3cec8ee486ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Image.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Image.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interceptor;
 
@@ -67,4 +65,3 @@ public String toString() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InstantiateInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InstantiateInterceptor.java
index d8cea8d48e53..94a60f407efc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InstantiateInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InstantiateInterceptor.java
@@ -1,12 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/**
- * @author Gail Badner
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interceptor;
 
@@ -18,7 +12,7 @@ public class InstantiateInterceptor implements Interceptor {
 	private String injectedString;
 
 	public InstantiateInterceptor(String injectedString) {
-		this.injectedString = injectedString;		
+		this.injectedString = injectedString;
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java
index b9ad5701f54d..682c123eec65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interceptor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java
index 54df81046a60..df793f6b2b0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interceptor;
 
@@ -383,4 +381,3 @@ public String inspect(String sql) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTransactionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTransactionEventTest.java
index 8b72e2ae0083..df1f9e7d048d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTransactionEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTransactionEventTest.java
@@ -1,17 +1,6 @@
 /*
- * Copyright 2014 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interceptor;
 
@@ -30,50 +19,50 @@ public class InterceptorTransactionEventTest extends BaseCoreFunctionalTestCase
 
 	@Test
 	public void testTransactionEvents() {
-        LoggingInterceptor interceptor = new LoggingInterceptor();
+		LoggingInterceptor interceptor = new LoggingInterceptor();
 
-        Session s = openSession(interceptor);
+		Session s = openSession(interceptor);
 		Transaction tx = s.beginTransaction();
 		// Do nothing, open and closing the transaction is enough
 		tx.commit();
 		s.close();
 
-        assertTrue("afterTransactionBeginCalled not called", interceptor.isAfterTransactionBeginCalled());
-        assertTrue("afterTransactionCompletionCalled not called", interceptor.isAfterTransactionCompletionCalled());
-        assertTrue("beforeTransactionCompletionCalled not called", interceptor.isBeforeTransactionCompletionCalled());
-    }
+		assertTrue("afterTransactionBeginCalled not called", interceptor.isAfterTransactionBeginCalled());
+		assertTrue("afterTransactionCompletionCalled not called", interceptor.isAfterTransactionCompletionCalled());
+		assertTrue("beforeTransactionCompletionCalled not called", interceptor.isBeforeTransactionCompletionCalled());
+	}
 
-    private static class LoggingInterceptor implements Interceptor {
-        private boolean afterTransactionBeginCalled;
-        private boolean afterTransactionCompletionCalled;
-        private boolean beforeTransactionCompletionCalled;
+	private static class LoggingInterceptor implements Interceptor {
+		private boolean afterTransactionBeginCalled;
+		private boolean afterTransactionCompletionCalled;
+		private boolean beforeTransactionCompletionCalled;
 
-        @Override
-        public void afterTransactionBegin(Transaction tx) {
-            afterTransactionBeginCalled = true;
-        }
+		@Override
+		public void afterTransactionBegin(Transaction tx) {
+			afterTransactionBeginCalled = true;
+		}
 
-        @Override
-        public void afterTransactionCompletion(Transaction tx) {
-            afterTransactionCompletionCalled = true;
-        }
+		@Override
+		public void afterTransactionCompletion(Transaction tx) {
+			afterTransactionCompletionCalled = true;
+		}
 
-        @Override
-        public void beforeTransactionCompletion(Transaction tx) {
-            beforeTransactionCompletionCalled = true;
-        }
+		@Override
+		public void beforeTransactionCompletion(Transaction tx) {
+			beforeTransactionCompletionCalled = true;
+		}
 
-        public boolean isAfterTransactionBeginCalled() {
-            return afterTransactionBeginCalled;
-        }
+		public boolean isAfterTransactionBeginCalled() {
+			return afterTransactionBeginCalled;
+		}
 
-        public boolean isAfterTransactionCompletionCalled() {
-            return afterTransactionCompletionCalled;
-        }
+		public boolean isAfterTransactionCompletionCalled() {
+			return afterTransactionCompletionCalled;
+		}
 
-        public boolean isBeforeTransactionCompletionCalled() {
-            return beforeTransactionCompletionCalled;
-        }
+		public boolean isBeforeTransactionCompletionCalled() {
+			return beforeTransactionCompletionCalled;
+		}
 
-    }
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Log.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Log.java
index 6af84f33a6dc..ac6f5a3ad3a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Log.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/Log.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Log.java 7700 2005-07-30 05:02:47Z oneovthafew $
 package org.hibernate.orm.test.interceptor;
 import java.util.Calendar;
 
@@ -15,7 +11,7 @@ public class Log {
 	private String entityId;
 	private String action;
 	private Calendar time;
-	
+
 	public Log(String action, String id, String name) {
 		super();
 		this.action = action;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/PropertyInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/PropertyInterceptor.java
index 73994b7e6054..2fc0da3e9c65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/PropertyInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/PropertyInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: PropertyInterceptor.java 7700 2005-07-30 05:02:47Z oneovthafew $
 package org.hibernate.orm.test.interceptor;
 
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java
index 5456dbf5d285..5bb7d3c4971b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: StatefulInterceptor.java 7701 2005-07-30 05:07:01Z oneovthafew $
 package org.hibernate.orm.test.interceptor;
 
 import java.util.ArrayList;
@@ -17,7 +13,7 @@
 import org.hibernate.type.Type;
 
 public class StatefulInterceptor implements Interceptor {
-	
+
 	private Session session;
 
 	private List list = new ArrayList();
@@ -42,13 +38,13 @@ public boolean onFlushDirty(Object entity, Object id, Object[] currentState, Obj
 	public void postFlush(Iterator entities) {
 		if ( list.size()>0 ) {
 			for ( Iterator iter = list.iterator(); iter.hasNext(); ) {
-				session.persist( iter.next() );	
+				session.persist( iter.next() );
 			}
 			list.clear();
 			session.flush();
 		}
 	}
-	
+
 	public void setSession(Session s) {
 		session = s;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/User.java
index dc3d06178cc5..812d245f8d6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 7700 2005-07-30 05:02:47Z oneovthafew $
 package org.hibernate.orm.test.interceptor;
 import java.util.Calendar;
 import java.util.HashSet;
@@ -18,7 +14,7 @@ public class User {
 	private Calendar lastUpdated;
 	private Calendar created;
 	private String injectedString;
-	
+
 	public User(String name, String password) {
 		super();
 		this.name = name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Document.java
index 7642efd2a653..0d9b97f2a900 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Document.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 import java.sql.Blob;
 import java.util.Calendar;
@@ -23,8 +19,8 @@ public interface Document extends Item {
 	 * @param content The content to set.
 	 */
 	public void setContent(Blob content);
-	
+
 	public Calendar getCreated();
-	
+
 	public Calendar getModified();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentImpl.java
index 990413da2de0..35f15ebff7dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DocumentImpl.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 import java.sql.Blob;
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentInterceptor.java
index 82f2de22c4d4..ca9d07588d44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DocumentInterceptor.java 7860 2005-08-11 21:58:23Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Folder.java
index 7e5cf00b02ea..c35d6f1e6f08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Folder.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Folder.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/FolderImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/FolderImpl.java
index 1d9d25ab5abc..0f424d8c4796 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/FolderImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/FolderImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: FolderImpl.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java
index bd8ecf8513a3..e7a7502e1c56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.interfaceproxy;
 
@@ -124,4 +122,3 @@ private Session openSession(SessionFactoryScope scope) {
 				.openSession();
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Item.java
index f3d60eaa3e8e..8622959998db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/ItemImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/ItemImpl.java
index 69d662927a88..0fc4648aa984 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/ItemImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/ItemImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ItemImpl.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocument.java
index 3ac548c197da..3ae9e1c8bdb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocument.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocument.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SecureDocument.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocumentImpl.java
index 6fafafce30e5..3f488d88da71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocumentImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/SecureDocumentImpl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SecureDocumentImpl.java 4407 2004-08-22 01:20:08Z oneovthafew $
 package org.hibernate.orm.test.interfaceproxy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java
index 3aa53f2fff39..28bdffc4935c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MaskSensitiveInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MaskSensitiveInformationTest.java
index 12633807f49e..ad240b9edfb5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MaskSensitiveInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MaskSensitiveInformationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MathHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MathHelperTest.java
index 8f4ed119cb1c..dce5bda44785 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MathHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/MathHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
@@ -66,4 +64,4 @@ static Stream test_divideRoundingUp() {
 	public void test_divideRoundingUp(int numerator, int denominator, int expected) {
 		assertThat( MathHelper.divideRoundingUp( numerator, denominator ) ).isEqualTo( expected );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java
index 4d1a6c02effc..fd25a19eabef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import jakarta.persistence.FetchType;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.SessionFactoryOptions;
@@ -27,12 +24,7 @@
 import static org.hibernate.orm.test.internal.util.ReflectHelperTest.Status.ON;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java
index 7ef41bf70dc4..5b2f0c61b0d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java
index 22af9735a085..d1aa2fbb7979 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java
index ebb83d8d0682..6e347247c554 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.internal.util.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorBasicColumnTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorBasicColumnTests.java
index aa957e54876c..8faa3c44502f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorBasicColumnTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorBasicColumnTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.intg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
index 2d157716cd24..aaffc9bc1975 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.intg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/reactive/JdbcValuesMappingProducerProviderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/reactive/JdbcValuesMappingProducerProviderTests.java
index 2ff71fce30e4..1fe744e2a30a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/reactive/JdbcValuesMappingProducerProviderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/reactive/JdbcValuesMappingProducerProviderTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.intg.reactive;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ForwardOnlyScrollNoTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ForwardOnlyScrollNoTransactionTest.java
index 206f24cd8c72..0c35902ad365 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ForwardOnlyScrollNoTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ForwardOnlyScrollNoTransactionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.iterate;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java
index 7be739fad61a..b1391e162870 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 6593 2005-04-28 15:52:26Z oneovthafew $
 package org.hibernate.orm.test.iterate;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java
index 7b6573a145df..650987c30aba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.iterate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
index 9bc2d8ffa027..0b651e53489b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
index c94201dccb4c..3f2d53e568fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc;
 import java.sql.Connection;
@@ -51,7 +49,7 @@ public void execute(Connection connection) throws SQLException {
 							statement = ((SessionImplementor)session).getJdbcCoordinator().getStatementPreparer().createStatement();
 							ResultSet resultSet = null;
 							try {
-								
+
 								resultSet = ((SessionImplementor)session).getJdbcCoordinator().getResultSetReturn().extract( statement, "select * from T_JDBC_PERSON" );
 							}
 							finally {
@@ -154,7 +152,7 @@ private void releaseQuietly(SessionImplementor s, Statement statement) {
 			return;
 		}
 		try {
-            s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
+			s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
 		}
 		catch (Exception e) {
 			// ignore
@@ -166,7 +164,7 @@ private void releaseQuietly(SessionImplementor s, ResultSet resultSet, Statement
 			return;
 		}
 		try {
-            s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( resultSet, statement );
+			s.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( resultSet, statement );
 		}
 		catch (Exception e) {
 			// ignore
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
index 3b4c311d9015..85c09f5b1e68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java
index c9476ac3bb5f..35554f2c84b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc;
 
@@ -76,7 +74,7 @@ public void testConnectedLobCreator() throws SQLException {
 		connection.close();
 	}
 
-    @Test
+	@Test
 	public void testJdbc3LobCreator() throws SQLException {
 		final Connection connection = createConnectionProxy( 3, new JdbcLobBuilderImpl() );
 		final H2Dialect dialect = new H2Dialect();
@@ -97,7 +95,7 @@ public void testJdbc3LobCreator() throws SQLException {
 
 		connection.close();
 	}
-    @Test
+	@Test
 	public void testJdbc4UnsupportedLobCreator() throws SQLException {
 		final Connection connection = createConnectionProxy( 4, new JdbcLobBuilderImpl() );
 		final H2Dialect dialect = new H2Dialect();
@@ -118,7 +116,7 @@ public void testJdbc4UnsupportedLobCreator() throws SQLException {
 
 		connection.close();
 	}
-    @Test
+	@Test
 	public void testConfiguredNonContextualLobCreator() throws SQLException {
 		final Connection connection = createConnectionProxy( 4, new JdbcLobBuilderImpl( LobTypes.BLOB, LobTypes.CLOB, LobTypes.NCLOB ) );
 		final H2Dialect dialect = new H2Dialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
index 07e747a5324f..0959b4105e4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
index f53a670d04e9..f645385240fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.env;
 
@@ -14,7 +12,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.env.internal.DefaultSchemaNameResolver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/LobCreationCheckSkipTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/LobCreationCheckSkipTest.java
index de2d6c666977..096d45826256 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/LobCreationCheckSkipTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/LobCreationCheckSkipTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.env;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
index 1060baa7f572..0fccf21455e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
@@ -1,8 +1,6 @@
-/**
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.env;
 
@@ -90,4 +88,3 @@ public DatabaseVersion getVersion() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
index abb31d91aa57..f5f5d64db8fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.env;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
index eac9332b1546..a554da496dc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.internal;
 
@@ -130,7 +128,7 @@ public void testBasicRelease() {
 						ps.setLong( 1, 1 );
 						ps.setString( 2, "name" );
 						jdbcCoord.getResultSetReturn().execute( ps, sql );
-                        assertTrue( jdbcCoord.getLogicalConnection().getResourceRegistry().hasRegisteredResources() );
+						assertTrue( jdbcCoord.getLogicalConnection().getResourceRegistry().hasRegisteredResources() );
 						assertEquals( 1, connectionProvider.getAcquiredConnections().size() );
 						assertEquals( 0, connectionProvider.getReleasedConnections().size() );
 						resourceRegistry.release( ps );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
index 789054f3cc73..9f30a6086289 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.internal;
 
@@ -114,6 +112,6 @@ public void testBasicJdbcUsage() throws JDBCException {
 	}
 
 	private ResourceRegistry getResourceRegistry(JdbcCoordinator jdbcCoord) {
-        return jdbcCoord.getLogicalConnection().getResourceRegistry();
-    }
+		return jdbcCoord.getLogicalConnection().getResourceRegistry();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
index cc7ba1b81ee1..013ba12b24dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.internal;
 
@@ -18,8 +16,6 @@
 import org.hibernate.engine.jdbc.mutation.internal.JdbcValueBindingsImpl;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.jdbc.Expectation;
-import org.hibernate.jdbc.Expectations;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.orm.test.common.JournalingBatchObserver;
 import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
@@ -76,7 +72,7 @@ public void testBatchingUsage() throws Exception {
 		insertBatch.addToBatch( jdbcValueBindings, null );
 		assertThat( batchObserver.getExplicitExecutionCount() ).isEqualTo( 0 );
 		assertThat( batchObserver.getImplicitExecutionCount() ).isEqualTo( 0 );
-        assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue();
+		assertThat( jdbcCoordinator.getLogicalConnection().getResourceRegistry().hasRegisteredResources() ).isTrue();
 
 		// bind values for #2 - again, nothing at JDBC level (we have statement from earlier)
 		jdbcValueBindings.bindValue( 2, SANDBOX_TBL, "ID", ParameterUsage.SET );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
index 38767bc32e7f..60ef1731480c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java
index 446580b24e6a..691646bd08b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.refcursor;
 
@@ -27,16 +25,16 @@
 @JiraKey(value = "HHH-10612")
 public class StandardRefCursorSupportTest {
 
-    interface TestDatabaseMetaData extends DatabaseMetaData {
-        boolean supportsRefCursors() throws SQLException;
-    }
+	interface TestDatabaseMetaData extends DatabaseMetaData {
+		boolean supportsRefCursors() throws SQLException;
+	}
 
-    @Test
-    public void testSupportsRefCursorsAboveJava8() throws Exception {
-        TestDatabaseMetaData metaMock = Mockito.mock(TestDatabaseMetaData.class);
-        Mockito.when(metaMock.supportsRefCursors()).thenReturn(true);
+	@Test
+	public void testSupportsRefCursorsAboveJava8() throws Exception {
+		TestDatabaseMetaData metaMock = Mockito.mock(TestDatabaseMetaData.class);
+		Mockito.when(metaMock.supportsRefCursors()).thenReturn(true);
 
-        boolean result = StandardRefCursorSupport.supportsRefCursors(metaMock);
-        assertThat(result, is(true));
-    }
-}
\ No newline at end of file
+		boolean result = StandardRefCursorSupport.supportsRefCursors(metaMock);
+		assertThat(result, is(true));
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/BasicFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/BasicFormatterTest.java
index 8b53806a9884..d368314267b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/BasicFormatterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/BasicFormatterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.util;
 
@@ -12,7 +10,6 @@
 
 import org.hibernate.engine.jdbc.internal.FormatStyle;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 
 import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/DdlFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/DdlFormatterTest.java
index 98b234f5c240..d7dbcc8b967d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/DdlFormatterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/util/DdlFormatterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jdbc.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/BlogEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/BlogEntry.java
index 531265cd9cdb..96a080d85d76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/BlogEntry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/BlogEntry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Bug.java
index d95b1a66f1c0..c95c6e3089ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Bug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Bug.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java
index eb0507c78c5a..6d61bd45773f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java
index efb260540b1c..9addb0bce9a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
index 9818327ba0ec..7e30dc9a5961 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java
index a33ab00cfd33..e84dabbe37d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java
index 6b2aaf126d7a..f83d0f2947ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.join;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java
index 1e55f9e504b9..cff4f73be7ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
@@ -14,13 +12,11 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.PrimaryKeyJoinColumn;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Transient;
 
 import org.hibernate.annotations.ColumnTransformer;
-import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.GenericGenerator;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Reportable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Reportable.java
index a8246fb8a9e0..6a0321e601cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Reportable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Reportable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java
index 569fd05fbcea..29be8313ddb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
@@ -10,10 +8,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Copy of the model used in JoinTest, but using annotations rather than hbm.xml to look
@@ -33,4 +27,3 @@ public void testIt() {
 		// really we have nothing to test
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java
index acbb03ea0692..61e7f69f1680 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Thing.java
index 40736cf3d5f1..97265f12f045 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Thing.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.join;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java
index 9e501fd2ed2f..580affeac04f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java
index 989ae5766fd9..8daf7399d5f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.joinedsubclass;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java
index e3c282566ff3..1e3e0a1a06d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.joinedsubclass;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java
index 16af5edc7946..57fe97df9db6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.joinedsubclass;
 import java.math.BigDecimal;
 
@@ -60,7 +56,7 @@ public double getPasswordExpiryDays() {
 		return passwordExpiryDays;
 	}
 	/**
-	 * @param passwordExpiryDays The password expiry policy in days. 
+	 * @param passwordExpiryDays The password expiry policy in days.
 	 */
 	public void setPasswordExpiryDays(double passwordExpiryDays) {
 		this.passwordExpiryDays = passwordExpiryDays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassFailureTest.java
index b1f40dab6401..f187217a1d1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
@@ -124,4 +122,4 @@ public static class EntityB extends EntityA {
 			super( id, name );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java
index b535babcdf90..d74d36ce2192 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
@@ -24,11 +22,9 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Gavin King
@@ -161,4 +157,3 @@ public void testLockingJoinedSubclass(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java
index d4830cbd1980..7f9c35af69a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
index 7436c3bbf210..d0c1e78c9ef5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
@@ -48,14 +46,14 @@ public class JoinedSubclassWithExplicitDiscriminatorTest {
 	@Test
 	@SkipForDialect( dialectClass = AltibaseDialect.class, reason = "'TYPE' is a keyword in Altibase and escaped here")
 	public void metadataAssertions(SessionFactoryScope scope) {
-        EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
+		EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister dogPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "string", dogPersister.getDiscriminatorType().getName() );
 		assertEquals( "type", dogPersister.getDiscriminatorColumnName() );
 		assertEquals( "dog", dogPersister.getDiscriminatorValue() );
 
-        p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
+		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister catPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "string", catPersister.getDiscriminatorType().getName() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
index eb208d50d8f3..3534915c205e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
@@ -54,14 +52,14 @@ public class JoinedSubclassWithIgnoredExplicitDiscriminatorTest {
 
 	@Test
 	public void metadataAssertions(SessionFactoryScope scope) {
-        EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
+		EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister dogPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "integer", dogPersister.getDiscriminatorType().getName() );
 		assertEquals( "clazz_", dogPersister.getDiscriminatorColumnName() );
 		assertTrue( Integer.class.isInstance( dogPersister.getDiscriminatorValue() ) );
 
-        p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
+		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister catPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "integer", catPersister.getDiscriminatorType().getName() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
index 38da0c936398..7bfc57557675 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclass;
 
@@ -50,7 +48,7 @@ public class JoinedSubclassWithImplicitDiscriminatorTest {
 
 	@Test
 	public void metadataAssertions(SessionFactoryScope scope) {
-        EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
+		EntityPersister p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Dog.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister dogPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals(
@@ -63,7 +61,7 @@ public void metadataAssertions(SessionFactoryScope scope) {
 		);
 		assertEquals( "Dog", dogPersister.getDiscriminatorValue() );
 
-        p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
+		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister catPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java
index 1bde731f2412..6dd6e47f2cf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 10218 2006-08-04 18:24:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.joinedsubclass;
 
 
@@ -38,7 +34,7 @@ public void setCountry(String string) {
 		this.address.country = string;
 	}
 
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java
index bde63c48fa21..122336e28252 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclassbatch;
 
@@ -392,4 +390,3 @@ public void setVersion(int version) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java
index ce7f84e4eb52..b717868239ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclassbatch;
 
@@ -311,4 +309,3 @@ public void setVersion(int version) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java
index 612e7debc07c..a9d2caabc75d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinedsubclassbatch;
 
@@ -352,4 +350,3 @@ public void setVersion(int version) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java
index 6116a65d23f2..7e5224a6c1cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.joinfetch.enhanced;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
index 6eb0cf6e9d86..c3126557ff18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -306,13 +304,13 @@ private void releaseUnclosedEntityManager(EntityManager em) {
 
 		if ( em.getTransaction().isActive() ) {
 			em.getTransaction().rollback();
-            log.warn("You left an open transaction! Fix your test case. For now, we are closing it for you.");
+			log.warn("You left an open transaction! Fix your test case. For now, we are closing it for you.");
 		}
 		if ( em.isOpen() ) {
 			// as we open an EM before the test runs, it will still be open if the test uses a custom EM.
 			// or, the person may have forgotten to close. So, do not raise a "fail", but log the fact.
 			em.close();
-            log.warn("The EntityManager is not closed. Closing it.");
+			log.warn("The EntityManager is not closed. Closing it.");
 		}
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java
index 6f59e17add63..02b802162e52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 
 import java.io.Serializable;
@@ -107,7 +103,7 @@ public void setLastUpdate(Date lastUpdate) {
 
 	@PostUpdate
 	private void someLateUpdateWorking() {
-        log.debug("PostUpdate for: " + this.toString());
+		log.debug("PostUpdate for: " + this.toString());
 		postVersion++;
 	}
 
@@ -158,25 +154,25 @@ public void setKittens(List kittens) {
 	 * of this object.
 	 */
 	@Override
-    public String toString()
+	public String toString()
 	{
-	    final String TAB = "    ";
-
-	    String retValue = "";
-
-	    retValue = "Cat ( "
-	        + super.toString() + TAB
-	        + "id = " + this.id + TAB
-	        + "name = " + this.name + TAB
-	        + "dateOfBirth = " + this.dateOfBirth + TAB
-	        + "age = " + this.age + TAB
-	        + "length = " + this.length + TAB
-	        + "lastUpdate = " + this.lastUpdate + TAB
-	        + "manualVersion = " + this.manualVersion + TAB
-	        + "postVersion = " + Cat.postVersion + TAB
-	        + "kittens = " + this.kittens + TAB
-	        + " )";
-
-	    return retValue;
+		final String TAB = "    ";
+
+		String retValue = "";
+
+		retValue = "Cat ( "
+			+ super.toString() + TAB
+			+ "id = " + this.id + TAB
+			+ "name = " + this.name + TAB
+			+ "dateOfBirth = " + this.dateOfBirth + TAB
+			+ "age = " + this.age + TAB
+			+ "length = " + this.length + TAB
+			+ "lastUpdate = " + this.lastUpdate + TAB
+			+ "manualVersion = " + this.manualVersion + TAB
+			+ "postVersion = " + Cat.postVersion + TAB
+			+ "kittens = " + this.kittens + TAB
+			+ " )";
+
+		return retValue;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java
index 711a7cd5df73..b86be131a10f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -15,48 +13,48 @@
 @Embeddable
 public class CompositeId implements Serializable {
 
-    private int id1;
-    private int id2;
-
-    public CompositeId() {
-    }
-
-    public CompositeId(int id1, int id2) {
-        this.id1 = id1;
-        this.id2 = id2;
-    }
-
-    public int getId1() {
-        return id1;
-    }
-
-    public void setId1( int id1 ) {
-        this.id1 = id1;
-    }
-
-    public int getId2() {
-        return id2;
-    }
-
-    public void setId2( int id2 ) {
-        this.id2 = id2;
-    }
-
-    @Override
-    public boolean equals( Object obj ) {
-        if (obj == null) return false;
-        if (getClass() != obj.getClass()) return false;
-        final CompositeId other = (CompositeId)obj;
-        if (this.id1 != other.id1) return false;
-        if (this.id2 != other.id2) return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 73 * hash + this.id1;
-        hash = 73 * hash + this.id2;
-        return hash;
-    }
+	private int id1;
+	private int id2;
+
+	public CompositeId() {
+	}
+
+	public CompositeId(int id1, int id2) {
+		this.id1 = id1;
+		this.id2 = id2;
+	}
+
+	public int getId1() {
+		return id1;
+	}
+
+	public void setId1( int id1 ) {
+		this.id1 = id1;
+	}
+
+	public int getId2() {
+		return id2;
+	}
+
+	public void setId2( int id2 ) {
+		this.id2 = id2;
+	}
+
+	@Override
+	public boolean equals( Object obj ) {
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
+		final CompositeId other = (CompositeId)obj;
+		if (this.id1 != other.id1) return false;
+		if (this.id2 != other.id2) return false;
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 5;
+		hash = 73 * hash + this.id1;
+		hash = 73 * hash + this.id2;
+		return hash;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdFkUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdFkUpdateTest.java
index bd0eae4579ef..30f89949f0ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdFkUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdFkUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa;
 
 import org.hibernate.query.SemanticException;
@@ -12,50 +16,50 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Jpa(annotatedClasses = {
-        EntityWithCompositeIdFkAssociation.class,
-        EntityWithCompositeId.class,
-        CompositeId.class
+		EntityWithCompositeIdFkAssociation.class,
+		EntityWithCompositeId.class,
+		CompositeId.class
 })
 public class CompositeIdFkUpdateTest {
 
-    @Test
-    public void testUpdateAssociationSetNull(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    Query q = entityManager.createQuery(
-                            "update EntityWithCompositeIdFkAssociation e set e.association = null" );
-
-                    q.executeUpdate();
-                }
-        );
-    }
-
-    @Test
-    public void testUpdateAssociationSetRubbish(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    try {
-                        entityManager.createQuery(
-                                "update EntityWithCompositeIdFkAssociation e set e.association = 1" );
-                        Assertions.fail( "Expected query type validation to fail due to illegal assignment" );
-                    }
-                    catch (IllegalArgumentException ex) {
-                        assertThat( ex.getCause() ).isInstanceOf( SemanticException.class );
-                        assertThat( ex.getCause() ).hasMessageContaining( "Cannot assign expression of type" );
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testUpdateAssociationSetAssociationPart(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    Query q = entityManager.createQuery(
-                            "update EntityWithCompositeIdFkAssociation e set e.association.id.id1 = 1" );
-
-                    q.executeUpdate();
-                }
-        );
-    }
+	@Test
+	public void testUpdateAssociationSetNull(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Query q = entityManager.createQuery(
+							"update EntityWithCompositeIdFkAssociation e set e.association = null" );
+
+					q.executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testUpdateAssociationSetRubbish(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					try {
+						entityManager.createQuery(
+								"update EntityWithCompositeIdFkAssociation e set e.association = 1" );
+						Assertions.fail( "Expected query type validation to fail due to illegal assignment" );
+					}
+					catch (IllegalArgumentException ex) {
+						assertThat( ex.getCause() ).isInstanceOf( SemanticException.class );
+						assertThat( ex.getCause() ).hasMessageContaining( "Cannot assign expression of type" );
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testUpdateAssociationSetAssociationPart(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Query q = entityManager.createQuery(
+							"update EntityWithCompositeIdFkAssociation e set e.association.id.id1 = 1" );
+
+					q.executeUpdate();
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java
index b97ab0e0cf3e..551ba83457c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java
@@ -1,13 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa;
 
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.Query;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 
 import org.junit.jupiter.api.Test;
 
@@ -16,23 +17,23 @@
 
 @JiraKey( value = "HHH-9029")
 @Jpa(annotatedClasses = {
-        EntityWithCompositeId.class,
-        CompositeId.class
+		EntityWithCompositeId.class,
+		CompositeId.class
 })
 public class CompositeIdRowValueTest {
 
-    @Test
-    public void testTupleAfterSubQuery(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    Query q = entityManager.createQuery("SELECT e FROM EntityWithCompositeId e "
-                                                     + "WHERE EXISTS (SELECT 1 FROM EntityWithCompositeId) "
-                                                     + "AND e.id = :id");
+	@Test
+	public void testTupleAfterSubQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Query q = entityManager.createQuery("SELECT e FROM EntityWithCompositeId e "
+													+ "WHERE EXISTS (SELECT 1 FROM EntityWithCompositeId) "
+													+ "AND e.id = :id");
 
-                    q.setParameter("id", new CompositeId(1, 2));
+					q.setParameter("id", new CompositeId(1, 2));
 
-                    assertThat(q.getResultList().size(), is(0));
-                }
-        );
-    }
+					assertThat(q.getResultList().size(), is(0));
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java
index 9ddb51c39404..5946eb4b5d0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -19,30 +17,30 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 @Jpa(annotatedClasses = {
-        EntityWithCompositeId.class,
-        CompositeId.class
+		EntityWithCompositeId.class,
+		CompositeId.class
 })
 public class CountEntityWithCompositeIdTest {
 
-    @Test
-    public void shouldCount(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                entityManager -> {
-                    CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-                    CriteriaQuery cq = cb.createQuery(Long.class);
-                    Root r = cq.from(EntityWithCompositeId.class);
-                    cq.multiselect(cb.count(r));
-                    assertThat(entityManager.createQuery(cq).getSingleResult().intValue(), is(0));
-                }
-        );
-        scope.inTransaction(
-                entityManager -> {
-                    HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder();
-                    CriteriaQuery cq = cb.createQuery(Long.class);
-                    cq.from(EntityWithCompositeId.class);
-                    cq.select(cb.count());
-                    assertThat(entityManager.createQuery(cq).getSingleResult().intValue(), is(0));
-                }
-        );
-    }
+	@Test
+	public void shouldCount(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+					CriteriaQuery cq = cb.createQuery(Long.class);
+					Root r = cq.from(EntityWithCompositeId.class);
+					cq.multiselect(cb.count(r));
+					assertThat(entityManager.createQuery(cq).getSingleResult().intValue(), is(0));
+				}
+		);
+		scope.inTransaction(
+				entityManager -> {
+					HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder();
+					CriteriaQuery cq = cb.createQuery(Long.class);
+					cq.from(EntityWithCompositeId.class);
+					cq.select(cb.count());
+					assertThat(entityManager.createQuery(cq).getSingleResult().intValue(), is(0));
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java
index c4b673e34c23..33c033b1a68b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa;
 
 import org.hibernate.dialect.H2Dialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java
index 93c765f61a7d..4e52186de950 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java
index bd22d100efb3..a892cd137024 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java
index 123d6bc31250..d8d7534ff848 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.jpa;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java
index 86e8e988e3ea..1ae4b497902b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.jpa;
 
 import org.hibernate.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
index 28d3011e60e8..654bb1bda48d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -404,40 +402,40 @@ public void testSetAndGetSerializedProperty() throws Exception {
 		}
 	}
 
-    @Test
-    public void testPersistExisting() throws Exception {
-        EntityManager em = getOrCreateEntityManager();
-        em.getTransaction().begin();
-        Wallet w = new Wallet();
-        w.setBrand( "Lacoste" );
-        w.setModel( "Minimic" );
-        w.setSerial( "0100202002" );
-        em.persist( w );
-        w = new Wallet();
-        w.setBrand( "Lacoste" );
-        w.setModel( "Minimic" );
-        w.setSerial( "0100202002" );
-        try {
-            em.persist( w );
-        }
-        catch ( EntityExistsException eee ) {
-            //success
-            if ( em.getTransaction() != null ) {
-                em.getTransaction().rollback();
-            }
-            em.close();
-            return;
-        }
-        try {
-            em.getTransaction().commit();
-            fail( "Should have raised an exception" );
-        }
-        catch ( PersistenceException pe ) {
-        }
-        finally {
-            em.close();
-        }
-    }
+	@Test
+	public void testPersistExisting() throws Exception {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+		Wallet w = new Wallet();
+		w.setBrand( "Lacoste" );
+		w.setModel( "Minimic" );
+		w.setSerial( "0100202002" );
+		em.persist( w );
+		w = new Wallet();
+		w.setBrand( "Lacoste" );
+		w.setModel( "Minimic" );
+		w.setSerial( "0100202002" );
+		try {
+			em.persist( w );
+		}
+		catch ( EntityExistsException eee ) {
+			//success
+			if ( em.getTransaction() != null ) {
+				em.getTransaction().rollback();
+			}
+			em.close();
+			return;
+		}
+		try {
+			em.getTransaction().commit();
+			fail( "Should have raised an exception" );
+		}
+		catch ( PersistenceException pe ) {
+		}
+		finally {
+			em.close();
+		}
+	}
 
 	@Test
 	public void testFactoryClosed() throws Exception {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerUnwrapTest.java
index 012e30101eb0..f68f2c720471 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerUnwrapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerUnwrapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java
index cc2900a7f2ff..2c6648eaf8ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -16,23 +14,23 @@
 @Entity
 public class EntityWithCompositeId implements Serializable {
 
-    @EmbeddedId
-    private CompositeId id;
-    private String description;
+	@EmbeddedId
+	private CompositeId id;
+	private String description;
 
-    public CompositeId getId() {
-        return id;
-    }
+	public CompositeId getId() {
+		return id;
+	}
 
-    public void setId(CompositeId id) {
-        this.id = id;
-    }
+	public void setId(CompositeId id) {
+		this.id = id;
+	}
 
-    public String getDescription() {
-        return description;
-    }
+	public String getDescription() {
+		return description;
+	}
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeIdFkAssociation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeIdFkAssociation.java
index 9c7fb172678a..720983d0cb9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeIdFkAssociation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeIdFkAssociation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
@@ -20,24 +18,24 @@
 @Table(name = "entity_composite_fk")
 public class EntityWithCompositeIdFkAssociation implements Serializable {
 
-    @Id
-    private int id;
-    @ManyToOne
-    private EntityWithCompositeId association;
+	@Id
+	private int id;
+	@ManyToOne
+	private EntityWithCompositeId association;
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public EntityWithCompositeId getAssociation() {
-        return association;
-    }
+	public EntityWithCompositeId getAssociation() {
+		return association;
+	}
 
-    public void setAssociation(EntityWithCompositeId association) {
-        this.association = association;
-    }
+	public void setAssociation(EntityWithCompositeId association) {
+		this.association = association;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java
index c133efa3be1a..3930fc6b1022 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java
index 88a46931f010..706eb19e5147 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
index 6a080dbbd424..30d52ce716f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java
index 309cbfc506bd..eaea2f494bb1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java
index 26f3ddfff2e0..354a2693ed00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.jpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -17,7 +13,7 @@
 @SuppressWarnings("serial")
 @Entity
 public class Kitten {
-	
+
 	private Integer id;
 	private String name;
 
@@ -43,21 +39,21 @@ public void setName(String name) {
 	 * Constructs a String with all attributes
 	 * in name = value format.
 	 *
-	 * @return a String representation 
+	 * @return a String representation
 	 * of this object.
 	 */
 	public String toString()
 	{
-	    final String TAB = "    ";
-	    
-	    String retValue = "";
-	    
-	    retValue = "Kitten ( "
-	        + super.toString() + TAB
-	        + "id = " + this.id + TAB
-	        + "name = " + this.name + TAB
-	        + " )";
-	
-	    return retValue;
+		final String TAB = "    ";
+
+		String retValue = "";
+
+		retValue = "Kitten ( "
+			+ super.toString() + TAB
+			+ "id = " + this.id + TAB
+			+ "name = " + this.name + TAB
+			+ " )";
+
+		return retValue;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java
index 54cbc432cee5..ec8271925707 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 import java.util.Date;
 import jakarta.persistence.PrePersist;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MapKeyTest.java
index ffad57cf8ef5..755305cedcc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MapKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MapKeyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 
 import java.text.SimpleDateFormat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java
index 75a7062a80be..b63469f0324d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java
index df83260bbb2d..5aa17ea4eb2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.jpa;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java
index 199e320e2651..44d7a87d7bd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 import org.hibernate.event.spi.PreInsertEvent;
 import org.hibernate.event.spi.PreInsertEventListener;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java
index c32a972e750e..e81899c4c2de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jpa;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
index d284ddddfda7..d069f00bb772 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.hibernate.testing.util.ServiceRegistryUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java
index 8a13662adab6..0cfb033e0639 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
index 80379a1ab555..a165fbb036a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java
index 1e84ae7c9322..1c69c3edf75f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa;
 import java.io.Serializable;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/AssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/AssociationTest.java
index ea89c08af834..10f324ba8be6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/AssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/AssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java
index 12b7855cd571..1108a2161522 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java
index 0c833228a604..4f2c59db841f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java
index b5c842c2c48c..a0d3b1d5541f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java
index 43301f41bfbf..e34d0b260d37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.association;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaJoinFetchTest.java
index 9c02295c7805..804d37921a4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaJoinFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.association.toone;
 
 import java.util.List;
@@ -134,7 +138,7 @@ public void testCriteriaFetchSingularAttribute2(EntityManagerFactoryScope scope)
 					final Fetch fetch = customer.fetch( address, JoinType.INNER );
 
 					fetch.fetch( entityManager.getMetamodel()
-										 .entity( Address.class ).getSingularAttribute( "note" ), JoinType.INNER );
+										.entity( Address.class ).getSingularAttribute( "note" ), JoinType.INNER );
 					criteriaQuery.select( customer );
 
 					final TypedQuery query = entityManager.createQuery( criteriaQuery );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java
index f1befe102f75..c0ef912b7556 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.association.toone;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java
index 709b5948f682..5768af717636 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java
index 14b0fd565347..ddea5946846b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/StatelessBeanValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/StatelessBeanValidationTest.java
index cf4c3cf19506..7a7a72ed809a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/StatelessBeanValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/StatelessBeanValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java
index e9312848e286..a41d9c2db699 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.beanvalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java
index cf3dbadab2fe..e1729220c700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.beanvalidation;
 
 import java.net.URL;
-import java.util.Collections;
 
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.validation.Validation;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java
index 4e0b46c303d7..6612abd8fb2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.boot;
 
@@ -68,4 +66,3 @@ protected Enumeration findResources(String name) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java
index 547db4c1e4ce..f94d787f983a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.boot;
 
 import jakarta.persistence.EntityManagerFactory;
 import java.net.URL;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.hibernate.orm.test.jpa.xml.versions.JpaXsdVersionsTest;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/PersistenceConfigurationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/PersistenceConfigurationTests.java
index e3a511539091..7a171bebb58c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/PersistenceConfigurationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/PersistenceConfigurationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.boot;
 
@@ -117,7 +115,7 @@ public void testForUserGuide() {
 			//end::example-bootstrap-standard-HibernatePersistenceConfiguration[]
 		}
 	}
-	
+
 	@Test
 	@RequiresDialect( H2Dialect.class )
 	public void testVarargs() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java
index 3e949a69c3e8..216f0273b128 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.annotation;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.SharedCacheMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java
index 8d7aa15aa574..e00745f95264 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.annotation;
 import jakarta.persistence.Cacheable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java
index 2515d01e8a7a..b34f4211d9b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.annotation;
 import jakarta.persistence.Cacheable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java
index 6162f7f87f7d..1094c962a5fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.annotation;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java
index c5bde5db8db5..fd8b56b884a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.api;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java
index 8d251609a40e..6e820be13a09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.api;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java
index d556da9155b5..61f1edd3c4f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.cachemodes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java
index 49fe12219dd0..61f534e9d809 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cacheable.cachemodes;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/City.java
index 1e021623cbaf..20a3c12db969 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/City.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/City.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.cacheable.disableselective;
 
 public class City {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/DisableCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/DisableCacheTest.java
index 7478489dc237..96a9123e6bd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/DisableCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/DisableCacheTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.cacheable.disableselective;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/Person.java
index 74e9cc464461..712e15630696 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/disableselective/Person.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.cacheable.disableselective;
 
 public class Person {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java
index 8973275ebf09..e3c3103dc943 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java
index 3443eaa6ba5b..c9c32934eb0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java
index 98fcfdddf8b6..24e8f2ef86db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java
index 0e63a1eacd9a..6fc7f6784509 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java
index 6c66ff73369e..41c71cd55940 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java
index 073cae9e10ed..fcadcc3dce12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java
@@ -1,18 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import java.util.ArrayList;
 import java.util.List;
 import jakarta.persistence.PrePersist;
 import jakarta.persistence.PreUpdate;
 
-import org.hibernate.orm.test.jpa.callbacks.Translation;
 
 /**
  * @author Emmanuel Bernard
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java
index 08117541d410..471f77c6aa03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java
index c0dad3b315c9..f4e92c2efda5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import java.math.BigDecimal;
 import jakarta.persistence.Entity;
@@ -67,4 +63,3 @@ public void setSalary(BigDecimal salary) {
 		this.salary = salary;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java
index 87ee8d0c9869..3a3a14bef906 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.PrePersist;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java
index d0705c525bf6..4e2c6c80cf22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.PreUpdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java
index beac957ad104..9cae4fb79f01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.PreUpdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java
index fa145b923e5e..540791878c9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java
index dab09fe5d6b8..287ab5449259 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistAndCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistAndCompositeIdTest.java
index 81172919364b..428c724e3610 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistAndCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistAndCompositeIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.callbacks;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistIdTest.java
index 217b7e1e06da..34d1a9d84424 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrePersistIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.callbacks;
 
 import jakarta.persistence.Entity;
@@ -18,22 +22,22 @@
 @SessionFactory
 @DomainModel(annotatedClasses = PrePersistIdTest.GeneratedIdInCallback.class)
 public class PrePersistIdTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction(s -> {
-            GeneratedIdInCallback entity = new GeneratedIdInCallback();
-            s.persist(entity);
-            assertTrue(entity.success);
-            assertNotNull(entity.uuid);
-        });
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction(s -> {
+			GeneratedIdInCallback entity = new GeneratedIdInCallback();
+			s.persist(entity);
+			assertTrue(entity.success);
+			assertNotNull(entity.uuid);
+		});
+	}
 
-    @Entity(name = "GeneratedIdInCallback")
-    static class GeneratedIdInCallback {
-        @Transient boolean success;
-        @Id @GeneratedValue UUID uuid;
-        @PrePersist void checkId() {
-            success = uuid != null;
-            assertNotNull(uuid);
-        }
-    }
+	@Entity(name = "GeneratedIdInCallback")
+	static class GeneratedIdInCallback {
+		@Transient boolean success;
+		@Id @GeneratedValue UUID uuid;
+		@PrePersist void checkId() {
+			success = uuid != null;
+			assertNotNull(uuid);
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java
index 0e8b9d8fdc03..3770e5f2045c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
-import java.nio.ByteBuffer;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java
index b50d3d50692f..b494f3ccc057 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java
index c6799a8f9568..992d7afc0089 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java
index 4ae86ca7ce39..b5bef7d08271 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java
index 757ecfb4baae..2c8a1831e960 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
index 9bffc159570d..2e593f65cb22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java
index 3734aba7978f..788eb0d8a52c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
@@ -23,7 +21,6 @@
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.LoggerInspectionRule;
-import org.hibernate.testing.logger.Triggerable;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.util.ExceptionUtil;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java
index 6ca84d493ca3..8fa0df4906c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java
index c02287dd4633..1da46ead1d72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import java.util.Date;
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java
index e4289ef524ce..5f1032dd1020 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java
index ef15147552c3..21d64fe6268e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java
index 9face5f655db..ef279c5076e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java
index 6e2658572454..625c2df4e61b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.callbacks;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.ExcludeSuperclassListeners;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/Entity.java
index 1f1bd07cba34..3dc205399558 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.hbmxml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java
index 89707aa91ced..7cc2d7923309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.hbmxml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java
index 861dab5af686..15b8ba9089f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/JournalingListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/JournalingListener.java
index 14a8ffc6932e..9467bfeed984 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/JournalingListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/JournalingListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/MyEntity.java
index 546aa6f05568..35f9490e7d45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/common/CallbackTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/common/CallbackTarget.java
index a3ee40984627..72be777dbffb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/common/CallbackTarget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/common/CallbackTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItem.java
index a41be81bde75..25d6ad92bbf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItemSuper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItemSuper.java
index cdff4dadcd89..96eba6b71a71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItemSuper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/LineItemSuper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerA.java
index 87e249a4bf85..9d6a46928cfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerA.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerB.java
index ba3e93f052f8..c126690ce026 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerC.java
index ff7270dd26bd..377be4b674e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerC.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerC.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerCompleteXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerCompleteXmlTests.java
index f1c816302d8e..a18852bc463a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerCompleteXmlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/ListenerCompleteXmlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Order.java
index 04e4cabc9667..8d7df308e3d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Product.java
index 06e16ea44540..21d25c9bb41b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/complete/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItem.java
index 60c984489ba1..0b3e5febdbc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItemSuper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItemSuper.java
index 4cc301aad9d3..f576c4b2a4e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItemSuper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/LineItemSuper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerA.java
index 52fbb4125646..f8431e06d295 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerA.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerB.java
index 4869078a22e4..2e4e6bc420a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerC.java
index 58184c998bb3..bcdb0df971f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerC.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerC.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerReplacementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerReplacementTests.java
index 2c3a9c3d9811..dafcf59da52f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerReplacementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/ListenerReplacementTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Order.java
index e79df49c060a..ed57d5e600d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Product.java
index 402f930acc35..1c89250dfe40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/replace/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.callbacks.xml.replace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java
index 2eca0d4a344c..a54848a8b4f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -16,7 +12,7 @@
  */
 @Entity
 public class Author {
- @Id @GeneratedValue
- private Long id;
+@Id @GeneratedValue
+private Long id;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/CascadeTest.java
index 57b10cd7d3cf..fa0bf0c45627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/CascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/CascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java
index 80e874da8ce2..e968243d5884 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DeleteOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DeleteOrphanTest.java
index 18a46f4088ce..3abdf29169e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DeleteOrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DeleteOrphanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java
index 57ba3659b53b..06e846b4fb6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java
index a4076db405da..731e83ea8d1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java
index 149b1286c00c..db4eedc89f7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -126,4 +122,3 @@ public void preRemove() {
 		getConference().setExtractionDocument( null );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest.java
index 9cf6aa44a74d..5f9146c19572 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest2.java
index e8f6637a9f5f..4142dc4073fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/FetchTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java
index 47b5eb244552..a9c1149d27e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java
index 9c57662a8c26..abf6aa18a1f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java
index 22b2744cc9e3..45fa309d5b8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java
index 5a9a40d94558..11fbd3c9f998 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java
index bb2e98185cce..aca64407f01b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import java.io.Serializable;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java
index 7acbbaaf67ee..dcb31fa25785 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java
index 294134750a5c..7c9362a9fbd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java
index 90e19bc84622..41deff081709 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java
index ee7f33d4f895..6c34c5a80b59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
@@ -22,15 +20,15 @@ public class Student {
 
 	@Id @GeneratedValue
 	Long id;
-	
+
 	String name;
-	
+
 	@ManyToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST})
 	private Teacher primaryTeacher;
 
 	@OneToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST})
 	private Teacher favoriteTeacher;
-	
+
 	public  Student() {
 	}
 
@@ -49,7 +47,7 @@ public Teacher getPrimaryTeacher() {
 	public void setPrimaryTeacher(Teacher relativeTo) {
 		this.primaryTeacher = relativeTo;
 	}
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -57,7 +55,7 @@ public Long getId() {
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java
index 49009b2943e5..f45fbab3c39a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 
@@ -21,10 +19,10 @@
 @Entity
 @Access(AccessType.FIELD)
 public class Teacher {
-	
+
 	@Id @GeneratedValue
 	Long id;
-	
+
 	String name;
 
 	@OneToMany(mappedBy="primaryTeacher", cascade={CascadeType.MERGE, CascadeType.PERSIST})
@@ -32,7 +30,7 @@ public class Teacher {
 
 	@OneToOne(mappedBy="favoriteTeacher", cascade={CascadeType.MERGE, CascadeType.PERSIST})
 	private Student favoriteStudent;
-	
+
 	public  Teacher() {
 	}
 
@@ -53,15 +51,15 @@ public void setStudents(
 			Set todoCollection) {
 		this.students = todoCollection;
 	}
-	
+
 	public Long getId() {
 		return id;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java
index 981dc8ef8fb8..701e20a67ec3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.cascade;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java
index 43ca9b29db04..47d05e44797b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
index 8a3896832c42..d163fb8f5ef4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java
index 047444e0e871..95d1fdac8d5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class B extends AbstractEntity {
-    private static final long serialVersionUID = 325417243L;
+	private static final long serialVersionUID = 325417243L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "b")
-    private java.util.Set gCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "b")
+	private java.util.Set gCollection = new java.util.HashSet();
 
 
 	/**
@@ -32,30 +30,30 @@ public class B extends AbstractEntity {
 
 
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.ManyToOne(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , optional = false)
-    private D d;
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.ManyToOne(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, optional = false)
+	private D d;
 
-    public java.util.Set getGCollection() {
-        return gCollection;
-    }
+	public java.util.Set getGCollection() {
+		return gCollection;
+	}
 
-    public void setGCollection(
-        java.util.Set parameter) {
-        this.gCollection = parameter;
-    }
+	public void setGCollection(
+		java.util.Set parameter) {
+		this.gCollection = parameter;
+	}
 
-    public C getC() {
-        return c;
-    }
+	public C getC() {
+		return c;
+	}
 
-    public void setC(C parameter) {
-        this.c = parameter;
-    }
+	public void setC(C parameter) {
+		this.c = parameter;
+	}
 
 	public D getD() {
 		return d;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java
index 7f93aef8f762..902a802d5bb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -13,7 +11,7 @@
  */
 @jakarta.persistence.Entity
 public class C extends AbstractEntity {
-    private static final long serialVersionUID = 1226955752L;
+	private static final long serialVersionUID = 1226955752L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "c")
 	private Set bCollection = new java.util.HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java
index 8f4b54290bac..02ad045dab16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class D extends AbstractEntity {
-    private static final long serialVersionUID = 2417176961L;
+	private static final long serialVersionUID = 2417176961L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "d")
 	private java.util.Set bCollection = new java.util.HashSet();
@@ -22,11 +20,11 @@ public class D extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private E e;
 
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH},
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH},
 			mappedBy = "d"
-    )
-    private java.util.Set fCollection = new java.util.HashSet();
+	)
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public java.util.Set getBCollection() {
 		return bCollection;
@@ -50,12 +48,12 @@ public void setE(E e) {
 		this.e = e;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
 			java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+		this.fCollection = parameter;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java
index d54bfb15047f..dc40a5742afd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -11,7 +9,7 @@
  */
 @jakarta.persistence.Entity
 public class E extends AbstractEntity {
-    private static final long serialVersionUID = 1226955558L;
+	private static final long serialVersionUID = 1226955558L;
 
 	@jakarta.persistence.OneToMany(mappedBy = "e")
 	private java.util.Set dCollection = new java.util.HashSet();
@@ -26,10 +24,10 @@ public void setDCollection(java.util.Set dCollection) {
 		this.dCollection = dCollection;
 	}
 
-    public F getF() {
-        return f;
-    }
-    public void setF(F parameter) {
-        this.f = parameter;
-    }
+	public F getF() {
+		return f;
+	}
+	public void setF(F parameter) {
+		this.f = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java
index 88b324349e92..341448a88c81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -11,15 +9,15 @@
  */
 @jakarta.persistence.Entity
 public class F extends AbstractEntity {
-    private static final long serialVersionUID = 1471534025L;
+	private static final long serialVersionUID = 1471534025L;
 
-    /**
-     * No documentation
-     */
-    @jakarta.persistence.OneToMany(cascade =  {
-        jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
-    , mappedBy = "f")
-    private java.util.Set eCollection = new java.util.HashSet();
+	/**
+	 * No documentation
+	 */
+	@jakarta.persistence.OneToMany(cascade =  {
+		jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}
+	, mappedBy = "f")
+	private java.util.Set eCollection = new java.util.HashSet();
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private D d;
@@ -27,20 +25,20 @@ public class F extends AbstractEntity {
 	@jakarta.persistence.ManyToOne(optional = false)
 	private G g;
 
-    public java.util.Set getECollection() {
-        return eCollection;
-    }
-    public void setECollection(
-        java.util.Set parameter) {
-        this.eCollection = parameter;
-    }
-
-    public D getD() {
-        return d;
-    }
-    public void setD(D parameter) {
-        this.d = parameter;
-    }
+	public java.util.Set getECollection() {
+		return eCollection;
+	}
+	public void setECollection(
+		java.util.Set parameter) {
+		this.eCollection = parameter;
+	}
+
+	public D getD() {
+		return d;
+	}
+	public void setD(D parameter) {
+		this.d = parameter;
+	}
 
 	public G getG() {
 		return g;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java
index d9327575f1c6..81afb16f23e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
@@ -11,13 +9,13 @@
  */
 @jakarta.persistence.Entity
 public class G extends AbstractEntity {
-    private static final long serialVersionUID = 325417437L;
+	private static final long serialVersionUID = 325417437L;
 
 	@jakarta.persistence.ManyToOne(optional = false)
 	private B b;
 
-    @jakarta.persistence.OneToMany(mappedBy = "g")
-    private java.util.Set fCollection = new java.util.HashSet();
+	@jakarta.persistence.OneToMany(mappedBy = "g")
+	private java.util.Set fCollection = new java.util.HashSet();
 
 	public B getB() {
 		return b;
@@ -26,11 +24,11 @@ public void setB(B parameter){
 		this.b = parameter;
 	}
 
-    public java.util.Set getFCollection() {
-        return fCollection;
-    }
-    public void setFCollection(
-        java.util.Set parameter) {
-        this.fCollection = parameter;
-    }
+	public java.util.Set getFCollection() {
+		return fCollection;
+	}
+	public void setFCollection(
+		java.util.Set parameter) {
+		this.fCollection = parameter;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java
index 475674ca61c8..986b23218773 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multicircle;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java
index a26b96b07a14..24a63d1db3b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
@@ -15,25 +13,25 @@
 @Entity
 @Table(name = "BOTTOM")
 public class Bottom {
-    @Id
-    @GeneratedValue
-    private Long id;
-    @OneToOne(mappedBy = "bottom")
-    private Middle middle;
+	@Id
+	@GeneratedValue
+	private Long id;
+	@OneToOne(mappedBy = "bottom")
+	private Middle middle;
 
-    Long getId() {
-        return id;
-    }
+	Long getId() {
+		return id;
+	}
 
-    void setId(Long id) {
-        this.id = id;
-    }
+	void setId(Long id) {
+		this.id = id;
+	}
 
-    Middle getMiddle() {
-        return middle;
-    }
+	Middle getMiddle() {
+		return middle;
+	}
 
-    void setMiddle(Middle middle) {
-        this.middle = middle;
-    }
+	void setMiddle(Middle middle) {
+		this.middle = middle;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java
index e65867a19822..9beb8c65ecfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
@@ -17,45 +15,45 @@
 @Entity
 @Table(name = "MIDDLE")
 public class Middle {
-    @Id
-    private Long id;
-    @ManyToOne
-    private Top top;
+	@Id
+	private Long id;
+	@ManyToOne
+	private Top top;
 
-    @OneToOne(cascade = { CascadeType.ALL })
-    @JoinColumn(name = "BOTTOM_ID")
-    private Bottom bottom;
+	@OneToOne(cascade = { CascadeType.ALL })
+	@JoinColumn(name = "BOTTOM_ID")
+	private Bottom bottom;
 
-    private Middle() {
+	private Middle() {
 
-    }
+	}
 
-    public Middle(Long i) {
-        this.id = i;
-    }
+	public Middle(Long i) {
+		this.id = i;
+	}
 
-    Long getId() {
-        return id;
-    }
+	Long getId() {
+		return id;
+	}
 
-    void setId(Long id) {
-        this.id = id;
-    }
+	void setId(Long id) {
+		this.id = id;
+	}
 
-    Top getTop() {
-        return top;
-    }
+	Top getTop() {
+		return top;
+	}
 
-    void setTop(Top top) {
-        this.top = top;
-    }
+	void setTop(Top top) {
+		this.top = top;
+	}
 
-    Bottom getBottom() {
-        return bottom;
-    }
+	Bottom getBottom() {
+		return bottom;
+	}
 
-    void setBottom(Bottom bottom) {
-        this.bottom = bottom;
-        bottom.setMiddle(this);
-    }
+	void setBottom(Bottom bottom) {
+		this.bottom = bottom;
+		bottom.setMiddle(this);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java
index bc26bcf011b5..fb31b0f92226 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java
index f18e72ff1355..fbb44aed7917 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java
index ea7c8859004d..29d046a10744 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java
index add0c7501a1d..461a5a953528 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java
index afe9d0d9d1e0..000a5eaa9d0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade.multilevel;
 
@@ -18,34 +16,34 @@
 @Entity
 @Table(name = "T_TOP")
 public class Top {
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "top")
-    List middles;
-
-    Long getId() {
-        return id;
-    }
-
-    void setId(Long id) {
-        this.id = id;
-    }
-
-    List getMiddles() {
-        if (middles == null) {
-            middles = new ArrayList();
-        }
-        return middles;
-    }
-
-    void setMiddles(List middles) {
-        this.middles = middles;
-    }
-
-    void addMiddle(Middle middle) {
-        this.getMiddles().add(middle);
-        middle.setTop(this);
-    }
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@OneToMany(cascade = { CascadeType.ALL }, mappedBy = "top")
+	List middles;
+
+	Long getId() {
+		return id;
+	}
+
+	void setId(Long id) {
+		this.id = id;
+	}
+
+	List getMiddles() {
+		if (middles == null) {
+			middles = new ArrayList();
+		}
+		return middles;
+	}
+
+	void setMiddles(List middles) {
+		this.middles = middles;
+	}
+
+	void addMiddle(Middle middle) {
+		this.getMiddles().add(middle);
+		middle.setTop(this);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java
index b0343bd00f1c..8a55362abb9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Child.java
index 527778b59829..9fbfefc2e4c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildAssigned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildAssigned.java
index 9ff6a1e30d9d..30dfdf168c62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildAssigned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildAssigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfo.java
index d26072c65710..5bae6032f0bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfoAssigned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfoAssigned.java
index 771de352c13b..3ba9e133f441 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfoAssigned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ChildInfoAssigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Other.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Other.java
index da601c87a868..793e582a8647 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Other.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Other.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/OtherAssigned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/OtherAssigned.java
index 491b7625bf94..4a28726aa3e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/OtherAssigned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/OtherAssigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Parent.java
index fb3a3a0cb863..64ffd4390253 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentAssigned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentAssigned.java
index 7959deba5dd6..30f31e114baf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentAssigned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentAssigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfo.java
index b0c3698d3004..ab30e27a79fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfoAssigned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfoAssigned.java
index 89e41874e125..93cefdc53fd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfoAssigned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/ParentInfoAssigned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cascade2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java
index c268b805d056..7228971e05bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cdi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java
index 1911bf595a0c..aa0aa09508ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.cdi;
 
 import java.io.Serializable;
@@ -268,4 +272,4 @@ public String getName() {
 			return name;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java
index b382a00c561b..acfac91dfc65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cdi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java
index b5a1eca3b1fd..7d858cd85215 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.cdi;
 
-import java.util.Collections;
 import java.util.Map;
 
 import jakarta.persistence.EntityManagerFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java
index 9ab9970eb956..b141ba31e871 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.collection;
 
@@ -13,30 +11,28 @@
 @Entity
 public class Child {
 
-    private Integer id;
-    private Parent daddy;
-    
-    public Child() {
-        
-    }
-    
-    @Id
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    @ManyToOne
-    public Parent getDaddy() {
-        return daddy;
-    }
-    public void setDaddy(Parent daddy) {
-        this.daddy = daddy;
-    }
-    
-    
-}
+	private Integer id;
+	private Parent daddy;
+
+	public Child() {
+
+	}
 
+	@Id
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
+	@ManyToOne
+	public Parent getDaddy() {
+		return daddy;
+	}
+	public void setDaddy(Parent daddy) {
+		this.daddy = daddy;
+	}
+
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java
index b2d66093655d..ca2c5845bc6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.collection;
 
@@ -20,38 +18,37 @@
 @Entity
 public class Parent {
 
-    private Integer id;
-    private Set children = new HashSet();
-    private int nrOfChildren;
-    
-    public Parent() {
-        
-    }
-    
-    @Id
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    @OneToMany(mappedBy="daddy", fetch=FetchType.EAGER, cascade=CascadeType.ALL)
-    public Set getChildren() {
-        return children;
-    }
-    public void setChildren(Set children) {
-        this.children = children;
-    }
-    
-    @PostLoad
-    public void postLoad() {
-       nrOfChildren = children.size();
-    }
-    
-    @Transient
-    public int getNrOfChildren() {
-        return nrOfChildren;
-    }
-}
+	private Integer id;
+	private Set children = new HashSet();
+	private int nrOfChildren;
+
+	public Parent() {
+
+	}
+
+	@Id
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
+	@OneToMany(mappedBy="daddy", fetch=FetchType.EAGER, cascade=CascadeType.ALL)
+	public Set getChildren() {
+		return children;
+	}
+	public void setChildren(Set children) {
+		this.children = children;
+	}
+
+	@PostLoad
+	public void postLoad() {
+	nrOfChildren = children.size();
+	}
+
+	@Transient
+	public int getNrOfChildren() {
+		return nrOfChildren;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/PostLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/PostLoadTest.java
index cc591e4beca5..e423d1a484ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/PostLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/PostLoadTest.java
@@ -1,80 +1,78 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.jpa.collection;
-
-import java.util.List;
-
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.Jira;
-import org.hibernate.testing.orm.junit.Jpa;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@Jpa( annotatedClasses = { Child.class, Parent.class } )
-public class PostLoadTest {
-	@BeforeAll
-	public void setUp(EntityManagerFactoryScope scope) {
-		scope.inTransaction( entityManager -> {
-			final Parent parent1 = new Parent();
-			parent1.setId( 1 );
-			final Child child1 = new Child();
-			child1.setId( 1 );
-			child1.setDaddy( parent1 );
-			entityManager.persist( parent1 );
-			entityManager.persist( child1 );
-			final Parent parent2 = new Parent();
-			parent2.setId( 2 );
-			final Child child2 = new Child();
-			child2.setId( 2 );
-			child2.setDaddy( parent2 );
-			entityManager.persist( parent2 );
-			entityManager.persist( child2 );
-		} );
-	}
-
-	@AfterAll
-	public void tearDown(EntityManagerFactoryScope scope) {
-		scope.inTransaction( entityManager -> {
-			entityManager.createQuery( "delete from Child" ).executeUpdate();
-			entityManager.createQuery( "delete from Parent" ).executeUpdate();
-		} );
-	}
-
-	/**
-	 * Load an entity with a collection of associated entities, that uses a @PostLoad method to
-	 * access the association.
-	 */
-	@Test
-	@Jira( "https://hibernate.atlassian.net/browse/HHH-6043" )
-	public void testAccessAssociatedSetInPostLoad(EntityManagerFactoryScope scope) {
-		scope.inEntityManager(
-				entityManager -> {
-					Parent daddy = entityManager.find( Parent.class, 1 );
-					assertEquals( 1, daddy.getNrOfChildren() );
-				}
-		);
-	}
-
-	@Test
-	@Jira( "https://hibernate.atlassian.net/browse/HHH-17489" )
-	public void testAccessAssociatedSetInPostLoadQuery(EntityManagerFactoryScope scope) {
-		scope.inEntityManager( entityManager -> {
-			final CriteriaQuery cq = entityManager.getCriteriaBuilder().createQuery( Parent.class );
-			final Root from = cq.from( Parent.class );
-			final List parents = entityManager.createQuery( cq.select( from ) ).getResultList();
-			assertEquals( 2, parents.size() );
-			assertEquals( 1, parents.get( 0 ).getNrOfChildren() );
-			assertEquals( 1, parents.get( 1 ).getNrOfChildren() );
-		} );
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.collection;
+
+import java.util.List;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa( annotatedClasses = { Child.class, Parent.class } )
+public class PostLoadTest {
+	@BeforeAll
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			final Parent parent1 = new Parent();
+			parent1.setId( 1 );
+			final Child child1 = new Child();
+			child1.setId( 1 );
+			child1.setDaddy( parent1 );
+			entityManager.persist( parent1 );
+			entityManager.persist( child1 );
+			final Parent parent2 = new Parent();
+			parent2.setId( 2 );
+			final Child child2 = new Child();
+			child2.setId( 2 );
+			child2.setDaddy( parent2 );
+			entityManager.persist( parent2 );
+			entityManager.persist( child2 );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			entityManager.createQuery( "delete from Child" ).executeUpdate();
+			entityManager.createQuery( "delete from Parent" ).executeUpdate();
+		} );
+	}
+
+	/**
+	 * Load an entity with a collection of associated entities, that uses a @PostLoad method to
+	 * access the association.
+	 */
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-6043" )
+	public void testAccessAssociatedSetInPostLoad(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					Parent daddy = entityManager.find( Parent.class, 1 );
+					assertEquals( 1, daddy.getNrOfChildren() );
+				}
+		);
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-17489" )
+	public void testAccessAssociatedSetInPostLoadQuery(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
+			final CriteriaQuery cq = entityManager.getCriteriaBuilder().createQuery( Parent.class );
+			final Root from = cq.from( Parent.class );
+			final List parents = entityManager.createQuery( cq.select( from ) ).getResultList();
+			assertEquals( 2, parents.size() );
+			assertEquals( 1, parents.get( 0 ).getNrOfChildren() );
+			assertEquals( 1, parents.get( 1 ).getNrOfChildren() );
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest.java
index 42d1f53565c0..3e6ebc7cbb1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest2.java
index 614be555af79..719db36e194c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndEmbeddableTest2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndExceptionTest.java
index f3e87607f26b..7db9889b59a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/AnnotationConverterAndExceptionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CacheTest.java
index 0a32d691422f..156ae4a23b41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaDeleteTest.java
index 98b1cd732127..9c935e5a22af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -84,4 +82,4 @@ public String getName() {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaFunctionParametersBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaFunctionParametersBindingTest.java
index e26d9c9df3ef..207a24527c51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaFunctionParametersBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaFunctionParametersBindingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -52,7 +50,7 @@ public void setUp(EntityManagerFactoryScope scope) {
 	@AfterEach
 	public void tearDown(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager ->
-									 entityManager.createQuery( "delete from Person" ).executeUpdate() );
+									entityManager.createQuery( "delete from Person" ).executeUpdate() );
 	}
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetCorrelatedJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetCorrelatedJoinsTest.java
index bc7ff27b9370..73ca443063b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetCorrelatedJoinsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetCorrelatedJoinsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetParametersTest.java
index a8ba71b6b4da..db9ba84c98cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaGetParametersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -10,11 +8,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -95,7 +91,7 @@ public void likeExpStringExpTest(EntityManagerFactoryScope scope) {
 					final EntityType Person_ = entityManager.getMetamodel().entity( Person.class );
 					Join a = customer.join( Person_.getCollection( "addresses", Address.class ) );
 					cquery.where( cbuilder.like( a.get( "street" ), "sh\\_ll",
-												 cbuilder.literal( '\\' )
+												cbuilder.literal( '\\' )
 					) );
 					cquery.select( customer );
 					TypedQuery tquery = entityManager.createQuery( cquery );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsFalseTest.java
index b000eb285e65..1cf0370804b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsNullTest.java
index a466a0c03251..b535203ca80b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaIsNullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaLiteralValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaLiteralValue.java
index 54306425351e..815b117999c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaLiteralValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaLiteralValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryTableTest.java
index ba917d7bcd16..600eef60e3b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryWithSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryWithSecondaryTableTest.java
index b76d4ce00d35..74b817f78a46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryWithSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaMutationQueryWithSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaNoPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaNoPredicateTest.java
index 80f0c57d07f4..2ef2a1ee36e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaNoPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaNoPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -10,16 +8,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.criteria.CollectionJoin;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Join;
-import jakarta.persistence.criteria.JoinType;
-import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Root;
-import jakarta.persistence.metamodel.EntityType;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -32,9 +23,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @Jpa(
@@ -87,7 +75,7 @@ public void nullPredicateTest(EntityManagerFactoryScope scope) {
 					query.orderBy();
 					List persons = entityManager.createQuery(query).getResultList();
 					assertEquals(2, persons.size());
-					
+
 					entityManager.getTransaction().begin();
 					final CriteriaDelete delete = criteriaBuilder.createCriteriaDelete(Person.class);
 					query.from(Person.class);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaPredicateTest.java
index 8b8d3a137922..f148481cf85f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaRecursiveCteCopyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaRecursiveCteCopyTest.java
index 641fc97c3cbe..3fcc92076095 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaRecursiveCteCopyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaRecursiveCteCopyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaSubqueryTest.java
index 25eac43aa816..34d2d646b59f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaSubqueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
index 29bddacec166..5bd05bde9337 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -150,4 +148,4 @@ public Person(Integer id, String name, Integer age) {
 			this.ageAsBigDecimal = new BigDecimal( age );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaWrongResultClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaWrongResultClassTest.java
index 039cc7b643a5..70406822e9f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaWrongResultClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaWrongResultClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -13,7 +11,6 @@
 import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CrtiteriaGetResultTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CrtiteriaGetResultTypeTest.java
index 14e1a4eacfed..f014bc992c08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CrtiteriaGetResultTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CrtiteriaGetResultTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java
index 41d9648b620d..862c0ef12c7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerCreateQueryRuntimeExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerCreateQueryRuntimeExceptionTest.java
index c7507b72da3e..64d4c971a2ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerCreateQueryRuntimeExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerCreateQueryRuntimeExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerFindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerFindTest.java
index 40a5f2bb88ce..4c3d85286296 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerFindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EntityManagerFindTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetJavaTypeTest.java
index 7a2c13865256..16d8e54b1f68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetJavaTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetParameterTest.java
index 282a976fc33e..5a7abb23186d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/GetParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/IllegalArgumentExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/IllegalArgumentExceptionTest.java
index ab04b005b907..7ee04f8c0bc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/IllegalArgumentExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/IllegalArgumentExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JoinTest.java
index 29b6c5d6ec73..5b56969d29ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java
index 9f61d186ae47..0c41508d9b0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JpaComplianceTests.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
 import java.util.Collections;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.jpa.internal.MutableJpaComplianceImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java
index 99d78a576ae6..3f57e68bbfe6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocalTimeTest.java
index e4d41cc09276..2008f0da8811 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocalTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocalTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocateTest.java
index 8b69db79bbdd..9b35db215638 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/LocateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
@@ -97,7 +95,7 @@ public void testLocate2(EntityManagerFactoryScope scope) {
 
 					final Expression locate = criteriaBuilder.locate(
 							personRoot.get( "name" ),
-							 "nd" ,
+							"nd" ,
 							1
 					);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ModulusTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ModulusTest.java
index d5ca351a9199..3d37b8cfded8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ModulusTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ModulusTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
index 47db1ef307b6..211a2841ca37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
index 56d9bb017c98..03a7aefca6a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ProdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ProdTest.java
index 494f6747e8c3..f4e06863ed46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ProdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/ProdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/PostLoadCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/PostLoadCallbackTest.java
index d27222e73278..3c7147e2713e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/PostLoadCallbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/PostLoadCallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.callback;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/MultiListenersAppliedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/MultiListenersAppliedTest.java
index 8e3d681aeeff..a4d4ff304c5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/MultiListenersAppliedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/MultiListenersAppliedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.compliance.callback.listener;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/PersonListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/PersonListener.java
index e8369ed0dca0..1df0b6e53146 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/PersonListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/callback/listener/PersonListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.callback.listener;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByElementCollectionTest.java
index e1a7b49112d1..253182501991 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.orderby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByTest.java
index 8ab1c114c8d9..d136e7d8f67c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/orderby/OrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.orderby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java
index 00f221e52a9e..88a6fabda666 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java
index 638133191d95..1066b284fe26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedManagerTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java
index 2ae79a0544f9..cf43e4fd6816 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java
index 7b80e36ab9dc..a0f3b104865d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java
index 2f65f2b01ea5..8eea53ecc4be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java
index 54e175f3f474..d2a3fd5907d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java
index 5377dea36f83..50c1fb251d24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java
index e66aa16e0d78..236e6b299793 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java
index d6bd19a80a78..4067d80d7c8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java
index 13f302cdbc55..f129e4c562d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java
index 2dd6d9da9aad..33a08e903c07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java
index f520fca23394..f04797b16e24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java
index bbaae7c439b3..b996acb7a0c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.caching;
 
@@ -20,7 +18,6 @@
 import org.hibernate.Hibernate;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.stat.spi.StatisticsImplementor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java
index 2c79c55c7107..54df10ace2e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java
index ae2b07fb1d93..b5d4bf44d645 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java
index ee1550276af2..16f050082f64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.joincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/JoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/JoinColumnTest.java
index d2cdd9371b93..3c939df5febc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/JoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/JoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.joincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java
index 1d6bcc3aca2c..046de674eb78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.joincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java
index 2570e433d89d..f33a8d80782d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java
index e4f1b9c8243a..65e1938a707e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn;
 
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java
index b7a5cfd218a8..02c3eae4656f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java
index dc6d0e480c1f..6d482f162195 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java
index 2e0a85a168df..49ced5d72723 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java
index b5175723d813..2ddd2c5114b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.connection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java
index a4f033222136..d5489301fbf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.jpa.connection;
 
 import java.net.URL;
@@ -38,9 +33,9 @@
  * @author Emmanuel Bernard
  */
 public class DataSourceInjectionTest {
-    @Test
+	@Test
 	public void testDatasourceInjection() throws Exception {
-    	withPuRoot(
+		withPuRoot(
 				puRootUrl -> {
 					final PersistenceUnitInfoAdapter persistenceUnitInfo = createPuDescriptor( puRootUrl, new FakeDataSource() );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSource.java
index e5b4abaa585f..0ac936b50e14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSource.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSource.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.connection;
 import java.io.PrintWriter;
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSourceException.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSourceException.java
index b564f0aadbe0..d400100d9828 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSourceException.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/FakeDataSourceException.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.connection;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java
index f782599817ad..984049eaba94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.convert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java
index 2ecb9497a378..7efc9dd2a6ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.convert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/package-info.java
index 8529aa451474..4646a74888b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/package-info.java
@@ -22,6 +22,6 @@
  * Boston, MA  02110-1301  USA
  */
 /**
- * Package for testing JPA converters and the {@link jakarta.persistence.Convert @Convert} annotation. 
+ * Package for testing JPA converters and the {@link jakarta.persistence.Convert @Convert} annotation.
  */
 package org.hibernate.orm.test.jpa.convert;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/AbstractCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/AbstractCriteriaTest.java
index 9a5ed6cd76d9..f327c45b6f4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/AbstractCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/AbstractCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java
index a727b7e0aa4d..691049bdd705 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Attribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Attribute.java
index 3d378e1e5c7b..bfb904497989 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Attribute.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Attribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java
index 6431ade719ff..a8b7d9c06314 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java
index 26a703a8df9e..33c18bb7e458 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java
index cc55ed8285e5..d1fe6136ec1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaBulkUpdateQuotedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaBulkUpdateQuotedInheritanceTest.java
index 18eba6ec1723..50b99a46bfe8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaBulkUpdateQuotedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaBulkUpdateQuotedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java
index 4aea91f7eda9..8b3e38c30745 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
@@ -22,7 +20,6 @@
 import org.hibernate.CacheMode;
 import org.hibernate.query.Query;
 import org.hibernate.ScrollMode;
-import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.orm.test.jpa.callbacks.RemoteControl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaDynamicInstantiationInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaDynamicInstantiationInheritanceTest.java
index c00664eed401..f2e146067fcf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaDynamicInstantiationInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaDynamicInstantiationInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQualifiedJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQualifiedJoinTest.java
index 222a19adddef..bdc8da9076eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQualifiedJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQualifiedJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
@@ -22,7 +20,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.sqm.tree.SqmJoinType;
 
-import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jira;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java
index 8c7a321f7a87..050433e94f40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaToOneIdJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaToOneIdJoinTest.java
index 3cd579568d81..3a1cf14edbd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaToOneIdJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaToOneIdJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaTreatedJoinInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaTreatedJoinInSubqueryTest.java
index 3a6b567a9103..42025e50f5af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaTreatedJoinInSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaTreatedJoinInSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java
index eea285d23665..5df800bcc754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWithDynamicInstantiationAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWithDynamicInstantiationAndOrderByTest.java
index e61ab5607ff4..4901e2c02026 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWithDynamicInstantiationAndOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWithDynamicInstantiationAndOrderByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java
index 2b8616b1a629..d89a4b6abd24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java
index daca4ed04454..810cf2c64f38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
 
 /**
  * Elephant
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java
index 36cc0bfdbb81..51c6975c3aa7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseJoinedSubclassOptimizationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseJoinedSubclassOptimizationTest.java
index dcf1c21f49a0..7349fef93a19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseJoinedSubclassOptimizationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseJoinedSubclassOptimizationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseSingleTableOptimizationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseSingleTableOptimizationTest.java
index 684135782c7c..c530ceff2d7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseSingleTableOptimizationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseSingleTableOptimizationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseUnionSubclassOptimizationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseUnionSubclassOptimizationTest.java
index e921bb005411..28602af8b79f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseUnionSubclassOptimizationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntityUseUnionSubclassOptimizationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java
index 4276091d9aab..8f8b845cae87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java
index 84c341ff17ad..830a71a4a42f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
 
 /**
  * Human
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/HumanDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/HumanDTO.java
index 2ce4284884fa..6ece660f63d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/HumanDTO.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/HumanDTO.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
@@ -43,4 +41,4 @@ public String getDateBorn() {
 	public void setDateBorn(String dateBorn) {
 		this.dateBorn = dateBorn;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java
index 9c213c5f6cbe..df70a65a8ade 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java
@@ -1,31 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.MariaDBDialect;
-import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.SybaseDialect;
-import org.hibernate.query.spi.QueryImplementor;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
@@ -36,7 +22,6 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @implNote Skipped for Dialects which do not support at lease
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java
index 48a46389c327..6a760825911b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java
index d7e35ac46437..db9827cac305 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java
index 67f85d711259..50a24d9d9c77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java
index 7217b70f57b5..3b40c061f5ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
@@ -125,7 +123,7 @@ public void testNoAssignments() {
 		em.getTransaction().rollback();
 		em.close();
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-8434")
 	public void basicMultipleAssignments() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiSelectResultTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiSelectResultTypeTest.java
index 110bab83af0f..cb0cfd874f44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiSelectResultTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiSelectResultTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java
index 808884f7184d..67bfbc7dceef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
index 7e8701e1e8db..2052784a8e89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import org.hibernate.query.QueryArgumentException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java
index cd238b70a012..01c16075cc63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
index 3c637de2715c..5c8cf899892c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java
index 8c9bafca8e16..8ce01730285e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.List;
@@ -5,7 +9,6 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -54,7 +57,7 @@ public void testIt(EntityManagerFactoryScope scope) {
 
 					if ( getDialect( scope ) instanceof DerbyDialect ) {
 						/**
-						 for Derby dialect we are emulating the power function see {@link CommonFunctionFactory#power_expLn()}.
+						for Derby dialect we are emulating the power function see {@link CommonFunctionFactory#power_expLn()}.
 						 */
 						assertThat( results.get( 0 ) ).isEqualTo( 2500D, Offset.offset( 0.000000000001 ) );
 					}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java
index 0abe2a0914a4..e279e54b5c7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java
index 213153f629a9..809fcd3d947a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.HashSet;
@@ -15,7 +19,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SelectOnlyArrayPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SelectOnlyArrayPropertyTest.java
index bb41ead74f6b..20cd8518d32e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SelectOnlyArrayPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SelectOnlyArrayPropertyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java
index 68e1c5cec16b..07b6c4f80b67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java
index e16d6755d3a9..8446b85dab0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatAbstractSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatAbstractSuperclassTest.java
index d1f69fbf4f85..d69749281a3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatAbstractSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatAbstractSuperclassTest.java
@@ -1,13 +1,9 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatCorrelatedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatCorrelatedTest.java
index e7962246f38b..1eef11880fd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatCorrelatedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatCorrelatedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java
index 52c741d25e06..7ade4e2740cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
@@ -13,7 +11,6 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
index 8197d582a9d0..586c5cdd4f3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
index 28c0f86c8d25..c848d969da8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java
index 1b63ccaa850f..833b61332b76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatPathTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatPathTest.java
index e64f608a0834..f507c103c262 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatPathTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatPathTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.hibernate.annotations.Any;
@@ -42,7 +39,6 @@
 import jakarta.persistence.criteria.Root;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Marco Belladelli
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java
index 69fcbcaba69c..6495d4b278ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/WrappedEntityCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/WrappedEntityCriteriaTest.java
index 4e640d44bed5..ebb35f0794da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/WrappedEntityCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/WrappedEntityCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java
index 997666d3f8f9..c408da9b623f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.alias;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java
index f54292880351..89779a6154ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java
index 0ece555b7087..f3c1b4c7868e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
@@ -103,16 +101,16 @@ public void testFunctionCriteria() {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery query = cb.createQuery( Wall.class );
 		Root root = query.from( Wall.class );
-		
+
 		query.select( root ).where( cb.equal( root.get( "color" ), cb.lower( cb.literal( "YELLOW" ) ) ) );
-		
+
 		Wall resultItem = em.createQuery( query ).getSingleResult();
 		assertNotNull( resultItem );
-		
+
 		em.getTransaction().commit();
 		em.close();
 	}
-    
+
 	@Test
 	@JiraKey( value = "HHH-8914" )
 	public void testDoubleNegation() {
@@ -120,20 +118,20 @@ public void testDoubleNegation() {
 		wall1.setColor( "yellow" );
 		Wall wall2 = new Wall();
 		wall2.setColor( null );
-		
+
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();
 		em.persist( wall1 );
 		em.persist( wall2 );
 		em.getTransaction().commit();
 		em.clear();
-		
+
 		em.getTransaction().begin();
-		
+
 		// Although the examples are simplified and the usages appear pointless,
 		// double negatives can occur in some dynamic applications (regardless
 		// if it results from bad design or not).  Ensure we handle them as expected.
-		
+
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery query = cb.createQuery( Wall.class );
 		Root root = query.from( Wall.class );
@@ -143,7 +141,7 @@ public void testDoubleNegation() {
 		Wall result = em.createQuery( query ).getSingleResult();
 		assertNotNull( result );
 		assertEquals( null, result.getColor() );
-		
+
 		query = cb.createQuery( Wall.class );
 		root = query.from( Wall.class );
 		query.select( root ).where(
@@ -153,7 +151,7 @@ public void testDoubleNegation() {
 		result = em.createQuery( query ).getSingleResult();
 		assertNotNull( result );
 		assertEquals( null, result.getColor() );
-		
+
 		query = cb.createQuery( Wall.class );
 		root = query.from( Wall.class );
 		query.select( root ).where(
@@ -163,7 +161,7 @@ public void testDoubleNegation() {
 		result = em.createQuery( query ).getSingleResult();
 		assertNotNull( result );
 		assertEquals( "yellow", result.getColor() );
-		
+
 		em.getTransaction().commit();
 		em.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CiteriaAsExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CiteriaAsExpressionTest.java
index 607dd8611cc4..d1bea3ba69ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CiteriaAsExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CiteriaAsExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java
index 652b8bf4d0fb..af65c26da9bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java
index e32de3d2aec2..83807d6f5f49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java
index bba08c1a0a5a..a227c4139ef6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java
index 654ede7ddadb..f7cc168eb03c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
@@ -47,9 +45,9 @@ public void cleanupTestData() {
 	@JiraKey(value = "HHH-8404")
 	public void testListIndex() {
 		EntityManager em = getOrCreateEntityManager();
-		
+
 		em.getTransaction().begin();
-		
+
 		Address address1 = new Address();
 		address1.setId( "a1" );
 		Phone phone1 = new Phone();
@@ -57,19 +55,19 @@ public void testListIndex() {
 		phone1.setAddress( address1 );
 		Phone phone2 = new Phone();
 		phone2.setId( "p2" );
-		
+
 		phone2.setAddress( address1 );
 		address1.getPhones().add( phone1 );
 		address1.getPhones().add( phone2 );
-		
+
 		Address address2 = new Address();
 		address2.setId( "a2" );
 		Phone phone3 = new Phone();
 		phone3.setId( "p3" );
-		
+
 		phone3.setAddress( address2 );
 		address2.getPhones().add( phone3 );
-		
+
 		em.persist( phone1 );
 		em.persist( phone2 );
 		em.persist( phone3 );
@@ -77,7 +75,7 @@ public void testListIndex() {
 		em.persist( address2 );
 		em.getTransaction().commit();
 		em.clear();
-		
+
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery
     criteria = cb.createQuery( Address.class );
 		Root
     addressRoot = criteria.from( Address.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/NegatedPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/NegatedPredicateTest.java
index fffd91c93cfb..aadf9e34190f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/NegatedPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/NegatedPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java
index 1d6dabf26868..083b83564fcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java
index 5fccf9a621c6..2e8f05ba0619 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java
index 76c86db1b22d..08674477b11a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.basic;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java
index 02481c50becb..07da282615b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components;
 
@@ -214,8 +212,8 @@ public void testInExpressionForTheManyToOnePropertyOfAComponent(EntityManagerFac
 					Root root = query.from( Employee.class );
 
 					query.where( root.get( "projects" )
-										 .get( "currentProject" )
-										 .in( projects.getCurrentProject() ) );
+										.get( "currentProject" )
+										.in( projects.getCurrentProject() ) );
 
 					final List results = entityManager.createQuery( query ).getResultList();
 					assertThat( results.size(), is( 1 ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java
index b87d33af41af..b1ff3d757a7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java
index f3c9a1c9cfe3..216bdd3d9157 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java
index 3789bec1b9b7..f932781f0dd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components.joins;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java
index 98648d87a70b..ea227ad71501 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jpa.criteria.components.joins;
 
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java
index 53700b7bc1ef..0b8cd8ce1705 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components.joins;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java
index 352a86927e1a..d1255485410c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.components.joins;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java
index e948454032a8..abf1a140b63b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.convert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/cte/CriteriaCteCopyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/cte/CriteriaCteCopyTest.java
index c2faed4186bf..2f093cb97981 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/cte/CriteriaCteCopyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/cte/CriteriaCteCopyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.cte;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java
index 5d82a6462056..73c97f1d0d5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.enumcollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java
index 244902cc9ed3..f58ed7e515a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.enumcollection;
 
@@ -37,7 +35,7 @@ public void setId(Long id) {
 	@Enumerated(EnumType.STRING)
 	@ElementCollection(targetClass = Role.class, fetch = FetchType.LAZY)
 	@JoinTable(name = "user_role",
-			   joinColumns = {@JoinColumn(name = "user_id")})
+			joinColumns = {@JoinColumn(name = "user_id")})
 	@Column(name = "role_name", nullable = false)
 	public Set getRoles() {
 		return roles;
@@ -51,4 +49,3 @@ public enum Role {
 		Admin;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaScrollFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaScrollFetchTest.java
index 3fb7e37076a7..9a1e577cdd7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaScrollFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaScrollFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
index 3e3e6020efb3..84de31fedc87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java
index ebbe55cf3de2..e7fe5c18ea9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.io.Serializable;
@@ -7,7 +10,7 @@
 @Entity
 @Table(name = "customers")
 public class Customer implements Comparable, Serializable {
-	
+
 	private Long id;
 	private String name;
 
@@ -48,7 +51,7 @@ public boolean equals(Object object) {
 		boolean result = false;
 		if(object instanceof Customer) {
 			Customer other = (Customer) object;
-			result = id.equals(other.id);		
+			result = id.equals(other.id);
 		}
 		return result;
 	}
@@ -59,4 +62,3 @@ public int compareTo(Customer other) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java
index 82a1b6ac0190..62ae95f20910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.io.Serializable;
@@ -8,39 +11,39 @@
 @Table(name = "facilities")
 public class Facility implements Comparable, Serializable {
 
-	private static final long serialVersionUID = -2705232202888517103L;	
+	private static final long serialVersionUID = -2705232202888517103L;
 
 	private Long id;
 	private String name;
 	private Site site;
 	private Customer customer;
-	
+
 	@Id
 	@GeneratedValue
 	@Column(name = "FACILITY_ID", nullable = false, updatable = false)
 	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@Column(name = "FACILITY_NAME", length = 40, nullable = false, updatable = false)
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "SITE_ID", referencedColumnName = "SITE_ID", nullable = false, updatable = false)
 	public Site getSite() {
 		return site;
 	}
-	
+
 	public void setSite(Site site) {
 		this.site = site;
 	}
@@ -52,7 +55,7 @@ public Customer getCustomer() {
 	}
 
 	public void setCustomer(Customer customer) {
-		this.customer = customer;	
+		this.customer = customer;
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java
index df75f07e9c66..709a2de39557 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.util.*;
@@ -11,45 +14,44 @@ public class Order {
 	private OrderId id;
 	private PurchaseOrg purchaseOrg;
 	private Set lines;
-	
+
 	public Order() {
-	
+
 	}
-	
+
 	public Order(PurchaseOrg purchaseOrg, String number) {
 		this.id = new OrderId();
 		this.id.setPurchaseOrgId(purchaseOrg.getId());
 		this.id.setNumber(number);
 		this.purchaseOrg = purchaseOrg;
 	}
-	
+
 	@EmbeddedId
 	public OrderId getId() {
 		return id;
 	}
-	
+
 	public void setId(OrderId id) {
 		this.id = id;
 	}
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "PURCHASE_ORG_ID", referencedColumnName = "PURCHASE_ORG_ID", nullable = false, insertable = false, updatable = false)
 	public PurchaseOrg getPurchaseOrg() {
 		return purchaseOrg;
 	}
-	
+
 	public void setPurchaseOrg(PurchaseOrg purchaseOrg) {
 		this.purchaseOrg = purchaseOrg;
 	}
-	
+
 	@OneToMany(mappedBy = "header", orphanRemoval = true, cascade = CascadeType.ALL)
 	public Set getLines() {
 		return lines;
 	}
-	
+
 	public void setLines(Set lines) {
 		this.lines = lines;
 	}
-	
-}
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java
index d913be99a969..960231a67e19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.io.Serializable;
@@ -7,27 +10,26 @@
 @Embeddable
 @MappedSuperclass
 public class OrderId implements Serializable {
-	
+
 	private Long purchaseOrgId;
 	private String number;
-	
+
 	@Column(name = "PURCHASE_ORG_ID", nullable = false, updatable = false)
 	public Long getPurchaseOrgId() {
 		return purchaseOrgId;
 	}
-	
+
 	public void setPurchaseOrgId(Long purchaseOrgId) {
 		this.purchaseOrgId = purchaseOrgId;
 	}
-	
+
 	@Column(name = "ORDER_NUMBER", length = 40, nullable = false, updatable = false)
-	public String getNumber() {	
+	public String getNumber() {
 		return number;
 	}
-	
-	public void setNumber(String number) {	
+
+	public void setNumber(String number) {
 		this.number = number;
 	}
-	
-}
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java
index b0489b20af8d..eee1c83a6306 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import jakarta.persistence.*;
@@ -10,10 +13,10 @@ public class OrderLine {
 	private OrderLineId id;
 	private Product product;
 	private Order header;
-	
+
 	public OrderLine() {
 	}
-	
+
 	public OrderLine(Order order, Long lineNumber, Product product) {
 		this.id = new OrderLineId();
 		this.id.setPurchaseOrgId(order.getId().getPurchaseOrgId());
@@ -22,37 +25,36 @@ public OrderLine(Order order, Long lineNumber, Product product) {
 		this.header = order;
 		this.product = product;
 	}
-	
+
 	@EmbeddedId
 	public OrderLineId getId() {
 		return id;
 	}
-	
+
 	public void setId(OrderLineId id) {
 		this.id = id;
 	}
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false, updatable = false)
 	@JoinColumn(name = "PRODUCT_ID", referencedColumnName = "PRODUCT_ID", nullable = false, updatable = false)
 	public Product getProduct() {
 		return product;
 	}
-	
+
 	public void setProduct(Product product) {
 		this.product = product;
 	}
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "PURCHASE_ORG_ID", referencedColumnName = "PURCHASE_ORG_ID", nullable = false, insertable = false, updatable = false)
 	@JoinColumn(name = "ORDER_NUMBER", referencedColumnName = "ORDER_NUMBER", nullable = false, insertable = false, updatable = false)
 	public Order getHeader() {
 		return header;
 	}
-	
+
 	public void setHeader(Order header) {
 		this.header = header;
 	}
-	
-}
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java
index 3fdb92db65cb..af79a14196eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import jakarta.persistence.*;
@@ -7,14 +10,14 @@
 public class OrderLineId extends OrderId {
 
 	private Long lineNumber;
-	
+
 	@Column(name = "LINE_NUMBER", nullable = false, updatable = false)
 	public Long getLineNumber() {
 		return lineNumber;
 	}
-	
+
 	public void setLineNumber(Long lineNumber) {
 		this.lineNumber = lineNumber;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java
index 1d4d26170a75..c54a9b19cb24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import jakarta.persistence.*;
@@ -7,7 +10,7 @@
 @Table(name = "products")
 public class Product {
 
-	private ProductId id;	
+	private ProductId id;
 	private String number;
 	private Facility facility;
 
@@ -21,33 +24,33 @@ public Product(Facility facility, String number) {
 		this.number = number;
 		this.facility = facility;
 	}
-	
+
 	@Id
 	private ProductId getId() {
 		return id;
 	}
-	
+
 	public void setId(ProductId id) {
 		this.id = id;
 	}
-	
+
 	@Column(name = "PRODUCT_NUMBER", length = 40, nullable = false, updatable = false)
 	public String getNumber() {
 		return number;
 	}
-	
+
 	public void setNumber(String number) {
 		this.number = number;
-	} 
-	
+	}
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false, insertable = false, updatable = false)
 	public Facility getFacility() {
 		return facility;
 	}
-	
+
 	public void setFacility(Facility facility) {
 		this.facility = facility;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java
index b28a4500350a..6e4e5965c45f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.io.Serializable;
@@ -16,7 +19,7 @@ public Long getFacilityId() {
 	}
 
 	public void setFacilityId(Long facilityId) {
-		this.facilityId = facilityId;	
+		this.facilityId = facilityId;
 	}
 
 	@Column(name = "PRODUCT_ID", nullable = false, updatable = false)
@@ -29,4 +32,3 @@ public void setItemId(Long itemId) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java
index 6ca606127eb4..558986dc4913 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.util.List;
@@ -12,26 +15,26 @@ public class PurchaseOrg implements Serializable {
 	private static final long serialVersionUID = -6659835148502079000L;
 
 	private Long id;
-	private String name;	
+	private String name;
 	private Customer customer;
 	private List facilities;
-	
+
 	@Id
 	@GeneratedValue
 	@Column(name = "PURCHASE_ORG_ID", nullable = false, updatable = false)
 	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@Column(name = "PURCHASE_ORG_NAME", length = 40, nullable = false, updatable = false)
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -45,19 +48,19 @@ public Customer getCustomer() {
 	public void setCustomer(Customer customer) {
 		this.customer = customer;
 	}
-	
+
 	@ManyToMany(fetch = FetchType.LAZY)
 	@JoinTable(name = "PURCHASE_FACILITY",
 		joinColumns = @JoinColumn(name = "PURCHASE_ORG_ID"),
 		inverseJoinColumns = @JoinColumn(name = "FACILITY_ID"))
-	public List getFacilities() {	
+	public List getFacilities() {
 		return facilities;
 	}
-	
+
 	public void setFacilities(List facilities) {
 		this.facilities = facilities;
 	}
-		
+
 	@Override
 	public int hashCode() {
 		return 17 * 31 + id.hashCode();
@@ -72,5 +75,5 @@ public boolean equals(Object object) {
 		}
 		return result;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java
index befd9ac2823f..9354b1d82f56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java
@@ -1,4 +1,7 @@
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.fetchscroll;
 
 import java.io.Serializable;
@@ -13,23 +16,23 @@ public class Site implements Serializable {
 	private Long id;
 	private String name;
 	private Customer customer;
-	
+
 	@Id
 	@GeneratedValue
 	@Column(name = "SITE_ID", nullable = false, updatable = false)
-	public Long getId() {	
+	public Long getId() {
 		return id;
 	}
-	
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	@Column(name = "SITE_NAME", length = 40, nullable = false, updatable = false)
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java
index 14221a64eab0..521ef8e09054 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -20,12 +18,12 @@ public class Helper {
 	private String name;
 	public String getName( ) { return this.name; }
 	public void setName( String value ) { this.name = value; }
-	
+
 	@Id
 	private String type;
 	public String getType( ) { return this.type; }
 	public void setType( String value ) { this.type = value; }
-	
+
 	@Override
 	public String toString( ) {
 		return "[Name:" + this.getName( ) + "; Type: " + this.getType( ) + "]";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java
index 0c0c31be134a..9060fbe75dad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -18,35 +16,35 @@
 @Embeddable
 public class HelperId implements Serializable {
 	private static final long serialVersionUID = 9122480802791185646L;
-	
+
 	@Id
 	@Column( name = "NAME", length = 12 )
 	private String name;
 	public String getName( ) { return this.name; }
 	public void setName( String value ) { this.name = value; }
-	
+
 	@Id
 	@Column( name = "HELPER_TYPE", length = 4 )
 	private String type;
 	public String getType( ) { return this.type; }
 	public void setType( String value ) { this.type = value; }
-	
+
 	@Override
 	public boolean equals( Object obj ) {
 		if( obj == null ) return false;
 		if( !( obj instanceof HelperId ) ) return false;
-		
+
 		HelperId id = ( HelperId )obj;
 		if( this.getName() == null || id.getName() == null || this.getType() == null || id.getType() == null ) return false;
-		
+
 		return this.toString( ).equals( id.toString( ) );
 	}
-	
+
 	@Override
 	public int hashCode( ) {
 		return this.toString( ).hashCode( );
 	}
-	
+
 	@Override
 	public String toString( ) {
 		StringBuilder buf = new StringBuilder( "[id:" );
@@ -54,7 +52,7 @@ public String toString( ) {
 		buf.append( ";type:" );
 		buf.append( ( this.getType() == null ) ? "null" : this.getType() );
 		buf.append( "]" );
-		
+
 		return buf.toString( );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java
index ac6f2e34ee64..0980c9e4e18e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -168,12 +166,12 @@ public void testDeclaredIdClassAttributes( ) {
 		List divisions = new ArrayList( );
 		divisions.add( "NA" );
 		divisions.add( "EU" );
-			
+
 		// Building the query.
 		CriteriaBuilder criteria = em.getCriteriaBuilder( );
 		CriteriaQuery query = criteria.createQuery( Widget.class );
 		Root root = query.from( Widget.class );
-			
+
 		Predicate predicate = root.get( "division" ).in( divisions );
 		query.where( predicate );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java
index 5b94966a6f9b..7c6959e7e4bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -20,7 +18,7 @@ public class Tool extends Helper {
 	private Double cost;
 	public Double getCost( ) { return this.cost; }
 	public void setCost( Double value ) { this.cost = value; }
-	
+
 	@Override
 	public String toString( ) {
 		return "[" + super.toString() + "; Cost: " + this.getCost( ) + "]";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java
index d1e9ede2ee90..2c983ee909e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -23,17 +21,17 @@ public class Widget {
 	private String code;
 	public String getCode( ) { return this.code; }
 	public void setCode( String value ) { this.code = value; }
-	
+
 	@Id
 	private String division;
 	public String getDivision( ) { return this.division; }
 	public void setDivision( String value ) { this.division = value; }
-	
+
 	@Column( name = "COST" )
 	private Double cost;
 	public Double getCost( ) { return this.cost; }
 	public void setCost( Double value ) { this.cost = value; }
-	
+
 	@Override
 	public String toString( ) {
 		return "[Code:" + this.getCode( ) + "; Division: " + this.getDivision( ) + "; Cost: " + this.getCost( ) + "]";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java
index 33f910a45be2..53846220a1df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.idclass;
 
@@ -18,35 +16,35 @@
 @Embeddable
 public class WidgetId implements Serializable {
 	private static final long serialVersionUID = 9122480802791185644L;
-	
+
 	@Id
 	@Column( name = "CODE", length = 3 )
 	private String code;
 	public String getCode( ) { return this.code; }
 	public void setCode( String value ) { this.code = value; }
-	
+
 	@Id
 	@Column( name = "DIVISION", length = 4 )
 	private String division;
 	public String getDivision( ) { return this.division; }
 	public void setDivision( String value ) { this.division = value; }
-	
+
 	@Override
 	public boolean equals( Object obj ) {
 		if( obj == null ) return false;
 		if( !( obj instanceof WidgetId ) ) return false;
-		
+
 		WidgetId id = ( WidgetId )obj;
 		if( this.getCode( ) == null || id.getCode( ) == null || this.getDivision( ) == null || id.getDivision( ) == null ) return false;
-		
+
 		return this.toString( ).equals( id.toString( ) );
 	}
-	
+
 	@Override
 	public int hashCode( ) {
 		return this.toString( ).hashCode( );
 	}
-	
+
 	@Override
 	public String toString( ) {
 		StringBuilder buf = new StringBuilder( "[id:" );
@@ -54,7 +52,7 @@ public String toString( ) {
 		buf.append( ";code:" );
 		buf.append( ( this.getDivision( ) == null ) ? "null" : this.getDivision( ) );
 		buf.append( "]" );
-		
+
 		return buf.toString( );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java
index ba007491e141..b4a2811f2a91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeAutoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeAutoTest.java
index 454c278862b2..8e817656c4f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeAutoTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeAutoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
@@ -11,9 +9,6 @@
 
 import org.hibernate.testing.RequiresDialect;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
index 30660d40a3d1..b580f2fbf90e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
index fd422c4b4cff..a725cc11f916 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
index 1bc824c8c849..811118be2aaa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
index 22a915b08f24..b31ab52fea49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java
index 9d10fadbf694..7b4ccde07b0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
index a2d0786baaa1..a65e620cf6b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java
index 4f0b36c5a2da..6c2435689df5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.mapjoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java
index b2a5813663c6..868eba3fcee4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.mapjoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java
index 02890990204a..bd5f9075cb74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.mapjoin;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java
index 6880e7515e6d..cfc35a97b894 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.mapjoin;
 
@@ -31,22 +29,22 @@ public Class[] getAnnotatedClasses() {
 	public void allEntities() {
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();
-		
+
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery query = cb.createQuery(MapEntity.class);
 
 		Root entity = query.from(MapEntity.class);
 		MapJoin cname = entity.join(MapEntity_.localized);
-		
+
 		query = query
 			.select(entity)
-			.where( 
-				cb.equal( cname.key(), "en" ) 
+			.where(
+				cb.equal( cname.key(), "en" )
 			)
 			.orderBy( cb.asc( cb.upper( cname.value().get(MapEntityLocal_.shortName) ) ) );
-		
+
 		em.createQuery(query).getResultList();
-		
+
 		em.getTransaction().commit();
 		em.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java
index 6ff228e8253e..8a55a722039f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.mapjoin;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nestedfetch/NestedFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nestedfetch/NestedFetchTest.java
index 2b6354827579..9de81ce967b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nestedfetch/NestedFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nestedfetch/NestedFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.nestedfetch;
 
 import java.io.Serializable;
@@ -7,7 +11,6 @@
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java
index 1bc8294e42e9..bc6cb17e92e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java
index b5643145f715..5b89db34c900 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
@@ -36,7 +34,6 @@
 import static java.lang.Boolean.FALSE;
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -131,7 +128,7 @@ public void testNumericLiteralsInWhereClause() throws Exception {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			testNumericLiterals(
 				entityManager,
-			 	"select 'abc',b1_0.name from Book b1_0 where b1_0.id=1"
+				"select 'abc',b1_0.name from Book b1_0 where b1_0.id=1"
 			);
 		} );
 	}
@@ -141,7 +138,7 @@ public void testNumericLiteralsInWhereClauseUsingBindParameters() throws Excepti
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			testNumericLiterals(
 				entityManager,
-			 	"select 'abc',b1_0.name from Book b1_0 where b1_0.id=1"
+				"select 'abc',b1_0.name from Book b1_0 where b1_0.id=1"
 			);
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/EyeColor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/EyeColor.java
index ef89f351a775..de03d645a99c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/EyeColor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/EyeColor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralEntityConstructTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralEntityConstructTest.java
index 4ed12757c6af..2be3707ea8e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralEntityConstructTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralEntityConstructTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java
index 5349b0a610c8..5c6429078493 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java
index 28734da8d1ff..464c3529e7d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java
index 2285a324dfb4..d4b3fdd8b592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.nulliteral;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java
index c918f21386f8..92a1d35c2167 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
@@ -32,41 +30,41 @@
  * @author James Gilbertson
  */
 public class AbstractPathImplTest extends AbstractMetamodelSpecificTest {
-    @BeforeEach
-    public void prepareTestData() {
-        EntityManager em = getOrCreateEntityManager();
-        em.getTransaction().begin();
-
-        Thing thing = new Thing();
-        thing.setId( "thing1" );
-        thing.setName( "A Thing" );
-        em.persist( thing );
-
-        thing = new Thing();
-        thing.setId( "thing2" );
-        thing.setName( "Another Thing" );
-        em.persist( thing );
-
-        ThingWithQuantity thingWithQuantity = new ThingWithQuantity();
-        thingWithQuantity.setId( "thingWithQuantity3" );
-        thingWithQuantity.setName( "3 Things" );
-        thingWithQuantity.setQuantity( 3 );
-        em.persist( thingWithQuantity );
-
-        em.getTransaction().commit();
-        em.close();
-    }
-
-    @AfterEach
-    public void cleanupTestData() {
-        EntityManager em = getOrCreateEntityManager();
-        em.getTransaction().begin();
-        em.remove( em.find( Thing.class, "thing1" ) );
-        em.remove( em.find( Thing.class, "thing2" ) );
-        em.remove( em.find( ThingWithQuantity.class, "thingWithQuantity3" ) );
-        em.getTransaction().commit();
-        em.close();
-    }
+	@BeforeEach
+	public void prepareTestData() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+
+		Thing thing = new Thing();
+		thing.setId( "thing1" );
+		thing.setName( "A Thing" );
+		em.persist( thing );
+
+		thing = new Thing();
+		thing.setId( "thing2" );
+		thing.setName( "Another Thing" );
+		em.persist( thing );
+
+		ThingWithQuantity thingWithQuantity = new ThingWithQuantity();
+		thingWithQuantity.setId( "thingWithQuantity3" );
+		thingWithQuantity.setName( "3 Things" );
+		thingWithQuantity.setQuantity( 3 );
+		em.persist( thingWithQuantity );
+
+		em.getTransaction().commit();
+		em.close();
+	}
+
+	@AfterEach
+	public void cleanupTestData() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+		em.remove( em.find( Thing.class, "thing1" ) );
+		em.remove( em.find( Thing.class, "thing2" ) );
+		em.remove( em.find( ThingWithQuantity.class, "thingWithQuantity3" ) );
+		em.getTransaction().commit();
+		em.close();
+	}
 
 	@ExpectedException(value = IllegalArgumentException.class)
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java
index 36bde58919f6..84e39c1a4b19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java
index 541eaa5fbfc3..880e283c8445 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java
index 736c3cf51f2d..23751a16ab30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java
index e7aa52659298..d6f0b1dce803 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java
index 9341d28e856d..1a25ee658baa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
index 5e04d2e8a7b2..0921bf8001e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.paths;
 
@@ -24,33 +22,33 @@
  * @author Brad Koehn
  */
 @Jpa(
-        integrationSettings = { @Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "enabled") },
-        xmlMappings = { "org/hibernate/orm/test/jpa/criteria/paths/PolicyAndDistribution.hbm.xml" }
+		integrationSettings = { @Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "enabled") },
+		xmlMappings = { "org/hibernate/orm/test/jpa/criteria/paths/PolicyAndDistribution.hbm.xml" }
 )
 public class SingularAttributeJoinTest {
 
-    @Test
-    public void testEntityModeMapJoinCriteriaQuery(EntityManagerFactoryScope scope) {
-        scope.inEntityManager(
-                entityManager -> {
-                    CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-                    CriteriaQuery criteriaQuery = criteriaBuilder.createQuery();
-                    jakarta.persistence.metamodel.EntityType distributionEntity = getEntityType(scope, "Distribution");
-                    From distributionFrom = criteriaQuery.from(distributionEntity);
-                    From policyJoin = distributionFrom.join("policy");
-                    Path policyId = policyJoin.get("policyId");
-                    criteriaQuery.select(policyId);
-                    TypedQuery typedQuery = entityManager.createQuery(criteriaQuery);
-                }
-        );
-    }
+	@Test
+	public void testEntityModeMapJoinCriteriaQuery(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+					CriteriaQuery criteriaQuery = criteriaBuilder.createQuery();
+					jakarta.persistence.metamodel.EntityType distributionEntity = getEntityType(scope, "Distribution");
+					From distributionFrom = criteriaQuery.from(distributionEntity);
+					From policyJoin = distributionFrom.join("policy");
+					Path policyId = policyJoin.get("policyId");
+					criteriaQuery.select(policyId);
+					TypedQuery typedQuery = entityManager.createQuery(criteriaQuery);
+				}
+		);
+	}
 
-    private jakarta.persistence.metamodel.EntityType getEntityType(EntityManagerFactoryScope scope, String entityName) {
-        for(jakarta.persistence.metamodel.EntityType entityType : scope.getEntityManagerFactory().getMetamodel().getEntities()) {
-            if (entityType.getName().equals("Distribution")) {
-                return entityType;
-            }
-        }
-        throw new IllegalStateException("Unable to find entity " + entityName);
-    }
+	private jakarta.persistence.metamodel.EntityType getEntityType(EntityManagerFactoryScope scope, String entityName) {
+		for(jakarta.persistence.metamodel.EntityType entityType : scope.getEntityManagerFactory().getMetamodel().getEntities()) {
+			if (entityType.getName().equals("Distribution")) {
+				return entityType;
+			}
+		}
+		throw new IllegalStateException("Unable to find entity " + entityName);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaDefinitionTest.java
index 795068d12c2e..ca1b019f9a1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaDefinitionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.query;
 
 import jakarta.persistence.Entity;
@@ -20,133 +24,133 @@
 @Jpa(annotatedClasses = CriteriaDefinitionTest.Message.class)
 public class CriteriaDefinitionTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new Message(1L, "hello") );
-            s.persist( new Message(2L, "bye") );
-        });
-
-        var factory = scope.getSessionFactory();
-
-        var query1 = new CriteriaDefinition<>(factory, Object[].class) {{
-            var message = from(Message.class);
-            select(array(message.get("id"), message.get("text")));
-            where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        var query2 = new CriteriaDefinition<>(factory, Message.class) {{
-            var message = from(Message.class);
-            where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        var query3 = new CriteriaDefinition<>(factory, Message.class, "from Msg") {{
-            var message = (JpaRoot) getSelection();
-            where(ilike(message.get("text"), "%e%"));
-            orderBy(asc(message.get("text")));
-        }};
-
-        var query4 = new CriteriaDefinition<>(factory, Message.class) {{
-            var message = from(Message.class);
-            restrict(like(message.get("text"), "hell%"));
-            restrict(message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        var query5 = new CriteriaDefinition<>(query4, Long.class) {{
-            select(count());
-            orderBy();
-        }};
-
-        scope.inSession(session -> {
-            var idAndText = session.createSelectionQuery(query1).getSingleResult();
-            assertNotNull(idAndText);
-            assertEquals(1L,idAndText[0]);
-            assertEquals("hello",idAndText[1]);
-
-            var message = session.createSelectionQuery(query2).getSingleResult();
-            assertNotNull(message);
-            assertEquals(1L,message.id);
-            assertEquals("hello",message.text);
-
-            var messages = session.createSelectionQuery(query3).getResultList();
-            assertEquals(2,messages.size());
-
-            var msg = session.createSelectionQuery(query4).getSingleResult();
-            assertNotNull(msg);
-            assertEquals(1L,msg.id);
-            assertEquals("hello",msg.text);
-
-            long count = session.createSelectionQuery(query5).getSingleResult();
-            assertEquals(1L,count);
-        });
-    }
-
-    @Test void test(EntityManagerFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new Message(1L, "hello") );
-            s.persist( new Message(2L, "bye") );
-        });
-
-        EntityManagerFactory factory = scope.getEntityManagerFactory();
-
-        var query1 = new CriteriaDefinition<>(factory, Object[].class) {{
-            var message = from(Message.class);
-            select(array(message.get("id"), message.get("text")));
-            where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        var query2 = new CriteriaDefinition<>(factory, Message.class) {{
-            var message = from(Message.class);
-            where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        var query3 = new CriteriaDefinition<>(factory, Message.class, "from Msg") {{
-            var message = (JpaRoot) getSelection();
-            where(ilike(message.get("text"), "%e%"));
-            orderBy(asc(message.get("text")));
-        }};
-
-        var query4 = new CriteriaDefinition<>(factory, Message.class) {{
-            var message = from(Message.class);
-            restrict(like(message.get("text"), "hell%"));
-            restrict(message.get("id").equalTo(1));
-            orderBy(asc(message.get("id")));
-        }};
-
-        scope.inTransaction(entityManager -> {
-            var idAndText = entityManager.createQuery(query1).getSingleResult();
-            assertNotNull(idAndText);
-            assertEquals(1L,idAndText[0]);
-            assertEquals("hello",idAndText[1]);
-
-            var message = entityManager.createQuery(query2).getSingleResult();
-            assertNotNull(message);
-            assertEquals(1L,message.id);
-            assertEquals("hello",message.text);
-
-            var messages = entityManager.createQuery(query3).getResultList();
-            assertEquals(2,messages.size());
-
-            var msg = entityManager.createQuery(query4).getSingleResult();
-            assertNotNull(msg);
-            assertEquals(1L,msg.id);
-            assertEquals("hello",msg.text);
-        });
-    }
-
-    @Entity(name="Msg")
-    static class Message {
-        public Message(Long id, String text) {
-            this.id = id;
-            this.text = text;
-        }
-        Message() {}
-        @Id
-        Long id;
-        String text;
-    }
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new Message(1L, "hello") );
+			s.persist( new Message(2L, "bye") );
+		});
+
+		var factory = scope.getSessionFactory();
+
+		var query1 = new CriteriaDefinition<>(factory, Object[].class) {{
+			var message = from(Message.class);
+			select(array(message.get("id"), message.get("text")));
+			where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		var query2 = new CriteriaDefinition<>(factory, Message.class) {{
+			var message = from(Message.class);
+			where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		var query3 = new CriteriaDefinition<>(factory, Message.class, "from Msg") {{
+			var message = (JpaRoot) getSelection();
+			where(ilike(message.get("text"), "%e%"));
+			orderBy(asc(message.get("text")));
+		}};
+
+		var query4 = new CriteriaDefinition<>(factory, Message.class) {{
+			var message = from(Message.class);
+			restrict(like(message.get("text"), "hell%"));
+			restrict(message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		var query5 = new CriteriaDefinition<>(query4, Long.class) {{
+			select(count());
+			orderBy();
+		}};
+
+		scope.inSession(session -> {
+			var idAndText = session.createSelectionQuery(query1).getSingleResult();
+			assertNotNull(idAndText);
+			assertEquals(1L,idAndText[0]);
+			assertEquals("hello",idAndText[1]);
+
+			var message = session.createSelectionQuery(query2).getSingleResult();
+			assertNotNull(message);
+			assertEquals(1L,message.id);
+			assertEquals("hello",message.text);
+
+			var messages = session.createSelectionQuery(query3).getResultList();
+			assertEquals(2,messages.size());
+
+			var msg = session.createSelectionQuery(query4).getSingleResult();
+			assertNotNull(msg);
+			assertEquals(1L,msg.id);
+			assertEquals("hello",msg.text);
+
+			long count = session.createSelectionQuery(query5).getSingleResult();
+			assertEquals(1L,count);
+		});
+	}
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new Message(1L, "hello") );
+			s.persist( new Message(2L, "bye") );
+		});
+
+		EntityManagerFactory factory = scope.getEntityManagerFactory();
+
+		var query1 = new CriteriaDefinition<>(factory, Object[].class) {{
+			var message = from(Message.class);
+			select(array(message.get("id"), message.get("text")));
+			where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		var query2 = new CriteriaDefinition<>(factory, Message.class) {{
+			var message = from(Message.class);
+			where(like(message.get("text"), "hell%"), message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		var query3 = new CriteriaDefinition<>(factory, Message.class, "from Msg") {{
+			var message = (JpaRoot) getSelection();
+			where(ilike(message.get("text"), "%e%"));
+			orderBy(asc(message.get("text")));
+		}};
+
+		var query4 = new CriteriaDefinition<>(factory, Message.class) {{
+			var message = from(Message.class);
+			restrict(like(message.get("text"), "hell%"));
+			restrict(message.get("id").equalTo(1));
+			orderBy(asc(message.get("id")));
+		}};
+
+		scope.inTransaction(entityManager -> {
+			var idAndText = entityManager.createQuery(query1).getSingleResult();
+			assertNotNull(idAndText);
+			assertEquals(1L,idAndText[0]);
+			assertEquals("hello",idAndText[1]);
+
+			var message = entityManager.createQuery(query2).getSingleResult();
+			assertNotNull(message);
+			assertEquals(1L,message.id);
+			assertEquals("hello",message.text);
+
+			var messages = entityManager.createQuery(query3).getResultList();
+			assertEquals(2,messages.size());
+
+			var msg = entityManager.createQuery(query4).getSingleResult();
+			assertNotNull(msg);
+			assertEquals(1L,msg.id);
+			assertEquals("hello",msg.text);
+		});
+	}
+
+	@Entity(name="Msg")
+	static class Message {
+		public Message(Long id, String text) {
+			this.id = id;
+			this.text = text;
+		}
+		Message() {}
+		@Id
+		Long id;
+		String text;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaFromHqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaFromHqlTest.java
index 689a8a796b16..93b62621a5d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaFromHqlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/CriteriaFromHqlTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.query;
 
 import jakarta.persistence.Entity;
@@ -16,33 +20,33 @@
 @DomainModel(annotatedClasses = CriteriaFromHqlTest.Message.class)
 public class CriteriaFromHqlTest {
 
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction( s -> {
-            s.persist( new Message(1L, "hello") );
-            s.persist( new Message(2L, "bye") );
-        });
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.persist( new Message(1L, "hello") );
+			s.persist( new Message(2L, "bye") );
+		});
 
-        scope.inSession( s -> {
-            JpaCriteriaQuery query =
-                    s.getFactory().getCriteriaBuilder()
-                            .createQuery("select id, text from Msg order by id", Object[].class);
-            assertEquals(2, query.getSelection().getSelectionItems().size());
-            assertEquals(1, query.getOrderList().size());
-            assertEquals(1, query.getRoots().size());
-            List list = s.createSelectionQuery(query).getResultList();
-            assertEquals(2, list.size());
-        });
-    }
+		scope.inSession( s -> {
+			JpaCriteriaQuery query =
+					s.getFactory().getCriteriaBuilder()
+							.createQuery("select id, text from Msg order by id", Object[].class);
+			assertEquals(2, query.getSelection().getSelectionItems().size());
+			assertEquals(1, query.getOrderList().size());
+			assertEquals(1, query.getRoots().size());
+			List list = s.createSelectionQuery(query).getResultList();
+			assertEquals(2, list.size());
+		});
+	}
 
-    @Entity(name="Msg")
-    static class Message {
-        public Message(Long id, String text) {
-            this.id = id;
-            this.text = text;
-        }
-        Message() {}
-        @Id
-        Long id;
-        String text;
-    }
+	@Entity(name="Msg")
+	static class Message {
+		public Message(Long id, String text) {
+			this.id = id;
+			this.text = text;
+		}
+		Message() {}
+		@Id
+		Long id;
+		String text;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java
index 655b1e1ded11..94ec78c0ee32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java
index 98d11a8395ea..37217454cf00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java
index 65f7c3c01eed..929db1489b3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java
index 6d2411dc39b4..926e6cf438b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.selectcase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java
index ac9328f1ec5d..6d526fbdf47e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.selectcase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java
index 97854cf5b073..b9a9cfe65139 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.selectcase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java
index f8ba1d26085d..35c964f98216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.simplecase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java
index 79d41cb27d4a..e0d2b8590891 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.size;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java
index c662a8c8b757..b0d8cf176167 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java
index 9402b39dc226..6b7d5f4d1aeb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
@@ -35,7 +33,7 @@
  * @author Steve Ebersole
  */
 public class CorrelatedSubqueryTest extends AbstractMetamodelSpecificTest {
-	
+
 	@Test
 	public void testBasicCorrelation() {
 		CriteriaBuilder builder = entityManagerFactory().getCriteriaBuilder();
@@ -123,21 +121,21 @@ public void testRestrictedCorrelationNoExplicitSelection() {
 		em.getTransaction().commit();
 		em.close();
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-8556")
 	public void testCorrelatedJoinsFromSubquery() {
 		CriteriaBuilder builder = entityManagerFactory().getCriteriaBuilder();
 		CriteriaQuery cquery = builder.createQuery(Customer.class);
-        Root customer = cquery.from(Customer.class);
-        cquery.select(customer);
-        Subquery sq = cquery.subquery(Order.class);
-        Join sqo = sq.correlate(customer.join(Customer_.orders));
-        sq.select(sqo);
-        Set> cJoins = sq.getCorrelatedJoins();
-        
-        // ensure the join is returned in #getCorrelatedJoins
-        assertEquals( cJoins.size(), 1);
+		Root customer = cquery.from(Customer.class);
+		cquery.select(customer);
+		Subquery sq = cquery.subquery(Order.class);
+		Join sqo = sq.correlate(customer.join(Customer_.orders));
+		sq.select(sqo);
+		Set> cJoins = sq.getCorrelatedJoins();
+
+		// ensure the join is returned in #getCorrelatedJoins
+		assertEquals( cJoins.size(), 1);
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryCorrelatedEntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryCorrelatedEntityJoinTest.java
index 4ed2dde784a1..f47924e7b101 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryCorrelatedEntityJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryCorrelatedEntityJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java
index 0557b9c1db90..cac01e1c12bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java
index 29d98ee7a32d..e55e57a363e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryMultipleLeftJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryMultipleLeftJoinsTest.java
index 3d579dc90e4d..4108fff2d23b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryMultipleLeftJoinsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryMultipleLeftJoinsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryTests.java
index 0204e2fa1460..60813e170625 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java
index 861ef6b0ba3e..457e3192a5aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.subquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java
index f4ccd3bbb106..356ffb507e00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.tuple;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java
index 7b0abda24360..f96be79cf242 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.criteria.tuple;
 
 import org.hibernate.orm.test.jpa.metamodel.AbstractMetamodelSpecificTest;
@@ -21,71 +25,71 @@
 @JiraKey( value = "HHH-15454" )
 public class TupleQueryRetrievePrimitiveTest extends AbstractMetamodelSpecificTest {
 
-    public static final int QUANTITY_OF_THING = 3;
-    public static final String THING_WITH_QUANTITY_3_ID = "thingWithQuantity3";
-    private EntityManager em;
-
-
-    @BeforeEach
-    public void createThingWithQuantity() {
-        em = getOrCreateEntityManager();
-        em.getTransaction().begin();
-
-        ThingWithQuantity thing = new ThingWithQuantity();
-        thing.setId( THING_WITH_QUANTITY_3_ID );
-        thing.setName( "3 Things" );
-        thing.setQuantity(QUANTITY_OF_THING);
-        em.persist( thing );
-
-        em.getTransaction().commit();
-    }
-
-    @AfterEach
-    public void endEntityManager() {
-        em.getTransaction().begin();
-        em.remove( em.find( ThingWithQuantity.class, THING_WITH_QUANTITY_3_ID ) );
-        em.getTransaction().commit();
-        em.close();
-    }
-
-    @Test
-    public void testRetrieveTupleEntryWithPrimitiveType() {
-        final Tuple result = queryTuple();
-        final int quantity = result.get(ThingWithQuantity_.quantity.getName(), int.class);
-        assertEquals(QUANTITY_OF_THING, quantity);
-    }
-
-    @Test
-    public void testRetrieveTupleEntryWithMetadata() {
-        final Tuple result = queryTuple();
-        final int quantity = result.get( ThingWithQuantity_.quantity.getName(), ThingWithQuantity_.quantity.getJavaType());
-        assertEquals(QUANTITY_OF_THING, quantity);
-    }
-
-    @Test
-    public void testRetrieveTupleEntryFromIndex() {
-        final Tuple result = queryTuple();
-        final int quantity = result.get(0, ThingWithQuantity_.quantity.getJavaType());
-        assertEquals(QUANTITY_OF_THING, quantity);
-    }
-
-    @Test
-    public void testRetrieveTupleEntryWithTupleElement() {
-        final CriteriaBuilder cb = em.getCriteriaBuilder();
-        final CriteriaQuery query = cb.createTupleQuery();
-        final Root thingWithQuantity = query.from( ThingWithQuantity.class);
-        final Path tupleElement = thingWithQuantity.get( ThingWithQuantity_.quantity);
-        query.multiselect(tupleElement.alias(ThingWithQuantity_.quantity.getName()));
-        Tuple result = em.createQuery(query).setMaxResults(1).getSingleResult();
-        final int quantity = result.get(tupleElement);
-        assertEquals(QUANTITY_OF_THING, quantity);
-    }
-
-    private Tuple queryTuple() {
-        final CriteriaBuilder cb = em.getCriteriaBuilder();
-        final CriteriaQuery query = cb.createTupleQuery();
-        final Root thingWithQuantity = query.from(ThingWithQuantity.class);
-        query.multiselect(thingWithQuantity.get(ThingWithQuantity_.quantity).alias(ThingWithQuantity_.quantity.getName()));
-        return em.createQuery(query).setMaxResults(1).getSingleResult();
-    }
+	public static final int QUANTITY_OF_THING = 3;
+	public static final String THING_WITH_QUANTITY_3_ID = "thingWithQuantity3";
+	private EntityManager em;
+
+
+	@BeforeEach
+	public void createThingWithQuantity() {
+		em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+
+		ThingWithQuantity thing = new ThingWithQuantity();
+		thing.setId( THING_WITH_QUANTITY_3_ID );
+		thing.setName( "3 Things" );
+		thing.setQuantity(QUANTITY_OF_THING);
+		em.persist( thing );
+
+		em.getTransaction().commit();
+	}
+
+	@AfterEach
+	public void endEntityManager() {
+		em.getTransaction().begin();
+		em.remove( em.find( ThingWithQuantity.class, THING_WITH_QUANTITY_3_ID ) );
+		em.getTransaction().commit();
+		em.close();
+	}
+
+	@Test
+	public void testRetrieveTupleEntryWithPrimitiveType() {
+		final Tuple result = queryTuple();
+		final int quantity = result.get(ThingWithQuantity_.quantity.getName(), int.class);
+		assertEquals(QUANTITY_OF_THING, quantity);
+	}
+
+	@Test
+	public void testRetrieveTupleEntryWithMetadata() {
+		final Tuple result = queryTuple();
+		final int quantity = result.get( ThingWithQuantity_.quantity.getName(), ThingWithQuantity_.quantity.getJavaType());
+		assertEquals(QUANTITY_OF_THING, quantity);
+	}
+
+	@Test
+	public void testRetrieveTupleEntryFromIndex() {
+		final Tuple result = queryTuple();
+		final int quantity = result.get(0, ThingWithQuantity_.quantity.getJavaType());
+		assertEquals(QUANTITY_OF_THING, quantity);
+	}
+
+	@Test
+	public void testRetrieveTupleEntryWithTupleElement() {
+		final CriteriaBuilder cb = em.getCriteriaBuilder();
+		final CriteriaQuery query = cb.createTupleQuery();
+		final Root thingWithQuantity = query.from( ThingWithQuantity.class);
+		final Path tupleElement = thingWithQuantity.get( ThingWithQuantity_.quantity);
+		query.multiselect(tupleElement.alias(ThingWithQuantity_.quantity.getName()));
+		Tuple result = em.createQuery(query).setMaxResults(1).getSingleResult();
+		final int quantity = result.get(tupleElement);
+		assertEquals(QUANTITY_OF_THING, quantity);
+	}
+
+	private Tuple queryTuple() {
+		final CriteriaBuilder cb = em.getCriteriaBuilder();
+		final CriteriaQuery query = cb.createTupleQuery();
+		final Root thingWithQuantity = query.from(ThingWithQuantity.class);
+		query.multiselect(thingWithQuantity.get(ThingWithQuantity_.quantity).alias(ThingWithQuantity_.quantity.getName()));
+		return em.createQuery(query).setMaxResults(1).getSingleResult();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ComponentInWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ComponentInWhereClauseTest.java
index 9d40c6e0edc2..8e3d371754dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ComponentInWhereClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ComponentInWhereClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
@@ -88,8 +86,8 @@ public void testInExpressionForTheManyToOnePropertyOfAComponent(EntityManagerFac
 					Root root = query.from( Employee.class );
 
 					query.where( root.get( "projects" )
-										 .get( "currentProject" )
-										 .in( projects.getCurrentProject() ) );
+										.get( "currentProject" )
+										.in( projects.getCurrentProject() ) );
 
 					final List results = entityManager.createQuery( query ).getResultList();
 					assertThat( results.size(), is( 1 ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/DateCompositeCustomTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/DateCompositeCustomTypeTest.java
index 5679c9e38f07..cccbd809bdc1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/DateCompositeCustomTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/DateCompositeCustomTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EntityGraphTest.java
index f1a379c6f199..84a582da8dbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EqualityComparisonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EqualityComparisonTest.java
index db82c0fd81ad..164024ea25b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EqualityComparisonTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/EqualityComparisonTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
@@ -15,7 +13,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
-import org.hibernate.metamodel.model.domain.internal.MappingMetamodelImpl;
 import org.hibernate.query.sqm.tree.predicate.SqmComparisonPredicate;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ExpressionsTest.java
index f18c11f4ed4d..b9bc3df58845 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ExpressionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/ExpressionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/MapJoinTestWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/MapJoinTestWithEmbeddable.java
index 057bd76de68d..676aa26b2241 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/MapJoinTestWithEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/MapJoinTestWithEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
@@ -37,7 +35,6 @@
 import jakarta.persistence.criteria.MapJoin;
 import jakarta.persistence.criteria.Root;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 
 /**
  * @author Christian Beikov
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateParameterTest.java
index f2493cc1f3c3..4780c0a6a043 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateTest.java
index 2cd19c774975..17cd6fde4e96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/NonPkAssociationEqualityPredicateTest.java
@@ -1,20 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
 import java.util.List;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.CockroachDialect;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -25,8 +21,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Path;
-import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/OptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/OptionalOneToOneTest.java
index 983c00209e66..a654449cdef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/OptionalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/OptionalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/PredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/PredicateTest.java
index 1475a2997958..8aeb33472149 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/PredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/PredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/SubQueryTest.java
index b74f28eacd18..5840450b6e68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/SubQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/valuehandlingmode/inline/SubQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.criteria.valuehandlingmode.inline;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java
index 59c4d783e3d7..18d0e86c2a59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java
index bfd2f5d490e8..bcea11ba0c3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java
index b3ca35f72195..4454374bb893 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
@@ -87,4 +85,4 @@ public void testDiscardOnClose(EntityManagerFactoryScope scope) throws SQLExcept
 				}
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java
index 4a173cafe261..41cdb3da6b53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java
index 36ae80f3a636..d9425c08881f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 
-import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.orm.test.jpa.Cat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java
index 11edc1912eb3..ad4f83242314 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
@@ -13,7 +11,6 @@
 import java.io.ObjectOutputStream;
 import java.util.Date;
 
-import org.hibernate.Session;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.orm.test.jpa.Cat;
 import org.hibernate.orm.test.jpa.Distributor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ExceptionInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ExceptionInterceptor.java
index cd77e5f39ba8..1af0b175f3f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ExceptionInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ExceptionInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
 import org.hibernate.CallbackException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
index 20277ab0e60b..85d1491dbc12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
@@ -16,7 +14,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.jpa.boot.spi.Bootstrap;
@@ -46,7 +43,7 @@ public Class[] getAnnotatedClasses() {
 				Distributor.class
 		};
 	}
-	
+
 	private EntityManagerFactory entityManagerFactory;
 
 	@AfterEach
@@ -61,10 +58,10 @@ public EntityManagerFactory entityManagerFactory() {
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // test deprecated Interceptor settings
+	// test deprecated Interceptor settings
 
-    @Test
-    public void testDeprecatedConfiguredInterceptor() {
+	@Test
+	public void testDeprecatedConfiguredInterceptor() {
 		Map settings = basicSettings();
 		settings.put( AvailableSettings.INTERCEPTOR, ExceptionInterceptor.class.getName() );
 		buildEntityManagerFactory( settings );
@@ -82,7 +79,7 @@ public void testDeprecatedConfiguredInterceptor() {
 		catch ( IllegalStateException e ) {
 			assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
 	@Test
 	public void testDeprecatedConfiguredSessionInterceptor() {
@@ -110,13 +107,13 @@ public void testDeprecatedConfiguredSessionInterceptor() {
 	// test Interceptor settings
 
 	@Test
-    public void testConfiguredInterceptor() {
+	public void testConfiguredInterceptor() {
 		Map settings = basicSettings();
 		settings.put( org.hibernate.cfg.AvailableSettings.INTERCEPTOR, ExceptionInterceptor.class.getName() );
 		buildEntityManagerFactory( settings );
-		
-        Item i = new Item();
-        i.setName( "Laptop" );
+
+		Item i = new Item();
+		i.setName( "Laptop" );
 
 		try {
 			doInJPA( this::entityManagerFactory, entityManager -> {
@@ -128,16 +125,16 @@ public void testConfiguredInterceptor() {
 		catch ( IllegalStateException e ) {
 			assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
-    @Test
-    public void testConfiguredSessionInterceptor() {
+	@Test
+	public void testConfiguredSessionInterceptor() {
 		Map settings = basicSettings();
 		settings.put( org.hibernate.cfg.AvailableSettings.SESSION_SCOPED_INTERCEPTOR, LocalExceptionInterceptor.class.getName() );
 		buildEntityManagerFactory( settings );
-		
-        Item i = new Item();
-        i.setName( "Laptop" );
+
+		Item i = new Item();
+		i.setName( "Laptop" );
 
 		try {
 			doInJPA( this::entityManagerFactory, entityManager -> {
@@ -149,10 +146,10 @@ public void testConfiguredSessionInterceptor() {
 		catch ( IllegalStateException e ) {
 			assertEquals( LocalExceptionInterceptor.LOCAL_EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
-    @Test
-    public void testConfiguredSessionInterceptorWithSessionFactory() {
+	@Test
+	public void testConfiguredSessionInterceptorWithSessionFactory() {
 
 		StandardServiceRegistryImpl standardRegistry = ServiceRegistryUtil.serviceRegistry();
 
@@ -197,12 +194,12 @@ public void testConfiguredSessionInterceptorWithSessionFactory() {
 		}
 	}
 
-    @Test
-    public void testConfiguredSessionInterceptorSupplier() {
-        Map settings = basicSettings();
-        settings.put( org.hibernate.cfg.AvailableSettings.SESSION_SCOPED_INTERCEPTOR, (Supplier) LocalExceptionInterceptor::new);
+	@Test
+	public void testConfiguredSessionInterceptorSupplier() {
+		Map settings = basicSettings();
+		settings.put( org.hibernate.cfg.AvailableSettings.SESSION_SCOPED_INTERCEPTOR, (Supplier) LocalExceptionInterceptor::new);
 		buildEntityManagerFactory( settings );
-        
+
 		Item i = new Item();
 		i.setName( "Laptop" );
 
@@ -216,16 +213,16 @@ public void testConfiguredSessionInterceptorSupplier() {
 		catch ( IllegalStateException e ) {
 			assertEquals( LocalExceptionInterceptor.LOCAL_EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
-    @Test
-    public void testEmptyCreateEntityManagerFactoryAndPropertyUse() {
+	@Test
+	public void testEmptyCreateEntityManagerFactoryAndPropertyUse() {
 		Map settings = basicSettings();
 		settings.put( AvailableSettings.INTERCEPTOR, ExceptionInterceptor.class.getName() );
 		buildEntityManagerFactory( settings );
-		
-        Item i = new Item();
-        i.setName( "Laptop" );
+
+		Item i = new Item();
+		i.setName( "Laptop" );
 
 		try {
 			doInJPA( this::entityManagerFactory, entityManager -> {
@@ -237,16 +234,16 @@ public void testEmptyCreateEntityManagerFactoryAndPropertyUse() {
 		catch ( IllegalStateException e ) {
 			assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
-    @Test
-    public void testOnLoadCallInInterceptor() {
+	@Test
+	public void testOnLoadCallInInterceptor() {
 		Map settings = basicSettings();
 		settings.put( AvailableSettings.INTERCEPTOR, new ExceptionInterceptor( true ) );
 		buildEntityManagerFactory( settings );
-		
-        Item i = new Item();
-        i.setName( "Laptop" );
+
+		Item i = new Item();
+		i.setName( "Laptop" );
 
 		try {
 			doInJPA( this::entityManagerFactory, entityManager -> {
@@ -267,16 +264,16 @@ public void testOnLoadCallInInterceptor() {
 		catch ( IllegalStateException e ) {
 			assertEquals( LocalExceptionInterceptor.LOCAL_EXCEPTION_MESSAGE, e.getMessage() );
 		}
-    }
+	}
 
 
-    protected Map basicSettings() {
+	protected Map basicSettings() {
 		return SettingsGenerator.generateSettings(
 				AvailableSettings.HBM2DDL_AUTO, "create-drop",
 				AvailableSettings.DIALECT, DialectContext.getDialect().getClass().getName(),
 				AvailableSettings.LOADED_CLASSES, Arrays.asList( getAnnotatedClasses() )
 		);
-    }
+	}
 
 	private void buildEntityManagerFactory(Map settings) {
 		entityManagerFactory = Bootstrap
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/LocalExceptionInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/LocalExceptionInterceptor.java
index 521b9d1a0e72..6802ea838384 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/LocalExceptionInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/LocalExceptionInterceptor.java
@@ -1,14 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
-import java.io.Serializable;
 
 import org.hibernate.CallbackException;
 import org.hibernate.type.Type;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java
index 6beebc383301..e36f7107029f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
 import jakarta.persistence.EntityManagerFactory;
-import java.util.Collections;
 import java.util.Map;
 
 import org.hibernate.cfg.AvailableSettings;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingProvider.java
index 3377bbacbbe4..4f2c1928e326 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java
index aaed839e4dd5..8d71d00085f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
@@ -109,7 +107,7 @@ public void testPersisterClassProvider() {
 			entityManagerFactory.close();
 		}
 		catch ( PersistenceException e ) {
-            Assertions.assertNotNull( e.getCause() );
+			Assertions.assertNotNull( e.getCause() );
 			Assertions.assertNotNull( e.getCause().getCause() );
 			Assertions.assertEquals( GoofyException.class, e.getCause().getCause().getClass() );
 
@@ -390,7 +388,7 @@ public boolean hasNaturalIdentifier() {
 			return false;
 		}
 
-        @Override
+		@Override
 		public int[] getNaturalIdentifierProperties() {
 			return new int[0];
 		}
@@ -407,16 +405,16 @@ public Serializable loadEntityIdByNaturalId(Object[] naturalIdValues, LockOption
 		}
 
 		@Override
-        public boolean hasNaturalIdCache() {
-            return false;
-        }
+		public boolean hasNaturalIdCache() {
+			return false;
+		}
 
-        @Override
-        public NaturalIdDataAccess getNaturalIdCacheAccessStrategy() {
-            return null;
-        }
+		@Override
+		public NaturalIdDataAccess getNaturalIdCacheAccessStrategy() {
+			return null;
+		}
 
-        @Override
+		@Override
 		public IdentifierGenerator getIdentifierGenerator() {
 			return null;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java
index ed2a6a3fdd93..94593a97285f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ejb3configuration;
 
-import java.util.Collections;
 import java.util.Map;
 
 import org.hibernate.SessionFactory;
@@ -26,7 +23,7 @@
  * @author Emmanuel Bernard
  */
 public class SessionFactoryObserverTest {
-    @Test
+	@Test
 	public void testSessionFactoryObserverProperty() {
 
 		Map settings = ServiceRegistryUtil.createBaseSettings();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java
index 159e11417b99..9a19fb2e85d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java
index 0c0973b0373b..8c185139f1c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java
index beba946423e5..c74a25cf8bb1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java
index 5959f4eee199..3bf82d476aa2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java
index 3fa693fa6f5e..612aa5463797 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java
index 7f6839b9f918..05410ebcb1de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java
index 13d2ca24486f..0b04bae15465 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java
index f0e8a15ac143..5699b8392608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java
index 56802edbc758..c765886c5b53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushModeTest.java
index 7b2e0fc85c90..eb8cae4f2bc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java
index 130e9b8c9e78..5d8fc228bc44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/GetReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/GetReferenceTest.java
index 8311207f5d72..5c985c3b8577 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/GetReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/GetReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java
index 6edf42a3aa1f..de80cbb6a9b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java
index c1c2f2f42c35..0fcc120b0cb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java
index cad1c116474b..d289271e6ec0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java
index c607663b0533..0f6cc37513c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java
index 915b0a1e408e..8fbdef890bef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java
index 62b072a2b392..1a3e817d5f75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
index 823c8dd85d2b..be94bb554580 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java
index 93bbd117dda5..d5999bfcd4a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
-import java.util.Map;
 
 import org.hibernate.cfg.AvailableSettings;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeTest.java
index 5acf9a958394..792edea9ec5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java
index 42871f9bde9d..00fc00335e04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java
index acefeb5519ed..c4b70f3df75f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java
index 3ff9c519d117..481651f09659 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +13,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderColumn;
 
-import org.hibernate.orm.test.jpa.emops.Competitor;
 
 /**
  * @author Emmanuel Bernard
@@ -26,7 +21,7 @@
 public class Race {
 	@Id @GeneratedValue public Integer id;
 	@OrderColumn( name="index_" ) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	@org.hibernate.annotations.Cascade( { org.hibernate.annotations.CascadeType.ALL, org.hibernate.annotations.CascadeType.DELETE_ORPHAN }) 
+	@org.hibernate.annotations.Cascade( { org.hibernate.annotations.CascadeType.ALL, org.hibernate.annotations.CascadeType.DELETE_ORPHAN })
 	public List competitors = new ArrayList();
 	public String name;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java
index 83f15e58ecb7..8df2ea9897b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
-import jakarta.persistence.EntityManager;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java
index b433179e73a1..7f5a5e52c77c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java
index d08ac92a74b2..bced569ef755 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java
index 3092c52b21ca..cbb51f9c9162 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java
index 82b2ba23021f..1682b1c76e52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java
index 7e4e417fe4fa..0ce52470ec76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java
index ed17ecdbc67e..c45da5e115f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java
index 7e1e7d780e94..601b1745efda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java
index c259e8ed035b..c08094a68ac4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.emops.cascade;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/CascadePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/CascadePersistTest.java
index 574e498a1cda..d4509d215624 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/CascadePersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/CascadePersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.emops.cascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java
index f5ac9246deef..83f42b77b351 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.enhancement;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java
index 98fc798d02df..137a5810bbd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.exception;
 
@@ -109,7 +107,7 @@ public void testEntityNotFoundException(EntityManagerFactoryScope scope) {
 			fail( "Non existent entity should raise an exception when state is accessed" );
 		}
 		catch ( EntityNotFoundException e ) {
-            //"success"
+			//"success"
 		}
 		finally {
 			em.close();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java
index e02d39fd7170..9640d4aa1be8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id:$
-
 package org.hibernate.orm.test.jpa.exception;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -61,5 +56,3 @@ public enum Type {
 		WIND, STRINGS, PERCUSSION
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java
index e29695734b69..c6ec8d95a69b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.jpa.exception;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
@@ -39,7 +35,7 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	@Version 
+	@Version
 	public Integer getVersion() {
 		return version;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java
index 293619dc9559..794b31d7eb4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
 package org.hibernate.orm.test.jpa.exception;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
@@ -20,9 +16,9 @@
 @SuppressWarnings("serial")
 public class Musician implements Serializable {
 	private Integer id;
-	
+
 	private String name;
-	
+
 	private Music favouriteMusic;
 
 	@Id @GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java
index b04841682747..c98519819e66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/GetIdentifierTest.java
index bfa744c31bd6..cf3e90f64278 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/GetIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/GetIdentifierTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
-import java.io.Serializable;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java
index 39ffadd8d296..389ab39035c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
@@ -14,64 +12,64 @@
 @IdClass(LegacyEntityPk.class)
 public class LegacyEntity {
 
-    @Id
-    private int primitivePk1;
+	@Id
+	private int primitivePk1;
 
-    @Id
-    private int primitivePk2;
+	@Id
+	private int primitivePk2;
 
-    private String foo;
+	private String foo;
 
-    public LegacyEntity() {}
+	public LegacyEntity() {}
 
-    public int getPrimitivePk1() {
-        return primitivePk1;
-    }
+	public int getPrimitivePk1() {
+		return primitivePk1;
+	}
 
-    public void setPrimitivePk1(int primitivePk1) {
-        this.primitivePk1 = primitivePk1;
-    }
+	public void setPrimitivePk1(int primitivePk1) {
+		this.primitivePk1 = primitivePk1;
+	}
 
-    public int getPrimitivePk2() {
-        return primitivePk2;
-    }
+	public int getPrimitivePk2() {
+		return primitivePk2;
+	}
 
-    public void setPrimitivePk2(int primitivePk2) {
-        this.primitivePk2 = primitivePk2;
-    }
+	public void setPrimitivePk2(int primitivePk2) {
+		this.primitivePk2 = primitivePk2;
+	}
 
-    public String getFoo() {
-        return foo;
-    }
+	public String getFoo() {
+		return foo;
+	}
 
-    public void setFoo(String foo) {
-        this.foo = foo;
-    }
+	public void setFoo(String foo) {
+		this.foo = foo;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        LegacyEntity that = (LegacyEntity) o;
+		LegacyEntity that = (LegacyEntity) o;
 
-        if (primitivePk1 != that.primitivePk1) return false;
-        return primitivePk2 == that.primitivePk2;
+		if (primitivePk1 != that.primitivePk1) return false;
+		return primitivePk2 == that.primitivePk2;
 
-    }
+	}
 
-    @Override
-    public int hashCode() {
-        int result = primitivePk1;
-        result = 31 * result + primitivePk2;
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = primitivePk1;
+		result = 31 * result + primitivePk2;
+		return result;
+	}
 
-    @Override
-    public String toString() {
-        return "LegacyEntity{" +
-                "primitivePk1=" + primitivePk1 +
-                ", primitivePk2=" + primitivePk2 +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "LegacyEntity{" +
+				"primitivePk1=" + primitivePk1 +
+				", primitivePk2=" + primitivePk2 +
+				'}';
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntityPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntityPk.java
index 3e9f8ed2e4be..33bfda68dbb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntityPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntityPk.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
@@ -10,45 +8,45 @@
 
 public class LegacyEntityPk implements Serializable {
 
-    private int primitivePk1;
+	private int primitivePk1;
 
-    private int primitivePk2;
+	private int primitivePk2;
 
-    public LegacyEntityPk() {
-    }
+	public LegacyEntityPk() {
+	}
 
-    public int getPrimitivePk1() {
-        return primitivePk1;
-    }
+	public int getPrimitivePk1() {
+		return primitivePk1;
+	}
 
-    public void setPrimitivePk1(int primitivePk1) {
-        this.primitivePk1 = primitivePk1;
-    }
+	public void setPrimitivePk1(int primitivePk1) {
+		this.primitivePk1 = primitivePk1;
+	}
 
-    public int getPrimitivePk2() {
-        return primitivePk2;
-    }
+	public int getPrimitivePk2() {
+		return primitivePk2;
+	}
 
-    public void setPrimitivePk2(int primitivePk2) {
-        this.primitivePk2 = primitivePk2;
-    }
+	public void setPrimitivePk2(int primitivePk2) {
+		this.primitivePk2 = primitivePk2;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        LegacyEntityPk that = (LegacyEntityPk) o;
+		LegacyEntityPk that = (LegacyEntityPk) o;
 
-        if (primitivePk1 != that.primitivePk1) return false;
-        return primitivePk2 == that.primitivePk2;
+		if (primitivePk1 != that.primitivePk1) return false;
+		return primitivePk2 == that.primitivePk2;
 
-    }
+	}
 
-    @Override
-    public int hashCode() {
-        int result = primitivePk1;
-        result = 31 * result + primitivePk2;
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = primitivePk1;
+		result = 31 * result + primitivePk2;
+		return result;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java
index 0c977cecab26..000eac8fc71b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
@@ -13,51 +11,51 @@
 @Entity(name = "ModernEntity")
 public class ModernEntity {
 
-    @Id
-    @GeneratedValue
-    private int id;
+	@Id
+	@GeneratedValue
+	private int id;
 
-    private int foo;
+	private int foo;
 
-    public ModernEntity() {
-    }
+	public ModernEntity() {
+	}
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public int getFoo() {
-        return foo;
-    }
+	public int getFoo() {
+		return foo;
+	}
 
-    public void setFoo(int foo) {
-        this.foo = foo;
-    }
+	public void setFoo(int foo) {
+		this.foo = foo;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        ModernEntity that = (ModernEntity) o;
+		ModernEntity that = (ModernEntity) o;
 
-        return id == that.id;
+		return id == that.id;
 
-    }
+	}
 
-    @Override
-    public int hashCode() {
-        return id;
-    }
+	@Override
+	public int hashCode() {
+		return id;
+	}
 
-    @Override
-    public String toString() {
-        return "ModernEntity{" +
-                "id=" + id +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "ModernEntity{" +
+				"id=" + id +
+				'}';
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java
index e38fee0b6c6d..110c539226df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
@@ -16,60 +14,60 @@
 @IdClass(NestedLegacyEntityPk.class)
 public class NestedLegacyEntity {
 
-    @Id
-    @ManyToOne
-    @JoinColumn(name = "legacyFk1", referencedColumnName = "primitivePk1")
-    @JoinColumn(name = "legacyFk2", referencedColumnName = "primitivePk2")
-    private LegacyEntity legacyEntity;
+	@Id
+	@ManyToOne
+	@JoinColumn(name = "legacyFk1", referencedColumnName = "primitivePk1")
+	@JoinColumn(name = "legacyFk2", referencedColumnName = "primitivePk2")
+	private LegacyEntity legacyEntity;
 
-    @Id
-    @ManyToOne
-    @JoinColumn(name = "modernFk", referencedColumnName = "id")
-    private ModernEntity modernEntity;
+	@Id
+	@ManyToOne
+	@JoinColumn(name = "modernFk", referencedColumnName = "id")
+	private ModernEntity modernEntity;
 
-    public NestedLegacyEntity() {
-    }
+	public NestedLegacyEntity() {
+	}
 
-    public LegacyEntity getLegacyEntity() {
-        return legacyEntity;
-    }
+	public LegacyEntity getLegacyEntity() {
+		return legacyEntity;
+	}
 
-    public void setLegacyEntity(LegacyEntity legacyEntity) {
-        this.legacyEntity = legacyEntity;
-    }
+	public void setLegacyEntity(LegacyEntity legacyEntity) {
+		this.legacyEntity = legacyEntity;
+	}
 
-    public ModernEntity getModernEntity() {
-        return modernEntity;
-    }
+	public ModernEntity getModernEntity() {
+		return modernEntity;
+	}
 
-    public void setModernEntity(ModernEntity modernEntity) {
-        this.modernEntity = modernEntity;
-    }
+	public void setModernEntity(ModernEntity modernEntity) {
+		this.modernEntity = modernEntity;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        NestedLegacyEntity that = (NestedLegacyEntity) o;
+		NestedLegacyEntity that = (NestedLegacyEntity) o;
 
-        if (legacyEntity != null ? !legacyEntity.equals(that.legacyEntity) : that.legacyEntity != null) return false;
-        return modernEntity != null ? modernEntity.equals(that.modernEntity) : that.modernEntity == null;
+		if (legacyEntity != null ? !legacyEntity.equals(that.legacyEntity) : that.legacyEntity != null) return false;
+		return modernEntity != null ? modernEntity.equals(that.modernEntity) : that.modernEntity == null;
 
-    }
+	}
 
-    @Override
-    public int hashCode() {
-        int result = legacyEntity != null ? legacyEntity.hashCode() : 0;
-        result = 31 * result + (modernEntity != null ? modernEntity.hashCode() : 0);
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = legacyEntity != null ? legacyEntity.hashCode() : 0;
+		result = 31 * result + (modernEntity != null ? modernEntity.hashCode() : 0);
+		return result;
+	}
 
-    @Override
-    public String toString() {
-        return "NestedLegacyEntity{" +
-                "legacyEntity=" + legacyEntity +
-                ", modernEntity=" + modernEntity +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "NestedLegacyEntity{" +
+				"legacyEntity=" + legacyEntity +
+				", modernEntity=" + modernEntity +
+				'}';
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntityPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntityPk.java
index 0b144624efff..9874b1da8b30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntityPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntityPk.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.factory.puUtil;
 
@@ -10,45 +8,45 @@
 
 public class NestedLegacyEntityPk implements Serializable {
 
-    private LegacyEntityPk legacyEntity;
+	private LegacyEntityPk legacyEntity;
 
-    private int modernEntity;
+	private int modernEntity;
 
-    public NestedLegacyEntityPk() {
-    }
+	public NestedLegacyEntityPk() {
+	}
 
-    public LegacyEntityPk getLegacyEntity() {
-        return legacyEntity;
-    }
+	public LegacyEntityPk getLegacyEntity() {
+		return legacyEntity;
+	}
 
-    public void setLegacyEntity(LegacyEntityPk legacyEntity) {
-        this.legacyEntity = legacyEntity;
-    }
+	public void setLegacyEntity(LegacyEntityPk legacyEntity) {
+		this.legacyEntity = legacyEntity;
+	}
 
-    public int getModernEntity() {
-        return modernEntity;
-    }
+	public int getModernEntity() {
+		return modernEntity;
+	}
 
-    public void setModernEntity(int modernEntity) {
-        this.modernEntity = modernEntity;
-    }
+	public void setModernEntity(int modernEntity) {
+		this.modernEntity = modernEntity;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        NestedLegacyEntityPk that = (NestedLegacyEntityPk) o;
+		NestedLegacyEntityPk that = (NestedLegacyEntityPk) o;
 
-        if (modernEntity != that.modernEntity) return false;
-        return legacyEntity != null ? legacyEntity.equals(that.legacyEntity) : that.legacyEntity == null;
+		if (modernEntity != that.modernEntity) return false;
+		return legacyEntity != null ? legacyEntity.equals(that.legacyEntity) : that.legacyEntity == null;
 
-    }
+	}
 
-    @Override
-    public int hashCode() {
-        int result = legacyEntity != null ? legacyEntity.hashCode() : 0;
-        result = 31 * result + modernEntity;
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = legacyEntity != null ? legacyEntity.hashCode() : 0;
+		result = 31 * result + modernEntity;
+		return result;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java
index 90ea7d58b5f6..67e4ed8cf33d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.fetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Person.java
index c17e0ad033df..b88710491897 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.fetch;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Stay.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Stay.java
index 07001edcd77b..3c4e8eb6990c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Stay.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/Stay.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.fetch;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
index b99a1f9d0725..00540da7a380 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.findoptions;
 
 import jakarta.persistence.CacheStoreMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
index 96d360760911..7bb9debf47e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.findoptions;
 
 import jakarta.persistence.ElementCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
index a160d6fe55be..71b3e9977777 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.findoptions;
 
 import jakarta.persistence.CacheStoreMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java
index fff5a9b3d107..c03dcd7ae1c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -18,7 +16,6 @@
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java
index 3dc898e072a4..7c23c506166e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -25,16 +23,16 @@
 public class Company {
 	@Id @GeneratedValue
 	public long id;
-	
+
 	@OneToMany
 	public Set employees = new HashSet();
-	
+
 	@OneToOne(fetch = FetchType.LAZY)
 	public Location location;
-	
+
 	@ElementCollection
 	public Set markets = new HashSet();
-	
+
 	@ElementCollection(fetch = FetchType.EAGER)
 	public Set phoneNumbers = new HashSet();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java
index f38f6f7d64ea..0bc2cf2e61f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -31,16 +29,16 @@
 public class CompanyFetchProfile {
 	@Id @GeneratedValue
 	public long id;
-	
+
 	@OneToMany
 	public Set employees = new HashSet();
-	
+
 	@OneToOne(fetch = FetchType.LAZY)
 	public Location location;
-	
+
 	@ElementCollection
 	public Set markets = new HashSet();
-	
+
 	@ElementCollection(fetch = FetchType.EAGER)
 	@JoinTable(name= "companyfp_phonenos")
 	public Set phoneNumbers = new HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java
index 39c989e27789..7238ad9c71f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -24,9 +22,9 @@ public class Course {
 	@Id
 	@GeneratedValue
 	private int id;
-	
+
 	private String name;
-	
+
 	@ManyToMany(mappedBy="courses", cascade=CascadeType.ALL)
 	private List students = new ArrayList<>();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java
index 656362ee4efb..1737b7fde8ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -25,10 +23,10 @@
 public class Employee {
 	@Id @GeneratedValue
 	public long id;
-	
+
 	@ManyToMany
 	public Set managers = new HashSet();
-	
+
 	@ManyToMany
 	public Set friends = new HashSet();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java
index 149df194b5ed..263f1ba30ffd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.EnumSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java
index a86fc8411ec2..54dda167d0df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -99,84 +97,84 @@ public void loadMultipleAssociations() {
 		em.close();
 	}
 
-    @Test
-   	public void loadCollection() {
-   		EntityManager em = getOrCreateEntityManager();
-   		em.getTransaction().begin();
+	@Test
+	public void loadCollection() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
 
-   		Bar bar = new Bar();
-   		em.persist( bar );
+		Bar bar = new Bar();
+		em.persist( bar );
 
-   		Foo foo = new Foo();
-   		foo.bar = bar;
-        bar.foos.add(foo);
-   		em.persist( foo );
+		Foo foo = new Foo();
+		foo.bar = bar;
+		bar.foos.add(foo);
+		em.persist( foo );
 
-   		em.getTransaction().commit();
-   		em.clear();
+		em.getTransaction().commit();
+		em.clear();
 
-   		em.getTransaction().begin();
+		em.getTransaction().begin();
 
-   		EntityGraph barGraph = em.createEntityGraph( Bar.class );
-   		barGraph.addAttributeNodes("foos");
+		EntityGraph barGraph = em.createEntityGraph( Bar.class );
+		barGraph.addAttributeNodes("foos");
 
-   		Map properties = new HashMap();
-   		properties.put( "javax.persistence.loadgraph", barGraph);
+		Map properties = new HashMap();
+		properties.put( "javax.persistence.loadgraph", barGraph);
 
-   		Bar result = em.find( Bar.class, bar.id, properties );
+		Bar result = em.find( Bar.class, bar.id, properties );
 
-   		assertTrue( Hibernate.isInitialized( result ) );
-   		assertTrue( Hibernate.isInitialized( result.foos ) );
+		assertTrue( Hibernate.isInitialized( result ) );
+		assertTrue( Hibernate.isInitialized( result.foos ) );
 
-   		em.getTransaction().commit();
-   		em.close();
-   	}
+		em.getTransaction().commit();
+		em.close();
+	}
 
-    @Test
-   	public void loadInverseCollection() {
-   		EntityManager em = getOrCreateEntityManager();
-   		em.getTransaction().begin();
+	@Test
+	public void loadInverseCollection() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
 
-   		Bar bar = new Bar();
-   		em.persist( bar );
-   		Baz baz = new Baz();
-   		em.persist( baz );
+		Bar bar = new Bar();
+		em.persist( bar );
+		Baz baz = new Baz();
+		em.persist( baz );
 
-   		Foo foo = new Foo();
-   		foo.bar = bar;
-   		foo.baz = baz;
-        bar.foos.add(foo);
-        baz.foos.add(foo);
-   		em.persist( foo );
+		Foo foo = new Foo();
+		foo.bar = bar;
+		foo.baz = baz;
+		bar.foos.add(foo);
+		baz.foos.add(foo);
+		em.persist( foo );
 
-   		em.getTransaction().commit();
-   		em.clear();
+		em.getTransaction().commit();
+		em.clear();
 
-   		em.getTransaction().begin();
+		em.getTransaction().begin();
 
-   		EntityGraph fooGraph = em.createEntityGraph( Foo.class );
-   		fooGraph.addAttributeNodes("bar");
-   		fooGraph.addAttributeNodes("baz");
-        Subgraph barGraph = fooGraph.addSubgraph("bar", Bar.class);
-        barGraph.addAttributeNodes("foos");
+		EntityGraph fooGraph = em.createEntityGraph( Foo.class );
+		fooGraph.addAttributeNodes("bar");
+		fooGraph.addAttributeNodes("baz");
+		Subgraph barGraph = fooGraph.addSubgraph("bar", Bar.class);
+		barGraph.addAttributeNodes("foos");
 
-   		Map properties = new HashMap();
-   		properties.put( "javax.persistence.loadgraph", fooGraph );
+		Map properties = new HashMap();
+		properties.put( "javax.persistence.loadgraph", fooGraph );
 
-   		Foo result = em.find( Foo.class, foo.id, properties );
+		Foo result = em.find( Foo.class, foo.id, properties );
 
-   		assertTrue( Hibernate.isInitialized( result ) );
-   		assertTrue( Hibernate.isInitialized( result.bar ) );
-        assertTrue( Hibernate.isInitialized( result.bar.getFoos()) );
-   		assertTrue( Hibernate.isInitialized( result.baz ) );
-   		// sanity check -- ensure the only bi-directional fetch was the one identified by the graph
-        assertFalse( Hibernate.isInitialized( result.baz.getFoos()) );
+		assertTrue( Hibernate.isInitialized( result ) );
+		assertTrue( Hibernate.isInitialized( result.bar ) );
+		assertTrue( Hibernate.isInitialized( result.bar.getFoos()) );
+		assertTrue( Hibernate.isInitialized( result.baz ) );
+		// sanity check -- ensure the only bi-directional fetch was the one identified by the graph
+		assertFalse( Hibernate.isInitialized( result.baz.getFoos()) );
 
-   		em.getTransaction().commit();
-   		em.close();
-   	}
+		em.getTransaction().commit();
+		em.close();
+	}
 
-    /**
+	/**
 	 * JPA 2.1 spec: "Add a node to the graph that corresponds to a managed type with inheritance. This allows for
 	 * multiple subclass subgraphs to be defined for this node of the entity graph. Subclass subgraphs will
 	 * automatically include the specified attributes of superclass subgraphs."
@@ -228,87 +226,87 @@ public void inheritanceTest() {
 		em.close();
 	}
 
-    @Test
-    @JiraKey(value = "HHH-9080")
-    public void attributeNodeInheritanceTest() {
-        EntityManager em = getOrCreateEntityManager();
-        em.getTransaction().begin();
+	@Test
+	@JiraKey(value = "HHH-9080")
+	public void attributeNodeInheritanceTest() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
 
-        Manager manager = new Manager();
-        em.persist( manager );
-        Employee employee = new Employee();
-        manager.friends.add( employee);
-        em.persist( employee );
-        Manager anotherManager = new Manager();
-        manager.managers.add(anotherManager);
-        em.persist( anotherManager );
-        em.getTransaction().commit();
-        em.clear();
+		Manager manager = new Manager();
+		em.persist( manager );
+		Employee employee = new Employee();
+		manager.friends.add( employee);
+		em.persist( employee );
+		Manager anotherManager = new Manager();
+		manager.managers.add(anotherManager);
+		em.persist( anotherManager );
+		em.getTransaction().commit();
+		em.clear();
 
-        em.getTransaction().begin();
+		em.getTransaction().begin();
 
-        EntityGraph entityGraph = em.createEntityGraph( Manager.class );
-        entityGraph.addAttributeNodes( "friends" );
-        entityGraph.addAttributeNodes( "managers" );
+		EntityGraph entityGraph = em.createEntityGraph( Manager.class );
+		entityGraph.addAttributeNodes( "friends" );
+		entityGraph.addAttributeNodes( "managers" );
 
-        Map properties = new HashMap();
-        properties.put( "javax.persistence.loadgraph", entityGraph );
+		Map properties = new HashMap();
+		properties.put( "javax.persistence.loadgraph", entityGraph );
 
-        Manager result = em.find( Manager.class, manager.id, properties );
+		Manager result = em.find( Manager.class, manager.id, properties );
 
-        assertTrue( Hibernate.isInitialized( result ) );
-        assertTrue( Hibernate.isInitialized( result.friends ) );
-        assertEquals( result.friends.size(), 1 );
-        assertTrue( Hibernate.isInitialized( result.managers) );
-        assertEquals( result.managers.size(), 1 );
+		assertTrue( Hibernate.isInitialized( result ) );
+		assertTrue( Hibernate.isInitialized( result.friends ) );
+		assertEquals( result.friends.size(), 1 );
+		assertTrue( Hibernate.isInitialized( result.managers) );
+		assertEquals( result.managers.size(), 1 );
 
-        em.getTransaction().commit();
-        em.close();
-    }
+		em.getTransaction().commit();
+		em.close();
+	}
 
-    @Test
-    @JiraKey(value = "HHH-9735")
-    public void loadIsMemeberQueriedCollection() {
+	@Test
+	@JiraKey(value = "HHH-9735")
+	public void loadIsMemeberQueriedCollection() {
 
-        EntityManager em = getOrCreateEntityManager();
-        em.getTransaction().begin();
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
 
-        Bar bar = new Bar();
-        em.persist( bar );
+		Bar bar = new Bar();
+		em.persist( bar );
 
-        Foo foo = new Foo();
-        foo.bar = bar;
-        bar.foos.add(foo);
-        em.persist( foo );
+		Foo foo = new Foo();
+		foo.bar = bar;
+		bar.foos.add(foo);
+		em.persist( foo );
 
-        em.getTransaction().commit();
-        em.clear();
+		em.getTransaction().commit();
+		em.clear();
 
-        em.getTransaction().begin();
-        foo = em.find(Foo.class, foo.id);
+		em.getTransaction().begin();
+		foo = em.find(Foo.class, foo.id);
 
-        CriteriaBuilder cb = em.getCriteriaBuilder();
-        CriteriaQuery cq = cb.createQuery(Bar.class);
-        Root from = cq.from(Bar.class);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery cq = cb.createQuery(Bar.class);
+		Root from = cq.from(Bar.class);
 
-        Expression> foos = from.get("foos");
+		Expression> foos = from.get("foos");
 
-        cq.where(cb.isMember(foo, foos));
+		cq.where(cb.isMember(foo, foos));
 
-        TypedQuery query = em.createQuery(cq);
+		TypedQuery query = em.createQuery(cq);
 
-        EntityGraph barGraph = em.createEntityGraph( Bar.class );
-        barGraph.addAttributeNodes("foos");
-        query.setHint("javax.persistence.loadgraph", barGraph);
+		EntityGraph barGraph = em.createEntityGraph( Bar.class );
+		barGraph.addAttributeNodes("foos");
+		query.setHint("javax.persistence.loadgraph", barGraph);
 
-        Bar result = query.getSingleResult();
+		Bar result = query.getSingleResult();
 
-        assertTrue( Hibernate.isInitialized( result ) );
-        assertTrue( Hibernate.isInitialized( result.foos ) );
+		assertTrue( Hibernate.isInitialized( result ) );
+		assertTrue( Hibernate.isInitialized( result.foos ) );
 
-        em.getTransaction().commit();
-        em.close();
-    }
+		em.getTransaction().commit();
+		em.close();
+	}
 
 	@Test
 	@JiraKey(value = "HHH-15859")
@@ -486,9 +484,9 @@ public void joinedInheritanceWithSubEntityAttributeFiltering() {
 		em.close();
 	}
 
-    @Entity(name = "Foo")
+	@Entity(name = "Foo")
 	@Table(name = "foo")
-    public static class Foo {
+	public static class Foo {
 
 		@Id
 		@GeneratedValue
@@ -509,8 +507,8 @@ public static class Bar {
 		@GeneratedValue
 		public Integer id;
 
-        @OneToMany(mappedBy = "bar")
-        public Set foos = new HashSet();
+		@OneToMany(mappedBy = "bar")
+		public Set foos = new HashSet();
 
 		public Set getFoos() {
 			return foos;
@@ -519,14 +517,14 @@ public Set getFoos() {
 
 	@Entity(name = "Baz")
 	@Table(name = "baz")
-    public static class Baz {
+	public static class Baz {
 
 		@Id
 		@GeneratedValue
-        public Integer id;
+		public Integer id;
 
-        @OneToMany(mappedBy = "baz")
-        public Set foos = new HashSet();
+		@OneToMany(mappedBy = "baz")
+		public Set foos = new HashSet();
 
 		public Set getFoos() {
 			return foos;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java
index 170d99ebdffd..d1dfd03877c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java
index 0f6098e48781..a1bca4a2fb16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.Arrays;
@@ -190,4 +194,3 @@ static class FinanceEntity {
 		String name;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java
index 9871c2257d9e..31ced33ff494 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java
index 621af1ec62a3..9871f612423d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -17,9 +15,9 @@
 public class Location {
 	@Id @GeneratedValue
 	public long id;
-	
+
 	public String address;
-	
+
 	public int zip;
 
 	public int getZip() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java
index c74ba94ac807..f8e72a2439b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java
index 0af4ea0ed46a..b5c0209d6c50 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java
index 17f2e5971444..dea44e7c9b4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs;
 
@@ -10,7 +8,6 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
@@ -41,9 +38,9 @@
 public class Student {
 	@Id
 	private int id;
-	
+
 	private String name;
-	
+
 	@ManyToMany(cascade=CascadeType.PERSIST)
 	@JoinTable(
 		name="STUDENT_COURSES",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java
index 437528426ea9..cc7998b4dbb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.graphs.mappedbyid;
 
 import org.hibernate.Hibernate;
@@ -31,9 +35,9 @@
 public class FetchGraphFindByIdTest extends BaseEntityManagerFunctionalTestCase {
 
 	private long companyId;
-	
+
 	private long companyWithFetchProfileId;
-	
+
 	@Test
 	@JiraKey(value = "HHH-8776")
 	public void testFetchGraphByFind() {
@@ -106,7 +110,7 @@ public void testFetchGraphByFindTakingPrecedenceOverFetchProfile() {
 		entityManager.getTransaction().begin();
 
 		entityManager.unwrap( Session.class ).enableFetchProfile("company.location");
-		
+
 		EntityGraph entityGraph = entityManager.createEntityGraph( CompanyFetchProfile.class );
 		entityGraph.addAttributeNodes( "markets" );
 
@@ -208,7 +212,7 @@ public void createData() {
 		companyFetchProfile.phoneNumbers.add( "987-654-3210" );
 		entityManager.persist( companyFetchProfile );
 		companyWithFetchProfileId = companyFetchProfile.id;
-		
+
 		entityManager.getTransaction().commit();
 		entityManager.close();
 	}
@@ -217,5 +221,5 @@ public void createData() {
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] { Company.class, CompanyFetchProfile.class, Employee.class, Manager.class, Location.class, Course.class, Student.class };
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java
index 93e227180cfa..92c3eef4beca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.graphs.queryhint;
 
@@ -50,12 +48,12 @@
  * @author Nathan Xu
  */
 public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCase {
-	
+
 	@Test
 	public void testLoadGraph() {
 		EntityManager entityManager = getOrCreateEntityManager();
 		entityManager.getTransaction().begin();
-		
+
 		EntityGraph entityGraph = entityManager.createEntityGraph( Company.class );
 		entityGraph.addAttributeNodes( "location" );
 		entityGraph.addAttributeNodes( "markets" );
@@ -65,31 +63,31 @@ public void testLoadGraph() {
 
 		entityManager.getTransaction().commit();
 		entityManager.close();
-		
+
 		assertFalse( Hibernate.isInitialized( company.employees ) );
 		assertTrue( Hibernate.isInitialized( company.location ) );
 		assertTrue( Hibernate.isInitialized( company.markets ) );
 		// With "loadgraph", non-specified attributes use the fetch modes defined in the mappings.  So, here,
 		// @ElementCollection(fetch = FetchType.EAGER) should cause the follow-on selects to happen.
 		assertTrue( Hibernate.isInitialized( company.phoneNumbers ) );
-		
+
 		entityManager = getOrCreateEntityManager();
 		entityManager.getTransaction().begin();
-		
+
 		Subgraph subgraph = entityGraph.addSubgraph( "employees" );
 		subgraph.addAttributeNodes( "managers" );
 		subgraph.addAttributeNodes( "friends" );
 		Subgraph subSubgraph = subgraph.addSubgraph( "managers", Manager.class );
 		subSubgraph.addAttributeNodes( "managers" );
 		subSubgraph.addAttributeNodes( "friends" );
-		
+
 		query = entityManager.createQuery( "from " + Company.class.getName() );
 		query.setHint( HINT_SPEC_LOAD_GRAPH, entityGraph );
 		company = (Company) query.getSingleResult();
-		
+
 		entityManager.getTransaction().commit();
 		entityManager.close();
-		
+
 		assertTrue( Hibernate.isInitialized( company.employees ) );
 		assertTrue( Hibernate.isInitialized( company.location ) );
 		assertEquals( 12345, company.location.zip );
@@ -97,7 +95,7 @@ public void testLoadGraph() {
 		// With "loadgraph", non-specified attributes use the fetch modes defined in the mappings.  So, here,
 		// @ElementCollection(fetch = FetchType.EAGER) should cause the follow-on selects to happen.
 		assertTrue( Hibernate.isInitialized( company.phoneNumbers ) );
-		
+
 		boolean foundManager = false;
 		Iterator employeeItr = company.employees.iterator();
 		while (employeeItr.hasNext()) {
@@ -215,7 +213,7 @@ public void testFetchGraphTakingPrecedenceOverFetchProfile() {
 		entityManager.getTransaction().begin();
 
 		entityManager.unwrap( Session.class ).enableFetchProfile( "company.location" );
-		
+
 		EntityGraph entityGraph = entityManager.createEntityGraph( CompanyFetchProfile.class );
 		entityGraph.addAttributeNodes( "markets" );
 		Query query = entityManager.createQuery( "from " + CompanyFetchProfile.class.getName() );
@@ -273,7 +271,7 @@ public void testFetchGraphTakingPrecedenceOverFetchProfile() {
 		}
 		assertTrue(foundManager);
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-9457")
 	public void testLoadGraphOrderByWithImplicitJoin() {
@@ -409,7 +407,7 @@ public void testLoadGraphWithRestriction() {
 	public void testEntityGraphWithExplicitFetch() {
 		EntityManager entityManager = getOrCreateEntityManager();
 		entityManager.getTransaction().begin();
-		
+
 		EntityGraph entityGraph = entityManager.createEntityGraph( Company.class );
 		entityGraph.addAttributeNodes( "location" );
 		entityGraph.addAttributeNodes( "markets" );
@@ -419,10 +417,10 @@ public void testEntityGraphWithExplicitFetch() {
 				+ " as c left join fetch c.location left join fetch c.employees" );
 		query.setHint( HINT_SPEC_LOAD_GRAPH, entityGraph );
 		Company company = (Company) query.getSingleResult();
-		
+
 		entityManager.getTransaction().commit();
 		entityManager.close();
-		
+
 		assertTrue( Hibernate.isInitialized( company.employees ) );
 		assertTrue( Hibernate.isInitialized( company.location ) );
 		assertTrue( Hibernate.isInitialized( company.markets ) );
@@ -480,29 +478,29 @@ public void testEntityGraphWithCollectionSubquery(){
 	public void testCollectionSizeLoadedWithGraph() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 
-			 Student student1 = new Student();
-			 student1.setId( 1 );
-			 student1.setName( "Student 1" );
-			 Student student2 = new Student();
-			 student2.setId( 2 );
-			 student2.setName( "Student 2" );
+			Student student1 = new Student();
+			student1.setId( 1 );
+			student1.setName( "Student 1" );
+			Student student2 = new Student();
+			student2.setId( 2 );
+			student2.setName( "Student 2" );
 
-			 Course course1 = new Course();
-			 course1.setName( "Full Time" );
-			 Course course2 = new Course();
-			 course2.setName( "Part Time" );
+			Course course1 = new Course();
+			course1.setName( "Full Time" );
+			Course course2 = new Course();
+			course2.setName( "Part Time" );
 
-			 Set std1Courses = new HashSet();
-			 std1Courses.add( course1 );
-			 std1Courses.add( course2 );
-			 student1.setCourses( std1Courses );
+			Set std1Courses = new HashSet();
+			std1Courses.add( course1 );
+			std1Courses.add( course2 );
+			student1.setCourses( std1Courses );
 
-			 Set std2Courses = new HashSet();
-			 std2Courses.add( course2 );
-			 student2.setCourses( std2Courses );
+			Set std2Courses = new HashSet();
+			std2Courses.add( course2 );
+			student2.setCourses( std2Courses );
 
-			 entityManager.persist( student1 );
-			 entityManager.persist( student2 );
+			entityManager.persist( student1 );
+			entityManager.persist( student2 );
 
 		});
 
@@ -521,23 +519,23 @@ public void testCollectionSizeLoadedWithGraph() {
 	public void createData() {
 		EntityManager entityManager = getOrCreateEntityManager();
 		entityManager.getTransaction().begin();
-		
+
 		Manager manager1 = new Manager();
 		entityManager.persist( manager1 );
-		
+
 		Manager manager2 = new Manager();
 		manager2.managers.add( manager1 );
 		entityManager.persist( manager2 );
-		
+
 		Employee employee = new Employee();
 		employee.managers.add( manager1 );
 		entityManager.persist( employee );
-		
+
 		Location location = new Location();
 		location.address = "123 somewhere";
 		location.zip = 12345;
 		entityManager.persist( location );
-		
+
 		Company company = new Company();
 		company.employees.add( employee );
 		company.employees.add( manager1 );
@@ -559,7 +557,7 @@ public void createData() {
 		companyFetchProfile.phoneNumbers.add( "012-345-6789" );
 		companyFetchProfile.phoneNumbers.add( "987-654-3210" );
 		entityManager.persist( companyFetchProfile );
-		
+
 		entityManager.getTransaction().commit();
 		entityManager.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
index 332951af4865..2a6b85acea19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
index b1107f664948..b1c23096ad80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java
index 3bef57bfea33..562db4275bff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.inheritance;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/InheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/InheritanceTest.java
index 51c2fe7289e4..12c620a8bb7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/InheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/InheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java
index c8c21ca06315..7e8c54d44d8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.inheritance;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProvider.java
index dc97f395c85a..86adb9a5a9e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderClassNameSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderClassNameSettingProvider.java
index c0807ebc76bb..f5d7532a7dcf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderClassNameSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderClassNameSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderInstanceSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderInstanceSettingProvider.java
index 2cc5bae18f6d..e572b34c283f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderInstanceSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/DtoIntegratorProviderInstanceSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java
index fc85eb63a5c0..7d162220aec1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java
index 63360f2863c7..68050edea919 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java
index 7a426216a6d7..dee35ca181ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java
index 47238b49202a..0ced7cd3cae7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java
index b83828bbc2d6..76e91bc9a1b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/PersonDto.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/PersonDto.java
index 06264253585b..59167241c51d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/PersonDto.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/PersonDto.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.integrationprovider;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingSettingPrecedenceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingSettingPrecedenceTests.java
index f654fe3627b7..351516192f59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingSettingPrecedenceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingSettingPrecedenceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jakarta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
index 5d7fd82bf150..cdc10e600493 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jakarta;
 
@@ -29,7 +27,6 @@
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_DATABASE_ACTION;
 import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION;
@@ -42,7 +39,6 @@
 import static org.hibernate.cfg.AvailableSettings.JPA_JDBC_URL;
 import static org.hibernate.cfg.AvailableSettings.JPA_JDBC_USER;
 
-import org.assertj.core.api.Assertions;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaXmlSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaXmlSmokeTests.java
index 702c421bd349..c2b16e878abe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaXmlSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaXmlSmokeTests.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jakarta;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Map;
 import java.util.stream.Stream;
 import javax.xml.transform.stream.StreamSource;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/SimpleEntity.java
index 127e56fef117..3d65b4421c79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jakarta;
 
@@ -21,4 +19,4 @@ public class SimpleEntity {
 	public Integer id;
 	@Basic
 	public String name;
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/package-info.java
index 091a322cf6c7..146bf7f7d8af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/package-info.java
@@ -10,4 +10,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.jpa.jakarta;
\ No newline at end of file
+package org.hibernate.orm.test.jpa.jakarta;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java
index 29629fb9975f..e861ddb26dce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.joinable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java
index 50dcbe8f5836..36c04b3e7d27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/ManyToOneJoinTableTest.java
index 9d4bbf1656ba..f1d36214e0ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/ManyToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/ManyToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java
index aa9c8543c1aa..3d9d50cc4e3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java
index 6d88d47be116..9166d656dc39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lob;
 
@@ -12,7 +10,6 @@
 import java.io.ObjectOutputStream;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.persistence.EntityManager;
 
 import org.hibernate.Session;
 
@@ -38,15 +35,15 @@ public void testBlobSerialization(EntityManagerFactoryScope scope) {
 		Long readerId = scope.fromTransaction(
 				entityManager -> {
 					try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-						 ObjectOutputStream oos = new ObjectOutputStream( baos )) {
+						ObjectOutputStream oos = new ObjectOutputStream( baos )) {
 						Map image = new HashMap<>();
 						image.put( "meta", "metadata" );
 						image.put( "data", "imagedata" );
 						ImageReader reader = new ImageReader();
 						oos.writeObject( image );
 						reader.setImage( entityManager.unwrap( Session.class )
-												 .getLobHelper()
-												 .createBlob( baos.toByteArray() ) );
+												.getLobHelper()
+												.createBlob( baos.toByteArray() ) );
 						entityManager.persist( reader );
 						return reader.getId();
 					}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java
index 586668dd4c99..11d83495a55c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.lob;
 import java.io.Serializable;
 import java.sql.Blob;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/BatchAndLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/BatchAndLockTest.java
index 9e40db845f8b..af2ec4b99ba2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/BatchAndLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/BatchAndLockTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.lock;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
index 336d6d6e0c6b..d38903431a7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
@@ -16,7 +14,6 @@
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.orm.test.jpa.model.AbstractJPATest;
 import org.hibernate.orm.test.jpa.model.Item;
-import org.hibernate.orm.test.jpa.model.MyEntity;
 
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.jdbc.SQLServerSnapshotIsolationConnectionProvider;
@@ -26,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java
index 10370c74b712..11a21bc3429d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.lock;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
index b3f0d18c577c..5b079c906ce3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockReference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockReference.java
index b9d5257497ec..a70a44fdb4e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockReference.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockReference.java
@@ -1,20 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.lock;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.LockModeType;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.QueryHint;
-import jakarta.persistence.Version;
 
 /**
  * @author Emmanuel Bernard
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
index bc6eb40f4bee..de3568b78822 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
@@ -97,12 +95,12 @@ public void testFindWithTimeoutHint() {
 			em.remove( _lock );
 		} );
 	}
-	
+
 	@Test(timeout = 5 * 1000) //5 seconds
 	@JiraKey( value = "HHH-7252" )
-	@RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class, 
-		                    comment = "Test verifies proper exception throwing when a lock timeout is specified.",
-                              jiraKey = "HHH-7252" )
+	@RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class,
+							comment = "Test verifies proper exception throwing when a lock timeout is specified.",
+							jiraKey = "HHH-7252" )
 	@SkipForDialect(value = CockroachDialect.class, comment = "for update clause does not imply locking. See https://github.com/cockroachdb/cockroach/issues/88995")
 	@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase close socket after lock timeout occurred")
 	public void testFindWithPessimisticWriteLockTimeoutException() {
@@ -186,8 +184,8 @@ public void testQuerySingleResultPessimisticWriteLockTimeoutException() {
 					}
 					catch (PersistenceException pe) {
 						log.info("EntityManager.find() for PESSIMISTIC_WRITE with timeout of 0 threw a PersistenceException.\n" +
-										 "This is likely a consequence of " + getDialect().getClass().getName() + " not properly mapping SQL errors into the correct HibernateException subtypes.\n" +
-										 "See HHH-7251 for an example of one such situation.", pe);
+										"This is likely a consequence of " + getDialect().getClass().getName() + " not properly mapping SQL errors into the correct HibernateException subtypes.\n" +
+										"See HHH-7251 for an example of one such situation.", pe);
 						fail( "EntityManager should be throwing LockTimeoutException." );
 					}
 				} );
@@ -391,7 +389,7 @@ protected String updateStatement() {
 		}
 		return "UPDATE Lock_ SET name = :name where id = :id";
 	}
-	
+
 	@Test
 	public void testLockRead() throws Exception {
 		final Lock lock = new Lock();
@@ -852,7 +850,7 @@ public void testContendedPessimisticWriteLockTimeout() throws Exception {
 	@Test
 	@RequiresDialect(OracleDialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
-    @RequiresDialectFeature( DialectChecks.SupportsLockTimeouts.class )
+	@RequiresDialectFeature( DialectChecks.SupportsLockTimeouts.class )
 	public void testContendedPessimisticWriteLockNoWait() throws Exception {
 
 		final CountDownLatch latch = new CountDownLatch( 1 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java
index 8762fc8e2dd9..4ee35e07936f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java
index d76389684e82..61172f6e1ecc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
index 80421999dca6..7544bbbbdf0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
@@ -40,9 +38,9 @@ public void test(){
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			try {
 				entityManager.createNativeQuery(
-                    "select 1 " +
+					"select 1 " +
 					"from pg_sleep(2) "
-                )
+				)
 				.getResultList();
 
 				fail("Should have thrown lock timeout exception!");
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java
index 0e7f6c3023f5..a398b9372cd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java
index ae72d9c1ca57..e42283d32bba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jpa.lock;
 
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
index 6641a295c9ba..49471e70e216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
index 5e4a704a6174..ecc80e393608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
index a63ebde55442..1b0c49295c9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java
index 2f99ea85300a..b4e69ad5479e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.lock;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java
index c5ad57d50589..ca1e9a89d0b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.lock;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java
index 9269e97cd43a..437bb84e59aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java
index 86829e6a218b..f2e413e6841b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java
index 267611672b9e..4a6f936ceb3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/NestedEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/NestedEmbeddableTest.java
index c9e8fd8ca481..555ccc8c1052 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/NestedEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/NestedEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/Phone.java
index 1eb82a988ab6..f2a4cb21264c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 import jakarta.persistence.Column;
@@ -17,35 +15,35 @@
 @Table(name = "PHONE")
 public class Phone implements java.io.Serializable {
 
-    private Integer id;
-    private String brandName;
-    private float price;
+	private Integer id;
+	private String brandName;
+	private float price;
 
-    public Phone() {
-    }
+	public Phone() {
+	}
 
 	@Id
-    @Column(name="ID")
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	@Column(name="ID")
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    @Column(name="BRANDNAME")
-    public String getBrandName() {
-        return brandName;
-    }
-    public void setBrandName(String bName) {
-        this.brandName = bName;
-    }
+	@Column(name="BRANDNAME")
+	public String getBrandName() {
+		return brandName;
+	}
+	public void setBrandName(String bName) {
+		this.brandName = bName;
+	}
 
-    @Column(name="PRICE")
-    public float getPrice() {
-        return price;
-    }
-    public void setPrice(float price) {
-        this.price = price;
-    }
+	@Column(name="PRICE")
+	public float getPrice() {
+		return price;
+	}
+	public void setPrice(float price) {
+		this.price = price;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java
index 34cb73af0e7d..05b7dd09954e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java
index 986c8f3969c9..2a0e514ca201 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java
index c71240b2ef27..bf4ed91f7d0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/WrapperArrayHandlingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/WrapperArrayHandlingTests.java
index 1b6c4cc93125..25c919b63129 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/WrapperArrayHandlingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/WrapperArrayHandlingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.mapping;
 
@@ -59,9 +57,9 @@ void testComplianceDisabled(ServiceRegistryScope scope) {
 	@Entity( name = "TheEntity" )
 	@Table( name = "TheEntity" )
 	public static class TheEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Basic
 		private Character[] characters;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java
index 300124f4c3d8..ea1e2e301331 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java
index 472be50b5dc9..975282745600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java
index 810adbfecc7f..ddd05dc21d49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java
index 575d61fe3c3f..28a520f8c4f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java
index 53e4a2f320be..a16f5c5f3186 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java
index beeba003f7ee..2edb6889d550 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java
index 3c071789da48..43befee6519c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java
index a67142ea163c..ae733374e007 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java
index 50915a132c94..23ede52947b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java
index d34a0b7c2e39..2ceef525e2d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java
index 37e6a15fb91f..73157867de8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java
index 3c18ee19c58c..29f80429c4c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java
index 3dddefef7180..583b3c25b139 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Basic;
@@ -58,4 +56,3 @@ public void setHeight(Integer height) {
 		this.height = height;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java
index 82aeb040fffc..39e5db18a13a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java
index e5b27e809a40..c084c844a260 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java
index 1fc027db7fbc..20194583ed33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java
index ac4076dd205d..c1095eeb21a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java
index 4837170afbab..c12dff942e8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 
@@ -46,412 +44,412 @@
  * @author Emmanuel Bernard
  */
 @Jpa(
-        annotatedClasses = {
-                Fridge.class,
-                FoodItem.class,
-                Person.class,
-                Giant.class,
-                House.class,
-                Dog.class,
-                Cat.class,
-                Cattish.class,
-                Feline.class,
-                Garden.class,
-                Flower.class,
-                JoinedManyToOneOwner.class,
-                Parent.class,
-                Child.class
-        }
+		annotatedClasses = {
+				Fridge.class,
+				FoodItem.class,
+				Person.class,
+				Giant.class,
+				House.class,
+				Dog.class,
+				Cat.class,
+				Cattish.class,
+				Feline.class,
+				Garden.class,
+				Flower.class,
+				JoinedManyToOneOwner.class,
+				Parent.class,
+				Child.class
+		}
 )
 public class MetadataTest {
 
-    @Test
-    public void testBaseOfService(EntityManagerFactoryScope scope) {
-        EntityManagerFactory emf = scope.getEntityManagerFactory();
-        assertNotNull(emf.getMetamodel());
-        final EntityType entityType = emf.getMetamodel().entity(Fridge.class);
-        assertNotNull(entityType);
-
-    }
-
-    @Test
-    public void testInvalidAttributeCausesIllegalArgumentException(EntityManagerFactoryScope scope) {
-        // should not matter the exact subclass of ManagedType since this is implemented on the base class but
-        // check each anyway..
-
-        // entity
-        checkNonExistentAttributeAccess(scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class));
-
-        // embeddable
-        checkNonExistentAttributeAccess(scope.getEntityManagerFactory().getMetamodel().embeddable(Address.class));
-    }
-
-    private void checkNonExistentAttributeAccess(ManagedType managedType) {
-        final String NAME = "NO_SUCH_ATTRIBUTE";
-        try {
-            managedType.getAttribute(NAME);
-            fail("Lookup of non-existent attribute (getAttribute) should have caused IAE : " + managedType);
-        } catch (IllegalArgumentException expected) {
-        }
-        try {
-            managedType.getSingularAttribute(NAME);
-            fail("Lookup of non-existent attribute (getSingularAttribute) should have caused IAE : " + managedType);
-        } catch (IllegalArgumentException expected) {
-        }
-        try {
-            managedType.getCollection(NAME);
-            fail("Lookup of non-existent attribute (getCollection) should have caused IAE : " + managedType);
-        } catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    public void testBuildingMetamodelWithParameterizedCollection() {
-        Metadata metadata = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
-                .addAnnotatedClass(WithGenericCollection.class)
-                .buildMetadata();
-        SessionFactoryImplementor sfi = (SessionFactoryImplementor) metadata.buildSessionFactory();
-        sfi.close();
-    }
-
-    @Test
-    public void testLogicalManyToOne(EntityManagerFactoryScope scope) {
-        final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(
-                JoinedManyToOneOwner.class);
-        final SingularAttribute attr = entityType.getDeclaredSingularAttribute("house");
-        assertEquals(Attribute.PersistentAttributeType.MANY_TO_ONE, attr.getPersistentAttributeType());
-        assertEquals(House.class, attr.getBindableJavaType());
-        final EntityType houseType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
-        assertEquals(houseType.getBindableJavaType(), attr.getBindableJavaType());
-        assertFalse(entityType.getDeclaredSingularAttribute("house2").isOptional());
-    }
-
-    @Test
-    public void testEntity(EntityManagerFactoryScope scope) {
-        final EntityType fridgeType = scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class);
-        assertEquals(Fridge.class, fridgeType.getBindableJavaType());
-        assertEquals(Bindable.BindableType.ENTITY_TYPE, fridgeType.getBindableType());
-        SingularAttribute wrapped = fridgeType.getDeclaredSingularAttribute(
-                "temperature",
-                Integer.class
-        );
-        assertNotNull(wrapped);
-        SingularAttribute primitive = fridgeType.getDeclaredSingularAttribute(
-                "temperature",
-                int.class
-        );
-        assertNotNull(primitive);
-        assertNotNull(fridgeType.getDeclaredSingularAttribute("temperature"));
-        assertNotNull(fridgeType.getDeclaredAttribute("temperature"));
-        final SingularAttribute id = fridgeType.getDeclaredId(Long.class);
-        assertNotNull(id);
-        assertTrue(id.isId());
-        try {
-            fridgeType.getDeclaredId(java.util.Date.class);
-            fail("expecting failure");
-        } catch (IllegalArgumentException ignore) {
-            // expected result
-        }
-        final SingularAttribute id2 = fridgeType.getId(Long.class);
-        assertNotNull(id2);
-
-        assertEquals("Fridge", fridgeType.getName());
-        assertEquals(Long.class, fridgeType.getIdType().getJavaType());
-        assertTrue(fridgeType.hasSingleIdAttribute());
-        assertFalse(fridgeType.hasVersionAttribute());
-        assertEquals(Type.PersistenceType.ENTITY, fridgeType.getPersistenceType());
-
-        assertEquals(4, fridgeType.getDeclaredAttributes().size());
-
-        final EntityType houseType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
-        assertEquals("House", houseType.getName());
-        assertTrue(houseType.hasSingleIdAttribute());
-        final SingularAttribute houseId = houseType.getDeclaredId(House.Key.class);
-        assertNotNull(houseId);
-        assertTrue(houseId.isId());
-        assertEquals(Attribute.PersistentAttributeType.EMBEDDED, houseId.getPersistentAttributeType());
-
-        final EntityType personType = scope.getEntityManagerFactory().getMetamodel().entity(Person.class);
-        assertEquals("Homo", personType.getName());
-        assertFalse(personType.hasSingleIdAttribute());
-        final Set> ids = personType.getIdClassAttributes();
-        assertNotNull(ids);
-        assertEquals(2, ids.size());
-        for (SingularAttribute localId : ids) {
-            assertTrue(localId.isId());
-            assertSame(personType, localId.getDeclaringType());
-            assertSame(localId, personType.getDeclaredAttribute(localId.getName()));
-            assertSame(localId, personType.getDeclaredSingularAttribute(localId.getName()));
-            assertSame(localId, personType.getAttribute(localId.getName()));
-            assertSame(localId, personType.getSingularAttribute(localId.getName()));
-            assertTrue(personType.getAttributes().contains(localId));
-        }
-
-        final EntityType giantType = scope.getEntityManagerFactory().getMetamodel().entity(Giant.class);
-        assertEquals("HomoGigantus", giantType.getName());
-        assertFalse(giantType.hasSingleIdAttribute());
-        final Set> giantIds = giantType.getIdClassAttributes();
-        assertNotNull(giantIds);
-        assertEquals(2, giantIds.size());
-        assertEquals(personType.getIdClassAttributes(), giantIds);
-        for (SingularAttribute localGiantId : giantIds) {
-            assertTrue(localGiantId.isId());
-            try {
-                giantType.getDeclaredAttribute(localGiantId.getName());
-                fail(localGiantId.getName() + " is a declared attribute, but shouldn't be");
-            } catch (IllegalArgumentException ex) {
-                // expected
-            }
-            try {
-                giantType.getDeclaredSingularAttribute(localGiantId.getName());
-                fail(localGiantId.getName() + " is a declared singular attribute, but shouldn't be");
-            } catch (IllegalArgumentException ex) {
-                // expected
-            }
-            assertSame(localGiantId, giantType.getAttribute(localGiantId.getName()));
-            assertTrue(giantType.getAttributes().contains(localGiantId));
-        }
-
-        final EntityType foodType = scope.getEntityManagerFactory().getMetamodel().entity(FoodItem.class);
-        assertTrue(foodType.hasVersionAttribute());
-        final SingularAttribute version = foodType.getVersion(Long.class);
-        assertNotNull(version);
-        assertTrue(version.isVersion());
-        assertEquals(3, foodType.getDeclaredAttributes().size());
-
-    }
-
-    @Test
-    public void testBasic(EntityManagerFactoryScope scope) {
-        final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class);
-        final SingularAttribute singularAttribute = entityType.getDeclaredSingularAttribute(
-                "temperature",
-                Integer.class
-        );
+	@Test
+	public void testBaseOfService(EntityManagerFactoryScope scope) {
+		EntityManagerFactory emf = scope.getEntityManagerFactory();
+		assertNotNull(emf.getMetamodel());
+		final EntityType entityType = emf.getMetamodel().entity(Fridge.class);
+		assertNotNull(entityType);
+
+	}
+
+	@Test
+	public void testInvalidAttributeCausesIllegalArgumentException(EntityManagerFactoryScope scope) {
+		// should not matter the exact subclass of ManagedType since this is implemented on the base class but
+		// check each anyway..
+
+		// entity
+		checkNonExistentAttributeAccess(scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class));
+
+		// embeddable
+		checkNonExistentAttributeAccess(scope.getEntityManagerFactory().getMetamodel().embeddable(Address.class));
+	}
+
+	private void checkNonExistentAttributeAccess(ManagedType managedType) {
+		final String NAME = "NO_SUCH_ATTRIBUTE";
+		try {
+			managedType.getAttribute(NAME);
+			fail("Lookup of non-existent attribute (getAttribute) should have caused IAE : " + managedType);
+		} catch (IllegalArgumentException expected) {
+		}
+		try {
+			managedType.getSingularAttribute(NAME);
+			fail("Lookup of non-existent attribute (getSingularAttribute) should have caused IAE : " + managedType);
+		} catch (IllegalArgumentException expected) {
+		}
+		try {
+			managedType.getCollection(NAME);
+			fail("Lookup of non-existent attribute (getCollection) should have caused IAE : " + managedType);
+		} catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	public void testBuildingMetamodelWithParameterizedCollection() {
+		Metadata metadata = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
+				.addAnnotatedClass(WithGenericCollection.class)
+				.buildMetadata();
+		SessionFactoryImplementor sfi = (SessionFactoryImplementor) metadata.buildSessionFactory();
+		sfi.close();
+	}
+
+	@Test
+	public void testLogicalManyToOne(EntityManagerFactoryScope scope) {
+		final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(
+				JoinedManyToOneOwner.class);
+		final SingularAttribute attr = entityType.getDeclaredSingularAttribute("house");
+		assertEquals(Attribute.PersistentAttributeType.MANY_TO_ONE, attr.getPersistentAttributeType());
+		assertEquals(House.class, attr.getBindableJavaType());
+		final EntityType houseType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
+		assertEquals(houseType.getBindableJavaType(), attr.getBindableJavaType());
+		assertFalse(entityType.getDeclaredSingularAttribute("house2").isOptional());
+	}
+
+	@Test
+	public void testEntity(EntityManagerFactoryScope scope) {
+		final EntityType fridgeType = scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class);
+		assertEquals(Fridge.class, fridgeType.getBindableJavaType());
+		assertEquals(Bindable.BindableType.ENTITY_TYPE, fridgeType.getBindableType());
+		SingularAttribute wrapped = fridgeType.getDeclaredSingularAttribute(
+				"temperature",
+				Integer.class
+		);
+		assertNotNull(wrapped);
+		SingularAttribute primitive = fridgeType.getDeclaredSingularAttribute(
+				"temperature",
+				int.class
+		);
+		assertNotNull(primitive);
+		assertNotNull(fridgeType.getDeclaredSingularAttribute("temperature"));
+		assertNotNull(fridgeType.getDeclaredAttribute("temperature"));
+		final SingularAttribute id = fridgeType.getDeclaredId(Long.class);
+		assertNotNull(id);
+		assertTrue(id.isId());
+		try {
+			fridgeType.getDeclaredId(java.util.Date.class);
+			fail("expecting failure");
+		} catch (IllegalArgumentException ignore) {
+			// expected result
+		}
+		final SingularAttribute id2 = fridgeType.getId(Long.class);
+		assertNotNull(id2);
+
+		assertEquals("Fridge", fridgeType.getName());
+		assertEquals(Long.class, fridgeType.getIdType().getJavaType());
+		assertTrue(fridgeType.hasSingleIdAttribute());
+		assertFalse(fridgeType.hasVersionAttribute());
+		assertEquals(Type.PersistenceType.ENTITY, fridgeType.getPersistenceType());
+
+		assertEquals(4, fridgeType.getDeclaredAttributes().size());
+
+		final EntityType houseType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
+		assertEquals("House", houseType.getName());
+		assertTrue(houseType.hasSingleIdAttribute());
+		final SingularAttribute houseId = houseType.getDeclaredId(House.Key.class);
+		assertNotNull(houseId);
+		assertTrue(houseId.isId());
+		assertEquals(Attribute.PersistentAttributeType.EMBEDDED, houseId.getPersistentAttributeType());
+
+		final EntityType personType = scope.getEntityManagerFactory().getMetamodel().entity(Person.class);
+		assertEquals("Homo", personType.getName());
+		assertFalse(personType.hasSingleIdAttribute());
+		final Set> ids = personType.getIdClassAttributes();
+		assertNotNull(ids);
+		assertEquals(2, ids.size());
+		for (SingularAttribute localId : ids) {
+			assertTrue(localId.isId());
+			assertSame(personType, localId.getDeclaringType());
+			assertSame(localId, personType.getDeclaredAttribute(localId.getName()));
+			assertSame(localId, personType.getDeclaredSingularAttribute(localId.getName()));
+			assertSame(localId, personType.getAttribute(localId.getName()));
+			assertSame(localId, personType.getSingularAttribute(localId.getName()));
+			assertTrue(personType.getAttributes().contains(localId));
+		}
+
+		final EntityType giantType = scope.getEntityManagerFactory().getMetamodel().entity(Giant.class);
+		assertEquals("HomoGigantus", giantType.getName());
+		assertFalse(giantType.hasSingleIdAttribute());
+		final Set> giantIds = giantType.getIdClassAttributes();
+		assertNotNull(giantIds);
+		assertEquals(2, giantIds.size());
+		assertEquals(personType.getIdClassAttributes(), giantIds);
+		for (SingularAttribute localGiantId : giantIds) {
+			assertTrue(localGiantId.isId());
+			try {
+				giantType.getDeclaredAttribute(localGiantId.getName());
+				fail(localGiantId.getName() + " is a declared attribute, but shouldn't be");
+			} catch (IllegalArgumentException ex) {
+				// expected
+			}
+			try {
+				giantType.getDeclaredSingularAttribute(localGiantId.getName());
+				fail(localGiantId.getName() + " is a declared singular attribute, but shouldn't be");
+			} catch (IllegalArgumentException ex) {
+				// expected
+			}
+			assertSame(localGiantId, giantType.getAttribute(localGiantId.getName()));
+			assertTrue(giantType.getAttributes().contains(localGiantId));
+		}
+
+		final EntityType foodType = scope.getEntityManagerFactory().getMetamodel().entity(FoodItem.class);
+		assertTrue(foodType.hasVersionAttribute());
+		final SingularAttribute version = foodType.getVersion(Long.class);
+		assertNotNull(version);
+		assertTrue(version.isVersion());
+		assertEquals(3, foodType.getDeclaredAttributes().size());
+
+	}
+
+	@Test
+	public void testBasic(EntityManagerFactoryScope scope) {
+		final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(Fridge.class);
+		final SingularAttribute singularAttribute = entityType.getDeclaredSingularAttribute(
+				"temperature",
+				Integer.class
+		);
 		assertEquals( int.class, singularAttribute.getBindableJavaType() );
 		assertEquals( int.class, singularAttribute.getType().getJavaType() );
-        assertEquals(Bindable.BindableType.SINGULAR_ATTRIBUTE, singularAttribute.getBindableType());
-        assertFalse(singularAttribute.isId());
-        assertFalse(singularAttribute.isOptional());
-        assertFalse(entityType.getDeclaredSingularAttribute("brand", String.class).isOptional());
-        assertFalse(entityType.getDeclaredSingularAttribute("height", Integer.class).isOptional());
-        assertEquals(Type.PersistenceType.BASIC, singularAttribute.getType().getPersistenceType());
-        final Attribute attribute = entityType.getDeclaredAttribute("temperature");
-        assertNotNull(attribute);
-        assertEquals("temperature", attribute.getName());
-        assertEquals(Fridge.class, attribute.getDeclaringType().getJavaType());
-        assertEquals(Attribute.PersistentAttributeType.BASIC, attribute.getPersistentAttributeType());
+		assertEquals(Bindable.BindableType.SINGULAR_ATTRIBUTE, singularAttribute.getBindableType());
+		assertFalse(singularAttribute.isId());
+		assertFalse(singularAttribute.isOptional());
+		assertFalse(entityType.getDeclaredSingularAttribute("brand", String.class).isOptional());
+		assertFalse(entityType.getDeclaredSingularAttribute("height", Integer.class).isOptional());
+		assertEquals(Type.PersistenceType.BASIC, singularAttribute.getType().getPersistenceType());
+		final Attribute attribute = entityType.getDeclaredAttribute("temperature");
+		assertNotNull(attribute);
+		assertEquals("temperature", attribute.getName());
+		assertEquals(Fridge.class, attribute.getDeclaringType().getJavaType());
+		assertEquals(Attribute.PersistentAttributeType.BASIC, attribute.getPersistentAttributeType());
 		assertEquals( int.class, attribute.getJavaType() );
-        assertFalse(attribute.isAssociation());
-        assertFalse(attribute.isCollection());
-
-        boolean found = false;
-        for (Attribute attr : entityType.getDeclaredAttributes()) {
-            if ("temperature".equals(attr.getName())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testEmbeddable(EntityManagerFactoryScope scope) {
-        final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
-        final SingularAttribute address = entityType.getDeclaredSingularAttribute(
-                "address",
-                Address.class
-        );
-        assertNotNull(address);
-        assertEquals(Attribute.PersistentAttributeType.EMBEDDED, address.getPersistentAttributeType());
-        assertFalse(address.isCollection());
-        assertFalse(address.isAssociation());
-        final EmbeddableType
     addressType = (EmbeddableType
    ) address.getType();
-        assertEquals(Type.PersistenceType.EMBEDDABLE, addressType.getPersistenceType());
-        assertEquals(3, addressType.getDeclaredAttributes().size());
-        assertTrue(addressType.getDeclaredSingularAttribute("address1").isOptional());
-        assertFalse(addressType.getDeclaredSingularAttribute("address2").isOptional());
-
-        final EmbeddableType
     directType = scope.getEntityManagerFactory()
-                .getMetamodel()
-                .embeddable(Address.class);
-        assertNotNull(directType);
-        assertEquals(Type.PersistenceType.EMBEDDABLE, directType.getPersistenceType());
-    }
-
-    @Test
-    public void testCollection(EntityManagerFactoryScope scope) {
-        final EntityType entiytype = scope.getEntityManagerFactory().getMetamodel().entity(Garden.class);
-        final Set> attributes = entiytype.getPluralAttributes();
-        assertEquals(1, attributes.size());
-        PluralAttribute flowers = attributes.iterator().next();
-        assertTrue(flowers instanceof ListAttribute);
-    }
-
-    @Test
-    @JiraKey(value = "HHH-14346")
-    public void testEmptyPluralAttributeSet(EntityManagerFactoryScope scope) {
-        final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(Feline.class);
-        final Set> attributes = entityType.getPluralAttributes();
-        assertEquals(0, attributes.size());
-    }
-
-    @Test
-    public void testElementCollection(EntityManagerFactoryScope scope) {
-        final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
-        final SetAttribute rooms = entityType.getDeclaredSet("rooms", Room.class);
-        assertNotNull(rooms);
-        assertFalse(rooms.isAssociation());
-        assertTrue(rooms.isCollection());
-        assertEquals(Attribute.PersistentAttributeType.ELEMENT_COLLECTION, rooms.getPersistentAttributeType());
-        assertEquals(Room.class, rooms.getBindableJavaType());
-        assertEquals(Bindable.BindableType.PLURAL_ATTRIBUTE, rooms.getBindableType());
-        assertEquals(Set.class, rooms.getJavaType());
-        assertEquals(PluralAttribute.CollectionType.SET, rooms.getCollectionType());
-        assertEquals(3, entityType.getDeclaredPluralAttributes().size());
-        assertEquals(Type.PersistenceType.EMBEDDABLE, rooms.getElementType().getPersistenceType());
-
-        final MapAttribute roomsByName = entityType.getDeclaredMap(
-                "roomsByName", String.class, Room.class
-        );
-        assertNotNull(roomsByName);
-        assertEquals(String.class, roomsByName.getKeyJavaType());
-        assertEquals(Type.PersistenceType.BASIC, roomsByName.getKeyType().getPersistenceType());
-        assertEquals(PluralAttribute.CollectionType.MAP, roomsByName.getCollectionType());
-
-        final ListAttribute roomsBySize = entityType.getDeclaredList("roomsBySize", Room.class);
-        assertNotNull(roomsBySize);
-        assertEquals(Type.PersistenceType.EMBEDDABLE, roomsBySize.getElementType().getPersistenceType());
-        assertEquals(PluralAttribute.CollectionType.LIST, roomsBySize.getCollectionType());
-    }
-
-    @Test
-    public void testHierarchy(EntityManagerFactoryScope scope) {
-        final EntityType cat = scope.getEntityManagerFactory().getMetamodel().entity(Cat.class);
-        assertNotNull(cat);
-        assertEquals(7, cat.getAttributes().size());
-        assertEquals(1, cat.getDeclaredAttributes().size());
-        ensureProperMember(cat.getDeclaredAttributes());
-
-        assertTrue(cat.hasVersionAttribute());
-        assertEquals("version", cat.getVersion(Long.class).getName());
-        verifyDeclaredVersionNotPresent(cat);
-        verifyDeclaredIdNotPresentAndIdPresent(cat);
-
-        assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, cat.getSupertype().getPersistenceType());
-        MappedSuperclassType cattish = (MappedSuperclassType) cat.getSupertype();
-        assertEquals(6, cattish.getAttributes().size());
-        assertEquals(1, cattish.getDeclaredAttributes().size());
-        ensureProperMember(cattish.getDeclaredAttributes());
-
-        assertTrue(cattish.hasVersionAttribute());
-        assertEquals("version", cattish.getVersion(Long.class).getName());
-        verifyDeclaredVersionNotPresent(cattish);
-        verifyDeclaredIdNotPresentAndIdPresent(cattish);
-
-        assertEquals(Type.PersistenceType.ENTITY, cattish.getSupertype().getPersistenceType());
-        EntityType feline = (EntityType) cattish.getSupertype();
-        assertEquals(5, feline.getAttributes().size());
-        assertEquals(1, feline.getDeclaredAttributes().size());
-        ensureProperMember(feline.getDeclaredAttributes());
-
-        assertTrue(feline.hasVersionAttribute());
-        assertEquals("version", feline.getVersion(Long.class).getName());
-        verifyDeclaredVersionNotPresent(feline);
-        verifyDeclaredIdNotPresentAndIdPresent(feline);
-
-        assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, feline.getSupertype().getPersistenceType());
-        MappedSuperclassType animal = (MappedSuperclassType) feline.getSupertype();
-        assertEquals(4, animal.getAttributes().size());
-        assertEquals(2, animal.getDeclaredAttributes().size());
-        ensureProperMember(animal.getDeclaredAttributes());
-
-        assertTrue(animal.hasVersionAttribute());
-        assertEquals("version", animal.getVersion(Long.class).getName());
-        verifyDeclaredVersionNotPresent(animal);
-        assertEquals("id", animal.getId(Long.class).getName());
-        final SingularAttribute id = animal.getDeclaredId(Long.class);
-        assertEquals("id", id.getName());
-        assertNotNull(id.getJavaMember());
-
-        assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, animal.getSupertype().getPersistenceType());
-        MappedSuperclassType thing = (MappedSuperclassType) animal.getSupertype();
-        assertEquals(2, thing.getAttributes().size());
-        assertEquals(2, thing.getDeclaredAttributes().size());
-        ensureProperMember(thing.getDeclaredAttributes());
-        final SingularAttribute weight = thing.getDeclaredSingularAttribute("weight", Double.class);
-        assertEquals(Double.class, weight.getJavaType());
-
-        assertEquals("version", thing.getVersion(Long.class).getName());
-        final SingularAttribute version = thing.getDeclaredVersion(Long.class);
-        assertEquals("version", version.getName());
-        assertNotNull(version.getJavaMember());
-        assertNull(thing.getId(Long.class));
-
-        assertNull(thing.getSupertype());
-    }
-
-    @Test
-    public void testBackrefAndGenerics(EntityManagerFactoryScope scope) {
-        final EntityType parent = scope.getEntityManagerFactory().getMetamodel().entity(Parent.class);
-        assertNotNull(parent);
-        final SetAttribute children = parent.getSet("children");
-        assertNotNull(children);
-        assertEquals(1, parent.getPluralAttributes().size());
-        assertEquals(4, parent.getAttributes().size());
-        final EntityType child = scope.getEntityManagerFactory().getMetamodel().entity(Child.class);
-        assertNotNull(child);
-        assertEquals(2, child.getAttributes().size());
-        final SingularAttribute attribute = parent.getSingularAttribute(
-                "siblings", Parent.Relatives.class
-        );
-        final EmbeddableType siblings = (EmbeddableType) attribute.getType();
-        assertNotNull(siblings);
-        final SetAttribute siblingsCollection = siblings.getSet("siblings");
-        assertNotNull(siblingsCollection);
-        final Type collectionElement = siblingsCollection.getElementType();
-        assertNotNull(collectionElement);
-        assertEquals(collectionElement, child);
-    }
-
-    @Test
-    @Jira("https://hibernate.atlassian.net/browse/HHH-17465")
-    public void testInheritedVersion(EntityManagerFactoryScope scope) {
-        EntityManagerFactory emf = scope.getEntityManagerFactory();
-        assertNotNull(emf.getMetamodel());
-        final EntityType entityType = emf.getMetamodel().entity(Cat.class);
-        assertTrue(entityType.hasVersionAttribute());
-        assertTrue(entityType.getSingularAttribute("version").isVersion());
-
-    }
-
-    private void ensureProperMember(Set attributes) {
-        //we do not update the set so we are safe
-        @SuppressWarnings("unchecked") final Set> safeAttributes = (Set>) attributes;
-        for (Attribute attribute : safeAttributes) {
-            final String name = attribute.getJavaMember().getName();
-            assertNotNull(attribute.getJavaMember());
-            assertTrue(name.toLowerCase(Locale.ROOT).endsWith(attribute.getName().toLowerCase(Locale.ROOT)));
-        }
-    }
-
-    private void verifyDeclaredIdNotPresentAndIdPresent(IdentifiableType type) {
-        assertEquals("id", type.getId(Long.class).getName());
-        try {
-            type.getDeclaredId(Long.class);
-            fail("Should not have a declared id");
-        } catch (IllegalArgumentException e) {
-            //success
-        }
-    }
-
-    private void verifyDeclaredVersionNotPresent(IdentifiableType type) {
-        try {
-            type.getDeclaredVersion(Long.class);
-            fail("Should not have a declared version");
-        } catch (IllegalArgumentException e) {
-            //success
-        }
-    }
+		assertFalse(attribute.isAssociation());
+		assertFalse(attribute.isCollection());
+
+		boolean found = false;
+		for (Attribute attr : entityType.getDeclaredAttributes()) {
+			if ("temperature".equals(attr.getName())) {
+				found = true;
+				break;
+			}
+		}
+		assertTrue(found);
+	}
+
+	@Test
+	public void testEmbeddable(EntityManagerFactoryScope scope) {
+		final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
+		final SingularAttribute address = entityType.getDeclaredSingularAttribute(
+				"address",
+				Address.class
+		);
+		assertNotNull(address);
+		assertEquals(Attribute.PersistentAttributeType.EMBEDDED, address.getPersistentAttributeType());
+		assertFalse(address.isCollection());
+		assertFalse(address.isAssociation());
+		final EmbeddableType
     addressType = (EmbeddableType
    ) address.getType();
+		assertEquals(Type.PersistenceType.EMBEDDABLE, addressType.getPersistenceType());
+		assertEquals(3, addressType.getDeclaredAttributes().size());
+		assertTrue(addressType.getDeclaredSingularAttribute("address1").isOptional());
+		assertFalse(addressType.getDeclaredSingularAttribute("address2").isOptional());
+
+		final EmbeddableType
     directType = scope.getEntityManagerFactory()
+				.getMetamodel()
+				.embeddable(Address.class);
+		assertNotNull(directType);
+		assertEquals(Type.PersistenceType.EMBEDDABLE, directType.getPersistenceType());
+	}
+
+	@Test
+	public void testCollection(EntityManagerFactoryScope scope) {
+		final EntityType entiytype = scope.getEntityManagerFactory().getMetamodel().entity(Garden.class);
+		final Set> attributes = entiytype.getPluralAttributes();
+		assertEquals(1, attributes.size());
+		PluralAttribute flowers = attributes.iterator().next();
+		assertTrue(flowers instanceof ListAttribute);
+	}
+
+	@Test
+	@JiraKey(value = "HHH-14346")
+	public void testEmptyPluralAttributeSet(EntityManagerFactoryScope scope) {
+		final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(Feline.class);
+		final Set> attributes = entityType.getPluralAttributes();
+		assertEquals(0, attributes.size());
+	}
+
+	@Test
+	public void testElementCollection(EntityManagerFactoryScope scope) {
+		final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(House.class);
+		final SetAttribute rooms = entityType.getDeclaredSet("rooms", Room.class);
+		assertNotNull(rooms);
+		assertFalse(rooms.isAssociation());
+		assertTrue(rooms.isCollection());
+		assertEquals(Attribute.PersistentAttributeType.ELEMENT_COLLECTION, rooms.getPersistentAttributeType());
+		assertEquals(Room.class, rooms.getBindableJavaType());
+		assertEquals(Bindable.BindableType.PLURAL_ATTRIBUTE, rooms.getBindableType());
+		assertEquals(Set.class, rooms.getJavaType());
+		assertEquals(PluralAttribute.CollectionType.SET, rooms.getCollectionType());
+		assertEquals(3, entityType.getDeclaredPluralAttributes().size());
+		assertEquals(Type.PersistenceType.EMBEDDABLE, rooms.getElementType().getPersistenceType());
+
+		final MapAttribute roomsByName = entityType.getDeclaredMap(
+				"roomsByName", String.class, Room.class
+		);
+		assertNotNull(roomsByName);
+		assertEquals(String.class, roomsByName.getKeyJavaType());
+		assertEquals(Type.PersistenceType.BASIC, roomsByName.getKeyType().getPersistenceType());
+		assertEquals(PluralAttribute.CollectionType.MAP, roomsByName.getCollectionType());
+
+		final ListAttribute roomsBySize = entityType.getDeclaredList("roomsBySize", Room.class);
+		assertNotNull(roomsBySize);
+		assertEquals(Type.PersistenceType.EMBEDDABLE, roomsBySize.getElementType().getPersistenceType());
+		assertEquals(PluralAttribute.CollectionType.LIST, roomsBySize.getCollectionType());
+	}
+
+	@Test
+	public void testHierarchy(EntityManagerFactoryScope scope) {
+		final EntityType cat = scope.getEntityManagerFactory().getMetamodel().entity(Cat.class);
+		assertNotNull(cat);
+		assertEquals(7, cat.getAttributes().size());
+		assertEquals(1, cat.getDeclaredAttributes().size());
+		ensureProperMember(cat.getDeclaredAttributes());
+
+		assertTrue(cat.hasVersionAttribute());
+		assertEquals("version", cat.getVersion(Long.class).getName());
+		verifyDeclaredVersionNotPresent(cat);
+		verifyDeclaredIdNotPresentAndIdPresent(cat);
+
+		assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, cat.getSupertype().getPersistenceType());
+		MappedSuperclassType cattish = (MappedSuperclassType) cat.getSupertype();
+		assertEquals(6, cattish.getAttributes().size());
+		assertEquals(1, cattish.getDeclaredAttributes().size());
+		ensureProperMember(cattish.getDeclaredAttributes());
+
+		assertTrue(cattish.hasVersionAttribute());
+		assertEquals("version", cattish.getVersion(Long.class).getName());
+		verifyDeclaredVersionNotPresent(cattish);
+		verifyDeclaredIdNotPresentAndIdPresent(cattish);
+
+		assertEquals(Type.PersistenceType.ENTITY, cattish.getSupertype().getPersistenceType());
+		EntityType feline = (EntityType) cattish.getSupertype();
+		assertEquals(5, feline.getAttributes().size());
+		assertEquals(1, feline.getDeclaredAttributes().size());
+		ensureProperMember(feline.getDeclaredAttributes());
+
+		assertTrue(feline.hasVersionAttribute());
+		assertEquals("version", feline.getVersion(Long.class).getName());
+		verifyDeclaredVersionNotPresent(feline);
+		verifyDeclaredIdNotPresentAndIdPresent(feline);
+
+		assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, feline.getSupertype().getPersistenceType());
+		MappedSuperclassType animal = (MappedSuperclassType) feline.getSupertype();
+		assertEquals(4, animal.getAttributes().size());
+		assertEquals(2, animal.getDeclaredAttributes().size());
+		ensureProperMember(animal.getDeclaredAttributes());
+
+		assertTrue(animal.hasVersionAttribute());
+		assertEquals("version", animal.getVersion(Long.class).getName());
+		verifyDeclaredVersionNotPresent(animal);
+		assertEquals("id", animal.getId(Long.class).getName());
+		final SingularAttribute id = animal.getDeclaredId(Long.class);
+		assertEquals("id", id.getName());
+		assertNotNull(id.getJavaMember());
+
+		assertEquals(Type.PersistenceType.MAPPED_SUPERCLASS, animal.getSupertype().getPersistenceType());
+		MappedSuperclassType thing = (MappedSuperclassType) animal.getSupertype();
+		assertEquals(2, thing.getAttributes().size());
+		assertEquals(2, thing.getDeclaredAttributes().size());
+		ensureProperMember(thing.getDeclaredAttributes());
+		final SingularAttribute weight = thing.getDeclaredSingularAttribute("weight", Double.class);
+		assertEquals(Double.class, weight.getJavaType());
+
+		assertEquals("version", thing.getVersion(Long.class).getName());
+		final SingularAttribute version = thing.getDeclaredVersion(Long.class);
+		assertEquals("version", version.getName());
+		assertNotNull(version.getJavaMember());
+		assertNull(thing.getId(Long.class));
+
+		assertNull(thing.getSupertype());
+	}
+
+	@Test
+	public void testBackrefAndGenerics(EntityManagerFactoryScope scope) {
+		final EntityType parent = scope.getEntityManagerFactory().getMetamodel().entity(Parent.class);
+		assertNotNull(parent);
+		final SetAttribute children = parent.getSet("children");
+		assertNotNull(children);
+		assertEquals(1, parent.getPluralAttributes().size());
+		assertEquals(4, parent.getAttributes().size());
+		final EntityType child = scope.getEntityManagerFactory().getMetamodel().entity(Child.class);
+		assertNotNull(child);
+		assertEquals(2, child.getAttributes().size());
+		final SingularAttribute attribute = parent.getSingularAttribute(
+				"siblings", Parent.Relatives.class
+		);
+		final EmbeddableType siblings = (EmbeddableType) attribute.getType();
+		assertNotNull(siblings);
+		final SetAttribute siblingsCollection = siblings.getSet("siblings");
+		assertNotNull(siblingsCollection);
+		final Type collectionElement = siblingsCollection.getElementType();
+		assertNotNull(collectionElement);
+		assertEquals(collectionElement, child);
+	}
+
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-17465")
+	public void testInheritedVersion(EntityManagerFactoryScope scope) {
+		EntityManagerFactory emf = scope.getEntityManagerFactory();
+		assertNotNull(emf.getMetamodel());
+		final EntityType entityType = emf.getMetamodel().entity(Cat.class);
+		assertTrue(entityType.hasVersionAttribute());
+		assertTrue(entityType.getSingularAttribute("version").isVersion());
+
+	}
+
+	private void ensureProperMember(Set attributes) {
+		//we do not update the set so we are safe
+		@SuppressWarnings("unchecked") final Set> safeAttributes = (Set>) attributes;
+		for (Attribute attribute : safeAttributes) {
+			final String name = attribute.getJavaMember().getName();
+			assertNotNull(attribute.getJavaMember());
+			assertTrue(name.toLowerCase(Locale.ROOT).endsWith(attribute.getName().toLowerCase(Locale.ROOT)));
+		}
+	}
+
+	private void verifyDeclaredIdNotPresentAndIdPresent(IdentifiableType type) {
+		assertEquals("id", type.getId(Long.class).getName());
+		try {
+			type.getDeclaredId(Long.class);
+			fail("Should not have a declared id");
+		} catch (IllegalArgumentException e) {
+			//success
+		}
+	}
+
+	private void verifyDeclaredVersionNotPresent(IdentifiableType type) {
+		try {
+			type.getDeclaredVersion(Long.class);
+			fail("Should not have a declared version");
+		} catch (IllegalArgumentException e) {
+			//success
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java
index 888492008658..904db8f38ee8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java
index e4ba1fbab843..850072556653 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java
index c53bfee65c43..d0f1fa4cd4fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java
index e0099cc04aa0..603c82212783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java
index e1926bb11c1b..134492d8f14e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java
index 6665665999b7..e30887dd4dba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java
index a8be5644cd8c..60c6b01983e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SubThing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SubThing.java
index 186d7af83b4b..2b4f7c5ab359 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SubThing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SubThing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java
index 37da7754764c..f65d62431385 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import jakarta.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java
index 06cc8868d311..872fef5cb20b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metadata;
 import java.util.ArrayList;
@@ -26,50 +24,50 @@
 @Entity
 @Table(name = "WITH_GENERIC_COLLECTION")
 public class WithGenericCollection implements java.io.Serializable {
-    @Id
-    @Column(name = "ID")
-    private String id;
+	@Id
+	@Column(name = "ID")
+	private String id;
 
-    @Basic(optional=false)
-    private double d;
+	@Basic(optional=false)
+	private double d;
 
-    @ManyToOne(optional=false)
-    @JoinColumn(name="PARENT_ID", insertable=false, updatable=false)
-    private WithGenericCollection parent = null;
+	@ManyToOne(optional=false)
+	@JoinColumn(name="PARENT_ID", insertable=false, updatable=false)
+	private WithGenericCollection parent = null;
 
-    @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name="PARENT_ID")
-    private List> children = new ArrayList>();
+	@OneToMany(cascade = CascadeType.ALL)
+	@JoinColumn(name="PARENT_ID")
+	private List> children = new ArrayList>();
 
-    public WithGenericCollection() {
-    }
+	public WithGenericCollection() {
+	}
 
-    //====================================================================
-    // getters and setters for State fields
+	//====================================================================
+	// getters and setters for State fields
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(String id) {
-        this.id = id;
-    }
+	public void setId(String id) {
+		this.id = id;
+	}
 
-    public void setD(double d) {
-        this.d = d;
-    }
+	public void setD(double d) {
+		this.d = d;
+	}
 
-    public double getD() {
-        return d;
-    }
+	public double getD() {
+		return d;
+	}
 
-    public List> getChildren() {
-        return children;
-    }
+	public List> getChildren() {
+		return children;
+	}
 
-    public void setChildren(List> children) {
-        this.children = children;
-    }
+	public void setChildren(List> children) {
+		this.children = children;
+	}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java
index 39f48e5be266..3bba37f79cc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java
index 4a35069a05ae..63502a977f44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java
index f4eb1981a510..086a551212af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java
index db6a49e417d9..258ccb4ecdb5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java
index c7b0c4ac4ec5..f053b2aa012d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java
index 6438af394283..2393cafba708 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java
index 7d2ed49b8321..01e94aa49f9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java
index 31deb64f14c7..89de98b7074c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java
index 3d955e78a7bb..c8a1a6bd46ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java
index 6527aa4fdecd..293e425cd6a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java
index 6b9ec75dcb9f..085e0088ebb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java
index 02d9a3be6b6e..519f30e5736c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java
index 2dbc8a28dc39..bd1901d45855 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java
index 4817b06e2a82..3cd156f4dbde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java
index df62402bc513..aca98ff5a38a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttributeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttributeId.java
index 39facc554543..5a92f103126f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttributeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttributeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java
index f163786add60..97762e3c2992 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java
index 27def8f7d7cf..4b08f51446df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java
index 9bb13262afbd..b9ad95317b14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java
index 80f4c6a3e44e..07a529c9311e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java
index 7305cdc4bb65..e06c6895a958 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractMetamodelSpecificTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractMetamodelSpecificTest.java
index 90b41b71424f..e067bfdcadf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractMetamodelSpecificTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractMetamodelSpecificTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Address.java
index 1fd0c4561737..52c18d73188b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Alias.java
index a876950d7826..6a81116a04a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Alias.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Article.java
index 1a86edbc113d..ab6b30cc2ae5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Article.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Article.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/BaseEmbeddedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/BaseEmbeddedEntity.java
index d34a0ca2516e..7efe3ad5cbc1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/BaseEmbeddedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/BaseEmbeddedEntity.java
@@ -1,9 +1,6 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
@@ -16,47 +13,47 @@
  */
 @MappedSuperclass
 public abstract class BaseEmbeddedEntity implements Serializable {
-    
-    private I id;
-
-    public BaseEmbeddedEntity() {
-    }
-
-    public BaseEmbeddedEntity(I id) {
-        this.id = id;
-    }
-
-    @EmbeddedId
-    public I getId() {
-        return id;
-    }
-
-    public void setId(I id) {
-        this.id = id;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 47 * hash + (this.id != null ? this.id.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final BaseEmbeddedEntity other = (BaseEmbeddedEntity) obj;
-        if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) {
-            return false;
-        }
-        return true;
-    }
+
+	private I id;
+
+	public BaseEmbeddedEntity() {
+	}
+
+	public BaseEmbeddedEntity(I id) {
+		this.id = id;
+	}
+
+	@EmbeddedId
+	public I getId() {
+		return id;
+	}
+
+	public void setId(I id) {
+		this.id = id;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 3;
+		hash = 47 * hash + (this.id != null ? this.id.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final BaseEmbeddedEntity other = (BaseEmbeddedEntity) obj;
+		if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Country.java
index 773a4de3d806..fdb1c0a23095 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import jakarta.persistence.Basic;
@@ -44,4 +42,3 @@ public void setCode(String v) {
 		code = v;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/CreditCard.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/CreditCard.java
index 88359952edb9..d02599d52e68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/CreditCard.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/CreditCard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Customer.java
index 2b738f60402c..4ca9ea8e7697 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
index f3a127588197..2571fc0d15cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity1.java
index 378c1a961165..b08bf6c01723 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity1.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity2.java
index 0093988668d1..54d881d5784e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity2.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity3.java
index d2bbe4de2bc0..0de6d9bcebc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Entity3.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java
index 2dd9035789a4..7dca3c013df2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java
index 5866ede09355..0c75a94221ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Info.java
index d0b5cf4e4fb2..25cd61fce258 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java
index 4a0cc116b2d8..3b1235f0bd3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java
index ac8cd2ec7830..d637811c7491 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
index af06f554c42b..c79c1939cc8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/LineItem.java
index 39c55c025aa1..5c4d855424cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/LineItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntity.java
index 8b9193a1efb5..e277cc763c0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
@@ -25,16 +23,16 @@ public class MapEntity {
 	@Id
 	@Column(name="key_")
 	private String key;
-	
+
 	@ElementCollection(fetch=FetchType.LAZY)
 	@CollectionTable(name="MAP_ENTITY_NAME", joinColumns=@JoinColumn(name="key_"))
 	@MapKeyColumn(name="lang_")
 	private Map localized;
-	
+
 	public String getKey() {
 		return key;
 	}
-	
+
 	public void setKey(String key) {
 		this.key = key;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntityLocal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntityLocal.java
index 35b01b42428c..2925bbecb883 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntityLocal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MapEntityLocal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
@@ -11,14 +9,14 @@
 
 @Embeddable
 public class MapEntityLocal {
-	
-	@Column(name="short_name") 
+
+	@Column(name="short_name")
 	private String shortName;
-	
+
 	public String getShortName() {
 		return shortName;
 	}
-	
+
 	public void setShortName(String shortName) {
 		this.shortName = shortName;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
index ffe3efd36791..69493cbff8d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.metamodel.ManagedType;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java
index f328ba12aea4..33393317f4aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java
index d31f236beae0..46a587dc1994 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Order.java
index db8698bd19b5..01cb138ac08e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java
index a61cac797086..9cede92a1cef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
@@ -14,31 +12,31 @@
 @Entity
 public class Person extends BaseEmbeddedEntity {
 
-    private String firstName;
-    private String lastName;
+	private String firstName;
+	private String lastName;
 
-    public Person() {
-    }
+	public Person() {
+	}
 
-    public Person(PersonId id, String firstName, String lastName) {
-        super(id);
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
+	public Person(PersonId id, String firstName, String lastName) {
+		super(id);
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
 
-    public String getFirstName() {
-        return firstName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java
index ca0a53c21967..33164e750c8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
@@ -15,59 +13,59 @@
 @Embeddable
 public class PersonId implements Serializable {
 
-    private String ssn;
-    private String name;
+	private String ssn;
+	private String name;
 
-    public PersonId() {
-    }
+	public PersonId() {
+	}
 
-    public PersonId(String ssn, String name) {
-        this.ssn = ssn;
-        this.name = name;
-    }
+	public PersonId(String ssn, String name) {
+		this.ssn = ssn;
+		this.name = name;
+	}
 
-    public String getSsn() {
-        return ssn;
-    }
+	public String getSsn() {
+		return ssn;
+	}
 
-    public void setSsn(String ssn) {
-        this.ssn = ssn;
-    }
+	public void setSsn(String ssn) {
+		this.ssn = ssn;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 67 * hash + (this.ssn != null ? this.ssn.hashCode() : 0);
-        hash = 67 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
+	@Override
+	public int hashCode() {
+		int hash = 7;
+		hash = 67 * hash + (this.ssn != null ? this.ssn.hashCode() : 0);
+		hash = 67 * hash + (this.name != null ? this.name.hashCode() : 0);
+		return hash;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonId other = (PersonId) obj;
-        if ((this.ssn == null) ? (other.ssn != null) : !this.ssn.equals(other.ssn)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final PersonId other = (PersonId) obj;
+		if ((this.ssn == null) ? (other.ssn != null) : !this.ssn.equals(other.ssn)) {
+			return false;
+		}
+		if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+			return false;
+		}
+		return true;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Phone.java
index 95df0ff14a6d..42d0d13bda01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Product.java
index 7b688466b3a7..48fe7fdc070e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ShelfLife.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ShelfLife.java
index 6376f052d32a..6c8bd09402e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ShelfLife.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ShelfLife.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import java.sql.Date;
@@ -11,8 +9,8 @@
 
 @Embeddable
 public class ShelfLife implements java.io.Serializable {
-    private Date inceptionDate;
-    private Date soldDate;
+	private Date inceptionDate;
+	private Date soldDate;
 
 	public ShelfLife() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java
index dda68dc38a4e..9db0ffe0b25b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java
index fb2b552f42f9..bf68cb601a94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Spouse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Spouse.java
index ac6365cdaab3..3afb92bbc0b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Spouse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Spouse.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Thing.java
index c0199bac27a2..66dc28f69c5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ThingWithQuantity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ThingWithQuantity.java
index 6f37687d0ee3..c18e56a90fb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ThingWithQuantity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/ThingWithQuantity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Translation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Translation.java
index 867c4a995cd9..98b164c2d366 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Translation.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Translation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/VersionedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/VersionedEntity.java
index b539145fedf1..20333b504489 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/VersionedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/VersionedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java
index 940f84e17a13..7fe311443028 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractWorkOrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractWorkOrderId.java
index 99fa8ec7e86b..43b2583e9ddc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractWorkOrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractWorkOrderId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
@@ -17,5 +15,5 @@
 public class AbstractWorkOrderId implements Serializable {
 	private String workOrder;
 	private Long plantId;
-    /* other stuffs */
+	/* other stuffs */
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java
index ecfffd409598..26f37411173c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
@@ -18,5 +16,3 @@
 public class EmbeddableEntity {
 	private String foo;
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java
index 262591fa5ccd..301dbf9a9190 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java
index d21527952554..9afa9501d541 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java
index e03ff5ac919a..fa0b8ebe05d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java
index 69c60ad494b9..b395c84ed0c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
@@ -20,5 +18,5 @@ public class WorkOrder implements Serializable {
 	@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "workOrder")
 	@OrderBy("operation, bomItemNumber")
 	private Set components;
-  /* other stuffs */
+/* other stuffs */
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java
index d5dc00a0f4c2..702af9ff6b97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java
index deda2213a839..f3af8c604950 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
@@ -14,5 +12,5 @@
 @Embeddable
 public class WorkOrderComponentId extends AbstractWorkOrderId {
 	private Long lineNumber;
-    /* other stuffs */
+	/* other stuffs */
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java
index a742f05bd00a..d958a38ffdac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.metamodel.attributeInSuper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/AbstractJPATest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/AbstractJPATest.java
index f4c29430670c..8bcc6ce37489 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/AbstractJPATest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/AbstractJPATest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.model;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Item.java
index 0283068cac19..a90563d2cbf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.model;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapContent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapContent.java
index 4c5db960acd2..1d88c20a2a87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapContent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapContent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.model;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapOwner.java
index 574b53860c35..e138d0c2bdd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MapOwner.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.model;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MyEntity.java
index 1f629503be93..419f360515b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.model;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MySubclassEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MySubclassEntity.java
index 63a3aecc4e4d..1a5a0026b70e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MySubclassEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/MySubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.model;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Part.java
index 1de51c3a115f..985318d670d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Part.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.model;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Relationship.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Relationship.java
index 1709995e6b5d..df9845cb71dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Relationship.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/model/Relationship.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.model;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ClassWithIdentityColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ClassWithIdentityColumn.java
index da29a1ca1e0e..e99d0400fd40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ClassWithIdentityColumn.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ClassWithIdentityColumn.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/Group.java
index ee50e300d7dc..cd258f2f9ca3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java
index de027c42ef7a..5ae02a44b6a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java
index 74f8b137ff68..8a2d527fc550 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java
index 3ecc6bb3b8b7..5af6d32e5c3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/User.java
index dea5d30fb024..477c3327837c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java
index d1f7908b748d..fc198e1b805c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java
index 3ec8c1328398..caf35a092ce8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employee.java
index 7356ce12ea4c..c1ae54e7dbb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employer.java
index a33439bc38ce..0aa6257f1d63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Employer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java
index fff71973e20a..1c387312feab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
index 18e92f8b0bfb..f22e69695f73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java
index 247b23ef25cd..a197a469ddb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java
index f30bca6f7c7b..ebb8dc4cb442 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java
index 496f4ed12a01..2f057c0f2a73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java
index ca09c0d84926..f89cfb8d85a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.ops;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeNewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeNewTest.java
index e3899aedeacf..ebf13359df29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeNewTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeNewTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java
index 017e0190a751..af849aebfd11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
@@ -126,4 +124,3 @@ private void assertUpdateCount(EntityManagerFactoryScope scope, int count) {
 		Assertions.assertEquals( count, updates );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java
index c7f8ab17380a..488e6b026ac8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java
index b8701cf81ff8..77e88da3e8aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
index 254dcc0123e0..1259c1ba5503 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.jpa.ops;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java
index 1bd1cd708dbc..d2278ab8e517 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java
index 61c5274ddda5..ab21d6a1ce39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java
index b43f3a363d6a..81028da8faf1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.ops;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java
index 7b5dea86d93e..6aeebb358938 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java
index b6609f676acb..0e6644c49ba6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
@@ -43,8 +41,8 @@
 public class DeleteSharedOneToManyOrphansTest {
 
 	/*
-	 A value of DEFAULT_BATCH_FETCH_SIZE > 1 along with the initialization of the Item#higherItemRelations
-	 collection causes the issue
+	A value of DEFAULT_BATCH_FETCH_SIZE > 1 along with the initialization of the Item#higherItemRelations
+	collection causes the issue
 	 */
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java
index 47eb18ca3bce..b004ab307ec8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java
index 2f60de11d58c..f3521e058d3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java
index 5bea66be8cbc..f43e4bf40ce7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java
index 3962ad491775..d7ffe4ff3e8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java
index 450c58f2ccb2..403cf6dd01fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java
index 6ac63e3fa26c..7336bcff4e52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java
index de9a2c43dbfe..8739eb7c2aaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
@@ -52,4 +50,3 @@ public void setProduct(Product product) {
 		this.product = product;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java
index 5a6ac59464ae..b6b4093bf7f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java
index 6db2ea9847ca..b0a2de012839 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java
index c2afe4055471..b179532ff3e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyOrphanRemovalBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyOrphanRemovalBatchTest.java
index 682c3c55e203..86c449257dc8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyOrphanRemovalBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyOrphanRemovalBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java
index 08408bea32c9..e2825ffc79ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java
index ea6216324c74..51e5aa480fed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java
index f31831cee581..3cd385dc465e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java
index 2a6dbcf751a2..c067714cba07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany;
 
@@ -49,4 +47,3 @@ public void setFeatures(List features) {
 		this.features = features;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/embedded/OneToManyInEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/embedded/OneToManyInEmbeddedTest.java
index 1f72da686268..dc9809f13729 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/embedded/OneToManyInEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/embedded/OneToManyInEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetomany.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java
index 45c24b346c25..89976f71160c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java
index 6555a824b949..230898c26680 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java
index 0963e89e02a8..376f859371d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java
index c2eeff24a71f..8063d90e1949 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java
index efae31922685..643ee88e1248 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java
index 9094b5b4bb10..b2a689b7a1f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java
index 121c23c1a6e9..ba5f49f77ab8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java
index aeadf7eb9999..bb6433e194d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java
index 810eb0083116..b8bf65e1acfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java
index 0b6ddd529cc3..b751892c7c28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
@@ -15,27 +13,27 @@
 
 @Entity
 public class Preisregelung {
-    @Id
+	@Id
 	@GeneratedValue
-    private Long id;
+	private Long id;
 
-    @OneToOne(mappedBy = "preisregelung", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
-    private Tranchenmodell tranchenmodell;
+	@OneToOne(mappedBy = "preisregelung", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
+	private Tranchenmodell tranchenmodell;
 
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java
index eb43e4f64e07..3d692983bbed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
@@ -17,31 +15,31 @@
 @Entity
 public class Tranche {
 
-    @Id
+	@Id
 	@GeneratedValue
 	private Long id;
 
-    @ManyToOne(optional = false, fetch = FetchType.EAGER)
-    private Tranchenmodell tranchenmodell;
+	@ManyToOne(optional = false, fetch = FetchType.EAGER)
+	private Tranchenmodell tranchenmodell;
 
 	@OneToOne(mappedBy = "tranche", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
 	private Y y;
 
 	public Long getId() {
-        return id;
-    }
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 
 	public Y getY() {
 		return y;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java
index bc5a5303fb76..8af14a4f2821 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
@@ -20,39 +18,39 @@
 @Entity
 public class Tranchenmodell {
 
-    @Id
+	@Id
 	@GeneratedValue
 	private Long id;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
 	@OrderColumn
-    private List tranchen = new ArrayList();
+	private List tranchen = new ArrayList();
 
-    @OneToOne(optional = true, fetch = FetchType.LAZY)
-    private Preisregelung preisregelung;
+	@OneToOne(optional = true, fetch = FetchType.LAZY)
+	private Preisregelung preisregelung;
 
 	@OneToOne(mappedBy = "tranchenmodell", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
 	private X x;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public List getTranchen() {
-        return tranchen;
-    }
+	public List getTranchen() {
+		return tranchen;
+	}
 
-    public Preisregelung getPreisregelung() {
-        return preisregelung;
-    }
+	public Preisregelung getPreisregelung() {
+		return preisregelung;
+	}
 
-    public void setPreisregelung(Preisregelung preisregelung) {
-        this.preisregelung = preisregelung;
-    }
+	public void setPreisregelung(Preisregelung preisregelung) {
+		this.preisregelung = preisregelung;
+	}
 
 	public X getX() {
 		return x;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java
index a4ed73674617..6196af448ebf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java
index 7663aa0d36dc..230f6d1215de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java
index 4416766c8836..c9e1eeb80b63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.cfgxmlpar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java
index 3e2e5f0e6415..a7eaed22b64e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java
index 2b0f09f7abd6..deba4c512c20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 import jakarta.persistence.PrePersist;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java
index 1ab48445f73d..ad1a0034d080 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java
index 00e26c50511b..c5a8dfcf291f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java
index e6a4f3918398..f94d2d08ac22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 import jakarta.persistence.ExcludeDefaultListeners;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java
index 3ca6656f75d2..144e884509c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java
index 8196476739ce..150509c8b989 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java
index ee4da9f9f013..085c56eb1ea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java
@@ -7,4 +7,3 @@
 @NamedQuery(name = "allMouse",
 			query = "select m from ApplicationServer m") package org.hibernate.orm.test.jpa.pack.defaultpar;
 import org.hibernate.annotations.NamedQuery;
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java
index 8a1f0d55aa50..7c3cf418f348 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java
index dfb5e8810099..5d17d9e7e659 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 import jakarta.persistence.PrePersist;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java
index 1c7be6c1ee99..485c469ce6a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 
 
@@ -15,4 +11,4 @@
 public class Lighter1 {
 	public String name;
 	public String power;
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java
index ce742d835f9c..1aa5ad0d95bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java
index e7bc7e9dcca1..8fa0b6f4334b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 import jakarta.persistence.ExcludeDefaultListeners;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java
index 24ac31518b5e..d18b510b736e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 
 
@@ -26,4 +22,4 @@ public static void reset() {
 	public void increment(Object entity) {
 		OtherIncrementListener1.increment++;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java
index b90a571f7142..9749962c352d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java
index b252b1297f91..17c2d5a1d745 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java
@@ -7,4 +7,4 @@
 @NamedQuery(name = "allMouse_1_0",
 			query = "select m from ApplicationServer1 m")
 package org.hibernate.orm.test.jpa.pack.defaultpar_1_0;
-import org.hibernate.annotations.NamedQuery;
\ No newline at end of file
+import org.hibernate.annotations.NamedQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java
index 9cb197cae601..8b87f97a7af6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.excludehbmpar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java
index e195080f2a53..2f1ef8fade50 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.explicitpar;
 import jakarta.persistence.Entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java
index 384c411abe99..09a8979fded8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.explodedpar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java
index 3646756f6ba4..ec7f65436d05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.explodedpar;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java
index 8c1a61f87f9f..f4882aa7a5b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java
@@ -5,4 +5,4 @@
  * See the lgpl.txt file in the root directory or .
  */
 @NamedQuery(name = "allCarpet", query = "select c from Carpet c") package org.hibernate.orm.test.jpa.pack.explodedpar;
-import org.hibernate.annotations.NamedQuery;
\ No newline at end of file
+import org.hibernate.annotations.NamedQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java
index 01021fb15467..807d79e39e77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.externaljar;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java
index 4a7a53b113c2..9b678a6bcac1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.overridenpar;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java
index fc55d08c38c5..05bdcf642238 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.spacepar;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java
index 5a44cb4119fc..bef0e3348ae5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.various;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java
index a9f493c876a3..e2271703b62b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.various;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java
index 16e192f42a89..47e6bbed7ff1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java
index c626fce596f9..e678f814b042 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 import jakarta.persistence.PrePersist;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java
index 348dd0767566..a1cf48de39ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java
index 89bf50770cff..fc72ef78f64d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java
index ba767b4644c4..a97ecdd7cee8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 import jakarta.persistence.ExcludeDefaultListeners;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java
index bb456838c66a..1974fef3c466 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java
index 9d204bd94ceb..1315d1454fd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.pack.war;
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java
index 148803e585fc..05959515760d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java
@@ -7,4 +7,4 @@
 @NamedQuery(name = "allMouse",
 			query = "select m from ApplicationServer m")
 package org.hibernate.orm.test.jpa.pack.war;
-import org.hibernate.annotations.NamedQuery;
\ No newline at end of file
+import org.hibernate.annotations.NamedQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java
index 16ad006d8e9a..5a94080d1ed5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
@@ -15,7 +13,7 @@
  */
 @Entity
 public class DataPoint {
-	
+
 	@Id
 	@GeneratedValue
 	private long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java
index 843e49eeb159..289a8fa728c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java
@@ -1,24 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
-import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java
index 3b6f33b3486f..61c348b1e29e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
@@ -10,17 +8,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.util.ConfigHelper;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
 import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -31,34 +21,34 @@
  * HHH-8364 discusses the use of  within Java SE environments.  It was intended for Java EE
  * only, but was probably supported in Java SE/Hibernate for user friendliness.  If we are going to supports its use
  * like that, the following should happen:
- * 
+ *
  * Omitted == do scan
  *  == don't scan
  * false == do scan
  * true == don't scan
- * 
+ *
  * This is true for both JPA 1 & 2.  The "false" default in the JPA 1.0 XSD was a bug.
- * 
+ *
  * Note that we're ignoring the XSD "true" default if the element is omitted.  Due to the negation semantics, I thought
  * it made more sense from a user standpoint.
- * 
+ *
  * @author Brett Meyer
  */
 @JiraKey(value = "HHH-8364")
 public class ExcludeUnlistedClassesTest extends BaseUnitTestCase {
-	
+
 	@Test
 	public void testExcludeUnlistedClasses() {
 		final Collection parsedDescriptors = PersistenceXmlParser.create()
 				.parse( List.of( findAsResource( "org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml" ) ) )
 				.values();
-		
+
 		doTest( parsedDescriptors, "ExcludeUnlistedClassesTest1", false );
 		doTest( parsedDescriptors, "ExcludeUnlistedClassesTest2", true );
 		doTest( parsedDescriptors, "ExcludeUnlistedClassesTest3", false );
 		doTest( parsedDescriptors, "ExcludeUnlistedClassesTest4", true );
 	}
-	
+
 	private void doTest(Collection parsedDescriptors,
 			final String persistenceUnitName, final boolean shouldExclude) {
 		for (final PersistenceUnitDescriptor descriptor : parsedDescriptors) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java
index 53dc25223166..4531c1b53149 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java
index f62a86172a30..00ec8bd6519a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java
index c948ac9e76a9..a9f607b4b15e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java
index abc9e6aaed4c..de1178700a32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.persistenceunit;
 
@@ -15,7 +13,7 @@
  */
 @Entity
 public class UnlistedDataPoint {
-	
+
 	@Id
 	@GeneratedValue
 	private long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AbstractStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AbstractStoredProcedureTest.java
index b1f774e78051..2309a0355e1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AbstractStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AbstractStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AnnotationTest.java
index 54ff23e2443d..03a6eba89a19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
index 6634475060d8..f5419111abe3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java
index 3c42ee79a40e..058686d32645 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
@@ -30,7 +28,6 @@
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/OrmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/OrmTest.java
index 63c8a9962456..9d429dade7ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/OrmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/OrmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java
index 4cc338817c52..88128c818f10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java
index 80b6c97737ab..1508c7c44358 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java
index 8edea7f18c1e..b983a7537c27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java
index 284479f8841e..3f8df5069f2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoredProcedureResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoredProcedureResultSetMappingTest.java
index 5eb587110682..46404a270e0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoredProcedureResultSetMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoredProcedureResultSetMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/User.java
index 246eca7d5900..f71ec09520b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java
index b55f1cef7112..302c38684e9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/DestinationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/DestinationEntity.java
index 11e83c7b35f8..03b7268dd094 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/DestinationEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/DestinationEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/FromEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/FromEntity.java
index 28f57a066a99..71a285006d8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/FromEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/FromEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/IdentificationVariablesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/IdentificationVariablesTest.java
index 5be1d773813e..5619250a2a08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/IdentificationVariablesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/IdentificationVariablesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java
index 267b4d488446..e5b9c69d5eea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JoinTableOptimizationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JoinTableOptimizationTest.java
index eb6b87b3abbf..d7747c893672 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JoinTableOptimizationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JoinTableOptimizationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java
index 4b3c99c57b4a..7d6a0811f9e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java
index a34107e294fd..921b39e36286 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryWithGenericsTest.java
index 63467427ba23..109f0095d3ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java
index 13d3e5cc6df8..3cbc75d6e75f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.ql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java
index 0235144bbc24..762982ee8434 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionNestedJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionNestedJoinFetchTest.java
index d0278288b70f..16d9ff1d46b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionNestedJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionNestedJoinFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionTest.java
index 1e934519d3e7..13dc54dc0338 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -39,7 +37,6 @@
 
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @JiraKey("HHH-15086")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowMultiselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowMultiselectTest.java
index b7489913242c..d5fcd84dd32b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowMultiselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowMultiselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -11,12 +9,10 @@
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.Hibernate;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -39,9 +35,7 @@
 
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @JiraKey("HHH-15086")
 @Jpa(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowPolymorphicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowPolymorphicTest.java
index a45ecf2b7ced..ecea4f574580 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowPolymorphicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowPolymorphicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowSharedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowSharedCollectionTest.java
index 948078a811c6..740baacce719 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowSharedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowSharedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowTest.java
index 6f909cc17426..b80d73a96517 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -36,7 +34,6 @@
 
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @JiraKey("HHH-15086")
 @Jpa(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithCollectionTest.java
index 38326e2f5e49..3454d51c3035 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithDiscriminatorPolymorphicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithDiscriminatorPolymorphicTest.java
index 9808617b5cb9..f236d9b21f4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithDiscriminatorPolymorphicTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithDiscriminatorPolymorphicTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchEagerTest.java
index ed558eff16ad..ddff0f694309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchEagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchLazyTest.java
index 143487bf85d8..127529b32338 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryShallowWithJoinFetchLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -37,7 +34,6 @@
 
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java
index bf9e8462be35..50ea9938fb67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
index 50b69f325f55..6e83308f0423 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java
index cc73d640ce5a..a79d5c288870 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CorrelatedPluralJoinInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CorrelatedPluralJoinInheritanceTest.java
index 727bd1974655..beb1c7c23cc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CorrelatedPluralJoinInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CorrelatedPluralJoinInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
index a92afcbb6b1c..b26bd7e0d7a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java
index e3a523d0039b..489a0b6d1744 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java
index 3f96468bbf8e..7340e691de80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java
index 86cf6a3d8937..c2f5add97644 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
index b64648caa034..edb92929dbcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import jakarta.persistence.ColumnResult;
@@ -9,7 +13,6 @@
 import jakarta.persistence.NamedNativeQuery;
 import jakarta.persistence.Table;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
index e7ef51d3331a..f16ad23a6922 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java
index ded24d9660f5..834b6b792d0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryQueryFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryQueryFlushModeTest.java
index a6e1644bd579..85369b34fdf3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryQueryFlushModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryQueryFlushModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java
index 6c172d59d507..2ea272f064e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -63,108 +61,108 @@ public void setUp()
 	@After
 	public void tearDown() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 entityManager.createQuery( "delete from Game" ).executeUpdate();
-				 }
+					entityManager.createQuery( "delete from Game" ).executeUpdate();
+				}
 		);
 	}
 
 	@Test
 	public void testNamedQueriesOrdinalParametersAreOneBased() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
 	@Test
 	public void testNamedQueryOrdinalParametersConflict() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-
-					 final Session session = entityManager.unwrap( Session.class );
-					 final org.hibernate.query.Query sessionQuery = session.createQuery( "select g from Game g where title = ?1" );
-					 sessionQuery.setParameter( 1, GAME_TITLES[0] );
-					 list = sessionQuery.getResultList();
-
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+
+					final Session session = entityManager.unwrap( Session.class );
+					final org.hibernate.query.Query sessionQuery = session.createQuery( "select g from Game g where title = ?1" );
+					sessionQuery.setParameter( 1, GAME_TITLES[0] );
+					list = sessionQuery.getResultList();
+
+					query.setParameter( 1, GAME_TITLES[0] );
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
 	@Test
 	public void testNamedQueryOrdinalParametersConflict2() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-
-					 final Session session = entityManager.unwrap( Session.class );
-					 final org.hibernate.query.Query sessionQuery = session.getNamedQuery( "NamedQuery" );
-					 sessionQuery.setParameter( 1, GAME_TITLES[0] );
-					 list = sessionQuery.getResultList();
-
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+
+					final Session session = entityManager.unwrap( Session.class );
+					final org.hibernate.query.Query sessionQuery = session.getNamedQuery( "NamedQuery" );
+					sessionQuery.setParameter( 1, GAME_TITLES[0] );
+					list = sessionQuery.getResultList();
+
+					query.setParameter( 1, GAME_TITLES[0] );
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
 	@Test
 	public void testNativeNamedQueriesOrdinalParametersAreOneBased() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
 	@Test
 	public void testNativeNamedQueriesOrdinalParametersConflict() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-
-					 final Session session = entityManager.unwrap( Session.class );
-					 final org.hibernate.query.Query sessionQuery = session.createNativeQuery(
-							 "select * from Game g where title = ?" );
-					 sessionQuery.setParameter( 1, GAME_TITLES[0] );
-					 list = sessionQuery.getResultList();
-
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+
+					final Session session = entityManager.unwrap( Session.class );
+					final org.hibernate.query.Query sessionQuery = session.createNativeQuery(
+							"select * from Game g where title = ?" );
+					sessionQuery.setParameter( 1, GAME_TITLES[0] );
+					list = sessionQuery.getResultList();
+
+					query.setParameter( 1, GAME_TITLES[0] );
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
 	@Test
 	public void testNativeNamedQueriesOrdinalParametersConflict2() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 List list = query.getResultList();
-					 assertEquals( 1, list.size() );
-
-					 final Session session = entityManager.unwrap( Session.class );
-					 final org.hibernate.query.Query sessionQuery = session.getNamedNativeQuery(
-							 "NamedNativeQuery" );
-					 sessionQuery.setParameter( 1, GAME_TITLES[0] );
-					 list = sessionQuery.getResultList();
-
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 assertEquals( 1, list.size() );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					List list = query.getResultList();
+					assertEquals( 1, list.size() );
+
+					final Session session = entityManager.unwrap( Session.class );
+					final org.hibernate.query.Query sessionQuery = session.getNamedNativeQuery(
+							"NamedNativeQuery" );
+					sessionQuery.setParameter( 1, GAME_TITLES[0] );
+					list = sessionQuery.getResultList();
+
+					query.setParameter( 1, GAME_TITLES[0] );
+					assertEquals( 1, list.size() );
+				}
 		);
 	}
 
@@ -276,11 +274,11 @@ public void testNamedQueryAddedFromEntityNativeQueryUsedAsUntyped() {
 	@JiraKey(value = "HHH-14816")
 	public void testQueryHintLockMode() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
-					 Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
-					 query.setHint( HINT_NATIVE_LOCK_MODE, "none" );
-					 query.setParameter( 1, GAME_TITLES[0] );
-					 assertEquals( LockMode.NONE, query.getHints().get( HINT_NATIVE_LOCK_MODE ) );
-				 }
+					Query query = entityManager.createNamedQuery( "NamedNativeQuery" );
+					query.setHint( HINT_NATIVE_LOCK_MODE, "none" );
+					query.setParameter( 1, GAME_TITLES[0] );
+					assertEquals( LockMode.NONE, query.getHints().get( HINT_NATIVE_LOCK_MODE ) );
+				}
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
index ca24161bcffb..961162a9c5f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
index 45cd0b25f4cf..1530eedfbfc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -664,4 +662,3 @@ public String getName() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
index 6b1711986b1f..b72a7aaec519 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java
index 33027ef255ae..6f8412fe711e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java
index 5bd81f7ff8d6..b2d974c443eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java
index c740baf9a2e7..c5b2865e5b60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
index 27985c67699c..f65bf16e44c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java
index d4d2cd4e86e1..404cc389857b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
index a99c769840c2..75a23af39601 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java
index 72afc41dc736..93ecf7d853da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java
index 32cc8793315a..a8a7a2dd037c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java
index 2f41fd78f56f..869da344d595 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java
index 2f5421b11d24..f8a3d13a4c5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import java.time.Instant;
@@ -211,4 +215,3 @@ public void setName(String name) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseQueryWithExpandedParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseQueryWithExpandedParameterTest.java
index 7d61b39be316..434c688edd4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseQueryWithExpandedParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseQueryWithExpandedParameterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import jakarta.persistence.Entity;
@@ -76,4 +80,3 @@ public void setName(String name) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java
index 39c255ac7c1e..cd2b29579be1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java
index 45fe82d3df83..f9bf183302da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.query;
 
 import org.hibernate.dialect.H2Dialect;
@@ -23,760 +27,760 @@
 
 @RequiresDialect(H2Dialect.class)
 public class TupleNativeQueryTest extends BaseEntityManagerFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{User.class};
-    }
-
-    @Before
-    public void setUp() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            User user = new User("Arnold");
-            entityManager.persist(user);
-        });
-    }
-
-    @After
-    public void tearDown() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            CriteriaDelete delete = entityManager.getCriteriaBuilder().createCriteriaDelete(User.class);
-            delete.from(User.class);
-            entityManager.createQuery(delete).executeUpdate();
-        });
-    }
-
-    @Test
-    public void testPositionalGetterShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get(0));
-            assertEquals("Arnold", tuple.get(1));
-        });
-    }
-
-    @Test
-    public void testPositionalGetterWithClassShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
-            assertEquals("Arnold", tuple.get(1, String.class));
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test
-    public void testAliasGetterWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ID"));
-            assertEquals("Arnold", tuple.get("FIRSTNAME"));
-        });
-    }
-
-    @Test
-    public void testAliasGetterShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get("id");
-        });
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testAliasGetterShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get("e");
-        });
-    }
-
-    @Test
-    public void testAliasGetterWithClassWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
-            assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
-        });
-    }
-
-
-    @Test
-    public void testAliasGetterWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleAliasedResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ALIAS1"));
-            assertEquals("Arnold", tuple.get("ALIAS2"));
-        });
-    }
-
-    @Test
-    public void testAliasGetterWithClassWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleAliasedResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
-            assertEquals("Arnold", tuple.get("ALIAS2", String.class));
-        });
-    }
-
-    @Test
-    public void testToArrayShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getTupleResult(entityManager);
-            Object[] result = tuples.get(0).toArray();
-            assertArrayEquals(new Object[]{1L, "Arnold"}, result);
-        });
-    }
-
-    @Test
-    public void testGetElementsShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getTupleResult(entityManager);
-            List> result = tuples.get(0).getElements();
-            assertEquals(2, result.size());
-            assertEquals(Long.class, result.get(0).getJavaType());
-            assertEquals("ID", result.get(0).getAlias());
-            assertEquals(String.class, result.get(1).getJavaType());
-            assertEquals("FIRSTNAME", result.get(1).getAlias());
-        });
-    }
-
-    @Test
-    public void testPositionalGetterWithNamedNativeQueryShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get(0));
-            assertEquals("Arnold", tuple.get(1));
-        });
-    }
-
-    @Test
-    public void testPositionalGetterWithNamedNativeQueryWithClassShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
-            assertEquals("Arnold", tuple.get(1, String.class));
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test
-    public void testAliasGetterWithNamedNativeQueryWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ID"));
-            assertEquals("Arnold", tuple.get("FIRSTNAME"));
-        });
-    }
-
-    @Test
-    public void testAliasGetterWithNamedNativeQueryShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get("id");
-        });
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testAliasGetterWithNamedNativeQueryShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get("e");
-        });
-    }
-
-    @Test
-    public void testAliasGetterWithNamedNativeQueryWithClassWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
-            assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
-        });
-    }
-
-
-    @Test
-    public void testAliasGetterWithNamedNativeQueryWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard_with_alias");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ALIAS1"));
-            assertEquals("Arnold", tuple.get("ALIAS2"));
-        });
-    }
-
-    @Test
-    public void testAliasGetterWithNamedNativeQueryWithClassWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleNamedResult(entityManager, "standard_with_alias");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
-            assertEquals("Arnold", tuple.get("ALIAS2", String.class));
-        });
-    }
-
-    @Test
-    public void testToArrayShouldWithNamedNativeQueryWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getTupleNamedResult(entityManager, "standard");
-            Object[] result = tuples.get(0).toArray();
-            assertArrayEquals(new Object[]{1L, "Arnold"}, result);
-        });
-    }
-
-    @Test
-    public void testGetElementsWithNamedNativeQueryShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getTupleNamedResult(entityManager, "standard");
-            List> result = tuples.get(0).getElements();
-            assertEquals(2, result.size());
-            assertEquals(Long.class, result.get(0).getJavaType());
-            assertEquals("ID", result.get(0).getAlias());
-            assertEquals(String.class, result.get(1).getJavaType());
-            assertEquals("FIRSTNAME", result.get(1).getAlias());
-        });
-    }
-
-    @Test
-    public void testStreamedPositionalGetterShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get(0));
-            assertEquals("Arnold", tuple.get(1));
-        });
-    }
-
-    @Test
-    public void testStreamedPositionalGetterWithClassShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
-            assertEquals("Arnold", tuple.get(1, String.class));
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test
-    public void testStreamedAliasGetterWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ID"));
-            assertEquals("Arnold", tuple.get("FIRSTNAME"));
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get("id");
-        });
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedAliasGetterShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            tuple.get("e");
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterWithClassWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedTupleResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
-            assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
-        });
-    }
-
-
-    @Test
-    public void testStreamedAliasGetterWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleAliasedResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ALIAS1"));
-            assertEquals("Arnold", tuple.get("ALIAS2"));
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterWithClassWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getTupleAliasedResult(entityManager);
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
-            assertEquals("Arnold", tuple.get("ALIAS2", String.class));
-        });
-    }
-
-    @Test
-    public void testStreamedToArrayShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getStreamedTupleResult(entityManager);
-            Object[] result = tuples.get(0).toArray();
-            assertArrayEquals(new Object[]{1L, "Arnold"}, result);
-        });
-    }
-
-    @Test
-    public void testStreamedGetElementsShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getStreamedTupleResult(entityManager);
-            List> result = tuples.get(0).getElements();
-            assertEquals(2, result.size());
-            assertEquals(Long.class, result.get(0).getJavaType());
-            assertEquals("ID", result.get(0).getAlias());
-            assertEquals(String.class, result.get(1).getJavaType());
-            assertEquals("FIRSTNAME", result.get(1).getAlias());
-        });
-    }
-
-    @Test
-    public void testStreamedPositionalGetterWithNamedNativeQueryShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get(0));
-            assertEquals("Arnold", tuple.get(1));
-        });
-    }
-
-    @Test
-    public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
-            assertEquals("Arnold", tuple.get(1, String.class));
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(-1);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(2);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get(3);
-        });
-    }
-
-
-    @Test
-    public void testStreamedAliasGetterWithNamedNativeQueryWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ID"));
-            assertEquals("Arnold", tuple.get("FIRSTNAME"));
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterWithNamedNativeQueryShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get("id");
-        });
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testStreamedAliasGetterWithNamedNativeQueryShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            tuple.get("e");
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterWithNamedNativeQueryWithClassWithoutExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
-            assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
-        });
-    }
-
-
-    @Test
-    public void testStreamedAliasGetterWithNamedNativeQueryWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard_with_alias");
-            Tuple tuple = result.get(0);
-            assertEquals(1L, tuple.get("ALIAS1"));
-            assertEquals("Arnold", tuple.get("ALIAS2"));
-        });
-    }
-
-    @Test
-    public void testStreamedAliasGetterWithNamedNativeQueryWithClassWithExplicitAliasShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List result = getStreamedNamedTupleResult(entityManager, "standard_with_alias");
-            Tuple tuple = result.get(0);
-            assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
-            assertEquals("Arnold", tuple.get("ALIAS2", String.class));
-        });
-    }
-
-    @Test
-    public void testStreamedToArrayShouldWithNamedNativeQueryWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getStreamedNamedTupleResult(entityManager, "standard");
-            Object[] result = tuples.get(0).toArray();
-            assertArrayEquals(new Object[]{1L, "Arnold"}, result);
-        });
-    }
-
-    @Test
-    public void testStreamedGetElementsWithNamedNativeQueryShouldWorkProperly() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getStreamedNamedTupleResult(entityManager, "standard");
-            List> result = tuples.get(0).getElements();
-            assertEquals(2, result.size());
-            assertEquals(Long.class, result.get(0).getJavaType());
-            assertEquals("ID", result.get(0).getAlias());
-            assertEquals(String.class, result.get(1).getJavaType());
-            assertEquals("FIRSTNAME", result.get(1).getAlias());
-        });
-    }
-
-    @Test
-    @JiraKey(value = "HHH-11897")
-    public void testGetElementsShouldNotThrowExceptionWhenResultContainsNullValue() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            User user = entityManager.find(User.class, 1L);
-            user.firstName = null;
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            List tuples = getTupleResult(entityManager);
-            final Tuple tuple = tuples.get(0);
-            List> result = tuple.getElements();
-            assertEquals(2, result.size());
-            final TupleElement firstTupleElement = result.get(0);
-            assertEquals(Long.class, firstTupleElement.getJavaType());
-            assertEquals("ID", firstTupleElement.getAlias());
-            assertEquals(1L, tuple.get(firstTupleElement.getAlias()));
-            final TupleElement secondTupleElement = result.get(1);
-            assertEquals(Object.class, secondTupleElement.getJavaType());
-            assertEquals("FIRSTNAME", secondTupleElement.getAlias());
-            assertNull(tuple.get(secondTupleElement.getAlias()));
-        });
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getTupleAliasedResult(EntityManager entityManager) {
-        Query query = entityManager.createNativeQuery("SELECT id AS alias1, firstname AS alias2 FROM users", Tuple.class);
-        return (List) query.getResultList();
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getStreamedTupleAliasedResult(EntityManager entityManager) {
-        NativeQueryImpl query = (NativeQueryImpl) entityManager.createNativeQuery(
-                "SELECT id AS alias1, firstname AS alias2 FROM users",
-                Tuple.class
-        );
-        return (List) query.stream().collect(Collectors.toList());
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getTupleResult(EntityManager entityManager) {
-        Query query = entityManager.createNativeQuery("SELECT id, firstname FROM users", Tuple.class);
-        return (List) query.getResultList();
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getTupleNamedResult(EntityManager entityManager, String name) {
-        return entityManager.createNamedQuery(name, Tuple.class).getResultList();
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getStreamedTupleResult(EntityManager entityManager) {
-        NativeQueryImplementor query = (NativeQueryImplementor) entityManager.createNativeQuery( "SELECT id, firstname FROM users", Tuple.class);
-        return (List) query.stream().collect(Collectors.toList());
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getStreamedNamedTupleResult(EntityManager entityManager, String name) {
-        return (List)((NativeQueryImplementor) entityManager.createNamedQuery(name, Tuple.class)).stream().collect(Collectors.toList());
-    }
-
-    @Entity
-    @Table(name = "users")
-    @NamedNativeQueries({
-            @NamedNativeQuery(
-                    name = "standard",
-                    query = "SELECT id, firstname FROM users"
-            ),
-            @NamedNativeQuery(
-                    name = "standard_with_alias",
-                    query = "SELECT id AS alias1, firstname AS alias2 FROM users"
-            )
-    })
-    public static class User {
-        @Id
-        private long id;
-
-        private String firstName;
-
-        public User() {
-        }
-
-        public User(String firstName) {
-            this.id = 1L;
-            this.firstName = firstName;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{User.class};
+	}
+
+	@Before
+	public void setUp() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			User user = new User("Arnold");
+			entityManager.persist(user);
+		});
+	}
+
+	@After
+	public void tearDown() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			CriteriaDelete delete = entityManager.getCriteriaBuilder().createCriteriaDelete(User.class);
+			delete.from(User.class);
+			entityManager.createQuery(delete).executeUpdate();
+		});
+	}
+
+	@Test
+	public void testPositionalGetterShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get(0));
+			assertEquals("Arnold", tuple.get(1));
+		});
+	}
+
+	@Test
+	public void testPositionalGetterWithClassShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
+			assertEquals("Arnold", tuple.get(1, String.class));
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test
+	public void testAliasGetterWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ID"));
+			assertEquals("Arnold", tuple.get("FIRSTNAME"));
+		});
+	}
+
+	@Test
+	public void testAliasGetterShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get("id");
+		});
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testAliasGetterShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get("e");
+		});
+	}
+
+	@Test
+	public void testAliasGetterWithClassWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
+			assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
+		});
+	}
+
+
+	@Test
+	public void testAliasGetterWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleAliasedResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ALIAS1"));
+			assertEquals("Arnold", tuple.get("ALIAS2"));
+		});
+	}
+
+	@Test
+	public void testAliasGetterWithClassWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleAliasedResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
+			assertEquals("Arnold", tuple.get("ALIAS2", String.class));
+		});
+	}
+
+	@Test
+	public void testToArrayShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getTupleResult(entityManager);
+			Object[] result = tuples.get(0).toArray();
+			assertArrayEquals(new Object[]{1L, "Arnold"}, result);
+		});
+	}
+
+	@Test
+	public void testGetElementsShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getTupleResult(entityManager);
+			List> result = tuples.get(0).getElements();
+			assertEquals(2, result.size());
+			assertEquals(Long.class, result.get(0).getJavaType());
+			assertEquals("ID", result.get(0).getAlias());
+			assertEquals(String.class, result.get(1).getJavaType());
+			assertEquals("FIRSTNAME", result.get(1).getAlias());
+		});
+	}
+
+	@Test
+	public void testPositionalGetterWithNamedNativeQueryShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get(0));
+			assertEquals("Arnold", tuple.get(1));
+		});
+	}
+
+	@Test
+	public void testPositionalGetterWithNamedNativeQueryWithClassShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
+			assertEquals("Arnold", tuple.get(1, String.class));
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test
+	public void testAliasGetterWithNamedNativeQueryWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ID"));
+			assertEquals("Arnold", tuple.get("FIRSTNAME"));
+		});
+	}
+
+	@Test
+	public void testAliasGetterWithNamedNativeQueryShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get("id");
+		});
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testAliasGetterWithNamedNativeQueryShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get("e");
+		});
+	}
+
+	@Test
+	public void testAliasGetterWithNamedNativeQueryWithClassWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
+			assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
+		});
+	}
+
+
+	@Test
+	public void testAliasGetterWithNamedNativeQueryWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard_with_alias");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ALIAS1"));
+			assertEquals("Arnold", tuple.get("ALIAS2"));
+		});
+	}
+
+	@Test
+	public void testAliasGetterWithNamedNativeQueryWithClassWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleNamedResult(entityManager, "standard_with_alias");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
+			assertEquals("Arnold", tuple.get("ALIAS2", String.class));
+		});
+	}
+
+	@Test
+	public void testToArrayShouldWithNamedNativeQueryWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getTupleNamedResult(entityManager, "standard");
+			Object[] result = tuples.get(0).toArray();
+			assertArrayEquals(new Object[]{1L, "Arnold"}, result);
+		});
+	}
+
+	@Test
+	public void testGetElementsWithNamedNativeQueryShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getTupleNamedResult(entityManager, "standard");
+			List> result = tuples.get(0).getElements();
+			assertEquals(2, result.size());
+			assertEquals(Long.class, result.get(0).getJavaType());
+			assertEquals("ID", result.get(0).getAlias());
+			assertEquals(String.class, result.get(1).getJavaType());
+			assertEquals("FIRSTNAME", result.get(1).getAlias());
+		});
+	}
+
+	@Test
+	public void testStreamedPositionalGetterShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get(0));
+			assertEquals("Arnold", tuple.get(1));
+		});
+	}
+
+	@Test
+	public void testStreamedPositionalGetterWithClassShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
+			assertEquals("Arnold", tuple.get(1, String.class));
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test
+	public void testStreamedAliasGetterWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ID"));
+			assertEquals("Arnold", tuple.get("FIRSTNAME"));
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get("id");
+		});
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedAliasGetterShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			tuple.get("e");
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterWithClassWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedTupleResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
+			assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
+		});
+	}
+
+
+	@Test
+	public void testStreamedAliasGetterWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleAliasedResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ALIAS1"));
+			assertEquals("Arnold", tuple.get("ALIAS2"));
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterWithClassWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getTupleAliasedResult(entityManager);
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
+			assertEquals("Arnold", tuple.get("ALIAS2", String.class));
+		});
+	}
+
+	@Test
+	public void testStreamedToArrayShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getStreamedTupleResult(entityManager);
+			Object[] result = tuples.get(0).toArray();
+			assertArrayEquals(new Object[]{1L, "Arnold"}, result);
+		});
+	}
+
+	@Test
+	public void testStreamedGetElementsShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getStreamedTupleResult(entityManager);
+			List> result = tuples.get(0).getElements();
+			assertEquals(2, result.size());
+			assertEquals(Long.class, result.get(0).getJavaType());
+			assertEquals("ID", result.get(0).getAlias());
+			assertEquals(String.class, result.get(1).getJavaType());
+			assertEquals("FIRSTNAME", result.get(1).getAlias());
+		});
+	}
+
+	@Test
+	public void testStreamedPositionalGetterWithNamedNativeQueryShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get(0));
+			assertEquals("Arnold", tuple.get(1));
+		});
+	}
+
+	@Test
+	public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get(0, Long.class));
+			assertEquals("Arnold", tuple.get(1, String.class));
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenLessThanZeroGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(-1);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenTupleSizePositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(2);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedPositionalGetterWithNamedNativeQueryWithClassShouldThrowExceptionWhenExceedingPositionGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get(3);
+		});
+	}
+
+
+	@Test
+	public void testStreamedAliasGetterWithNamedNativeQueryWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ID"));
+			assertEquals("Arnold", tuple.get("FIRSTNAME"));
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterWithNamedNativeQueryShouldWorkWithoutExplicitAliasWhenLowerCaseAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get("id");
+		});
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testStreamedAliasGetterWithNamedNativeQueryShouldThrowExceptionWithoutExplicitAliasWhenWrongAliasGiven() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			tuple.get("e");
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterWithNamedNativeQueryWithClassWithoutExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ID", Long.class));
+			assertEquals("Arnold", tuple.get("FIRSTNAME", String.class));
+		});
+	}
+
+
+	@Test
+	public void testStreamedAliasGetterWithNamedNativeQueryWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard_with_alias");
+			Tuple tuple = result.get(0);
+			assertEquals(1L, tuple.get("ALIAS1"));
+			assertEquals("Arnold", tuple.get("ALIAS2"));
+		});
+	}
+
+	@Test
+	public void testStreamedAliasGetterWithNamedNativeQueryWithClassWithExplicitAliasShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List result = getStreamedNamedTupleResult(entityManager, "standard_with_alias");
+			Tuple tuple = result.get(0);
+			assertEquals(Long.valueOf(1L), tuple.get("ALIAS1", Long.class));
+			assertEquals("Arnold", tuple.get("ALIAS2", String.class));
+		});
+	}
+
+	@Test
+	public void testStreamedToArrayShouldWithNamedNativeQueryWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getStreamedNamedTupleResult(entityManager, "standard");
+			Object[] result = tuples.get(0).toArray();
+			assertArrayEquals(new Object[]{1L, "Arnold"}, result);
+		});
+	}
+
+	@Test
+	public void testStreamedGetElementsWithNamedNativeQueryShouldWorkProperly() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getStreamedNamedTupleResult(entityManager, "standard");
+			List> result = tuples.get(0).getElements();
+			assertEquals(2, result.size());
+			assertEquals(Long.class, result.get(0).getJavaType());
+			assertEquals("ID", result.get(0).getAlias());
+			assertEquals(String.class, result.get(1).getJavaType());
+			assertEquals("FIRSTNAME", result.get(1).getAlias());
+		});
+	}
+
+	@Test
+	@JiraKey(value = "HHH-11897")
+	public void testGetElementsShouldNotThrowExceptionWhenResultContainsNullValue() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			User user = entityManager.find(User.class, 1L);
+			user.firstName = null;
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			List tuples = getTupleResult(entityManager);
+			final Tuple tuple = tuples.get(0);
+			List> result = tuple.getElements();
+			assertEquals(2, result.size());
+			final TupleElement firstTupleElement = result.get(0);
+			assertEquals(Long.class, firstTupleElement.getJavaType());
+			assertEquals("ID", firstTupleElement.getAlias());
+			assertEquals(1L, tuple.get(firstTupleElement.getAlias()));
+			final TupleElement secondTupleElement = result.get(1);
+			assertEquals(Object.class, secondTupleElement.getJavaType());
+			assertEquals("FIRSTNAME", secondTupleElement.getAlias());
+			assertNull(tuple.get(secondTupleElement.getAlias()));
+		});
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getTupleAliasedResult(EntityManager entityManager) {
+		Query query = entityManager.createNativeQuery("SELECT id AS alias1, firstname AS alias2 FROM users", Tuple.class);
+		return (List) query.getResultList();
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getStreamedTupleAliasedResult(EntityManager entityManager) {
+		NativeQueryImpl query = (NativeQueryImpl) entityManager.createNativeQuery(
+				"SELECT id AS alias1, firstname AS alias2 FROM users",
+				Tuple.class
+		);
+		return (List) query.stream().collect(Collectors.toList());
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getTupleResult(EntityManager entityManager) {
+		Query query = entityManager.createNativeQuery("SELECT id, firstname FROM users", Tuple.class);
+		return (List) query.getResultList();
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getTupleNamedResult(EntityManager entityManager, String name) {
+		return entityManager.createNamedQuery(name, Tuple.class).getResultList();
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getStreamedTupleResult(EntityManager entityManager) {
+		NativeQueryImplementor query = (NativeQueryImplementor) entityManager.createNativeQuery( "SELECT id, firstname FROM users", Tuple.class);
+		return (List) query.stream().collect(Collectors.toList());
+	}
+
+	@SuppressWarnings("unchecked")
+	private List getStreamedNamedTupleResult(EntityManager entityManager, String name) {
+		return (List)((NativeQueryImplementor) entityManager.createNamedQuery(name, Tuple.class)).stream().collect(Collectors.toList());
+	}
+
+	@Entity
+	@Table(name = "users")
+	@NamedNativeQueries({
+			@NamedNativeQuery(
+					name = "standard",
+					query = "SELECT id, firstname FROM users"
+			),
+			@NamedNativeQuery(
+					name = "standard_with_alias",
+					query = "SELECT id AS alias1, firstname AS alias2 FROM users"
+			)
+	})
+	public static class User {
+		@Id
+		private long id;
+
+		private String firstName;
+
+		public User() {
+		}
+
+		public User(String firstName) {
+			this.id = 1L;
+			this.firstName = firstName;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java
index 810523e7bab8..1c7f5fb46a37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -20,7 +18,6 @@
 import org.hibernate.testing.orm.junit.Jpa;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -29,8 +26,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Andrea Boriero
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java
index 00525b887a24..f41bdfd332e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.query;
 
@@ -69,22 +67,22 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	@Test
 	public void testNative(EntityManagerFactoryScope scope) {
 		test(scope,
-			 q -> {
-				  final CustomType> customType = new CustomType<>(
-						  TagUserType.INSTANCE,
-						  scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class ).getTypeConfiguration()
-				  );
-
-				  org.hibernate.query.Query hibernateQuery = q.unwrap( org.hibernate.query.Query.class );
-				  hibernateQuery.setParameter( "tags", Arrays.asList( "important", "business" ), customType );
-			  }
+			q -> {
+				final CustomType> customType = new CustomType<>(
+						TagUserType.INSTANCE,
+						scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class ).getTypeConfiguration()
+				);
+
+				org.hibernate.query.Query hibernateQuery = q.unwrap( org.hibernate.query.Query.class );
+				hibernateQuery.setParameter( "tags", Arrays.asList( "important", "business" ), customType );
+			}
 		);
 	}
 
 	@Test
 	public void testJpa(EntityManagerFactoryScope scope) {
 		test(scope,
-			 q -> {
+			q -> {
 				final CustomType> customType = new CustomType<>(
 						TagUserType.INSTANCE,
 						scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class ).getTypeConfiguration()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
index 5957fb03c4b0..6eff1724cd8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
index 014446c91737..f86cc71138d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java
index 464b52da4a44..55b8607e05d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/remove/RemoveAndOrderUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/remove/RemoveAndOrderUpdateTest.java
index 19b5174a2792..6a9891599acd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/remove/RemoveAndOrderUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/remove/RemoveAndOrderUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.remove;
 
 import java.io.Serializable;
@@ -19,7 +23,6 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinColumns;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java
index 73e0398e72a2..20271422d74a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.removed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java
index 213495286ed0..ad194c678506 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java
index 4337a73efb3b..f74a53210e08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java
index a994e3d881d4..47656955ec2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
@@ -34,4 +32,4 @@ protected String getDropSqlScript() {
 	protected String getResourceUrlString(String resource) {
 		return resource;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
index 5ecd79ece3c6..efa05a6b5220 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropExtraWarningsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropExtraWarningsTest.java
index 28abb4d7dc7d..8949d2d3b6e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropExtraWarningsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropExtraWarningsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java
index ee9631e7160f..1ec1b1b7fec4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
index b5fb7ca64861..b8912fc6584c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
index 84b7fc709e1e..3b5c4713541a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
index 18d9773a9798..d53dcd5dca3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
index f164e63260eb..e7bd209581ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
index 25c12162a062..f3a94b51f5c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen.iso8859;
 
@@ -50,4 +48,4 @@ protected String getDropSqlScript() {
 	protected String getResourceUrlString(String resource) {
 		return resource;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
index 685ec766b824..5fe0dbec910b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen.iso8859;
 
@@ -32,4 +30,4 @@ protected Map buildSettings() {
 		settings.put( AvailableSettings.HBM2DDL_CHARSET_NAME, "ISO-8859-1" );
 		return settings;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java
index 8d51762247a2..a63f856b7aa7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen.iso8859;
 
@@ -26,4 +24,4 @@ public String getScriptFolderPath() {
 	protected String encodedName() {
 		return "sch" + String.valueOf( '\uFFFD' ) +"magen-test";
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
index 14d44de76c4e..79813546aac2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.schemagen.iso8859;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java
index ffb26cbc63a2..d185a817d678 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.secondarytable;
 
@@ -54,4 +52,4 @@ protected void addConfigOptions(Map options) {
 				break;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
index 28c3675e1dcf..f6e04e8af272 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.secondarytable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
index 7b492545d9c4..1a221d66b209 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.secondarytable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java
index d1c47cc5fbc2..1dfae39c6344 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.serialization;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java
index 9af8c8d4dfee..618cb6e3c375 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jpa.spi;
 
 import static org.junit.Assert.assertEquals;
@@ -14,24 +18,24 @@
  */
 public class NativeQueryTupleTransformerTest {
 
-    private final NativeQueryTupleTransformer nativeQueryTupleTransformer = new NativeQueryTupleTransformer();
-
-    @Test
-    public void nullValueIsExtractedFromTuple() {
-        final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
-            new Object[] { 1L, null },
-            new String[] { "id", "value" }
-        );
-        assertEquals(1L, tuple.get("id"));
-        assertNull(tuple.get("value"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void missingAliasCausesExceptionWhenIsExtractedFromTuple() {
-        final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
-            new Object[] { 1L, null },
-            new String[] { "id", "value" }
-        );
-        tuple.get("unknownAlias");
-    }
+	private final NativeQueryTupleTransformer nativeQueryTupleTransformer = new NativeQueryTupleTransformer();
+
+	@Test
+	public void nullValueIsExtractedFromTuple() {
+		final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
+			new Object[] { 1L, null },
+			new String[] { "id", "value" }
+		);
+		assertEquals(1L, tuple.get("id"));
+		assertNull(tuple.get("value"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void missingAliasCausesExceptionWhenIsExtractedFromTuple() {
+		final Tuple tuple = (Tuple) nativeQueryTupleTransformer.transformTuple(
+			new Object[] { 1L, null },
+			new String[] { "id", "value" }
+		);
+		tuple.get("unknownAlias");
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java
index 24b3805ee84e..a94b42971cef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.statistics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
index 3bd2e4ab236b..98e5948d20e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.temporal;
 
@@ -28,7 +26,7 @@
 		TemporalTypeTest.DataPoint.class
 })
 public class TemporalTypeTest {
-	
+
 	@Test
 	public void testTemporalType(EntityManagerFactoryScope scope) {
 		Date date = new Date();
@@ -43,7 +41,7 @@ public void testTemporalType(EntityManagerFactoryScope scope) {
 					entityManager.persist( dp );
 				}
 		);
-		
+
 		doTest(scope, "date1", date);
 		doTest(scope, "date1", calendar);
 		doTest(scope, "date2", date);
@@ -54,12 +52,12 @@ public void testTemporalType(EntityManagerFactoryScope scope) {
 		doTest(scope, "calendar2", date);
 		doTest(scope, "calendar2", calendar);
 	}
-	
+
 	private void doTest(EntityManagerFactoryScope scope, String property, Object obj) {
 		doTest( scope, property, obj, TemporalType.DATE );
 		doTest( scope, property, obj, TemporalType.TIMESTAMP );
 	}
-	
+
 	private void doTest(EntityManagerFactoryScope scope, String property, Object obj, TemporalType temporalType) {
 		scope.inTransaction(
 				entityManager -> {
@@ -78,16 +76,16 @@ private void doTest(EntityManagerFactoryScope scope, String property, Object obj
 	public static class DataPoint {
 		@Id @GeneratedValue
 		public long id;
-		
+
 		@Temporal( TemporalType.DATE )
 		public Date date1;
-		
+
 		@Temporal( TemporalType.TIMESTAMP )
 		public Date date2;
-		
+
 		@Temporal( TemporalType.DATE )
 		public Calendar calendar1;
-		
+
 		@Temporal( TemporalType.TIMESTAMP )
 		public Calendar calendar2;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java
index cdcc6929d807..bf6a990044d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.test.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java
index b40b4beb28e8..cedc08644cbd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.test.components;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java
index e562266f55e7..cf3c31b878eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.test.components;
 
@@ -118,18 +116,18 @@ public void testOneToManyJoinFetchedInEmbeddable() {
 	@JiraKey(value = "HHH-4586")
 	public void testParameterizedFunctions() {
 		doInJPA( this::entityManagerFactory, em -> {
-					 CriteriaBuilder cb = em.getCriteriaBuilder();
-					 // lower
-					 CriteriaQuery cq = cb.createQuery( Client.class );
-					 Root root = cq.from( Client.class );
-					 cq.where( cb.equal( cb.lower( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
-					 em.createQuery( cq ).getResultList();
-					 // upper
-					 cq = cb.createQuery( Client.class );
-					 root = cq.from( Client.class );
-					 cq.where( cb.equal( cb.upper( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
-					 em.createQuery( cq ).getResultList();
-				 }
+					CriteriaBuilder cb = em.getCriteriaBuilder();
+					// lower
+					CriteriaQuery cq = cb.createQuery( Client.class );
+					Root root = cq.from( Client.class );
+					cq.where( cb.equal( cb.lower( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
+					em.createQuery( cq ).getResultList();
+					// upper
+					cq = cb.createQuery( Client.class );
+					root = cq.from( Client.class );
+					cq.where( cb.equal( cb.upper( root.get( Client_.name ).get( Name_.lastName ) ), "test" ) );
+					em.createQuery( cq ).getResultList();
+				}
 		);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java
index 0a2e25cf35a2..e42f744003af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.test.components;
 import java.io.Serializable;
@@ -20,10 +18,10 @@
  */
 @Embeddable
 public class Name implements Serializable {
-    private static final long serialVersionUID = 8381969086665589013L;
+	private static final long serialVersionUID = 8381969086665589013L;
 
-    private String firstName;
-    private String lastName;
+	private String firstName;
+	private String lastName;
 	private Set aliases = new HashSet(  );
 
 	public Name() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java
index 15975e174119..902bdf543589 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.transaction;
 
 import jakarta.persistence.Entity;
@@ -26,9 +22,9 @@ public class Book {
 
 	@Version
 	public Integer version;
-	
+
 	public Book() {}
-	
+
 	public Book(String name, Integer version) {
 		this.name = name;
 		this.version = version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java
index a011c929a96b..cf9977950a00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java
index ee133cdd1820..049234d31287 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java
index 87b3bb8568b4..79e834f81a47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java
index 427cb14bacbe..a7bba2d8c8ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java
index 0b948171274f..6943ce5338e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
@@ -51,4 +49,3 @@ public void testMultipleCallsReturnTheSameTransaction(EntityManagerFactoryScope
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java
index c10bb13aaf6f..086ecddb66d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaPlatformSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaPlatformSettingProvider.java
index 2bee54336853..ad2e264396da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaPlatformSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaPlatformSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java
index ee7238a03bf0..2b3ccccd61d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java
index 2bc906a020a6..0980eed8faa1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
index e136309f024b..ad434168f232 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
@@ -18,7 +16,6 @@
 import jakarta.persistence.RollbackException;
 
 import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 
 import org.hibernate.testing.jdbc.ConnectionProviderDelegate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java
index 87aed6d11a10..d0e6b724db10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java
index 9ab34b690389..ce6a45e3bf7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java
index de88dbf26fc3..30f22ee4a65f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java
index 82de8562e325..9c5aa7ef58a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
index 746a7505b92e..98188a0eb4e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java
index e923d13978b7..ec6f9a2333fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractBatchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java
index 457f641177f8..ff094584937c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java
index ef5ba20e1c92..2d928a9513f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java
index ca962dd199f8..4b9cc2dd4eb2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java
index 07e817705b5c..733c2fd8f8f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.transaction.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java
index ed4e794e85e6..d95be3050966 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.txn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java
index 256e774c68ce..44285b3e7e3b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.txn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java
index 01a7a9b9cf52..631bdb205176 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java
index a7a3c76c914f..2cc47d8ea98c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java
index 6f1edea5d743..75913607fc69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java
index a651c22f2b04..c201daea3816 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java
index 1ed44e0ad662..4cbaadb4615a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java
index b5015a98bd8d..b72de949ff41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java
index ff69e41e264a..0e3e271f418e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java
index a9c97ca88349..8c6c71f99266 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java
index cce2554152a8..850a3f973321 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java
index 73c5154a9043..8dca45d05c3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 import java.io.Serializable;
@@ -30,7 +28,7 @@ public String getType() {
 	public void setType(String type) {
 		this.type = type;
 	}
-	
+
 	@Id
 	public String getClassification() {
 		return classification;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java
index 7b5f4cb4e13c..1c29f6de88e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.userguide.util;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java
index fdc0591e16cc..c9716844c1d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java
index 896cf695002f..03d46319edbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.version;
 
@@ -115,7 +113,7 @@ public void testVersionNotIncrementedOnModificationOfNonOwningCollectionCascaded
 		session.beginTransaction();
 		customer = session.getReference( Customer.class, 1L );
 		assertEquals( initial, customer.version );
- 		session.remove( customer );
+		session.remove( customer );
 		session.getTransaction().commit();
 		session.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java
index e20649ea989e..78cdb35a802e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Address.java
index 494d3ee28a23..dac8467e853e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.xml;
 
 
@@ -59,4 +55,4 @@ public String getZip() {
 	public void setZip(String zip) {
 		this.zip = zip;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java
index 01bf78b8d63e..3b143cb28d64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.xml;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java
index 9f848a2d1013..afa485cc0a3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java
index 0c3d4a721351..af2aa5d68684 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.xml;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -15,58 +11,58 @@
  */
 @Entity
 public class Employee {
-    @Id
+	@Id
 	Long id;
-    String name;
+	String name;
 /*
-    @Embedded
-    @AttributeOverrides({
-        @AttributeOverride(name = "street", column = @Column(name = "HA_street")),
-        @AttributeOverride(name = "city", column = @Column(name = "HA_city")),
-        @AttributeOverride(name = "state", column = @Column(name = "HA_state")),
-        @AttributeOverride(name = "zip", column = @Column(name = "HA_zip")) })
+	@Embedded
+	@AttributeOverrides({
+		@AttributeOverride(name = "street", column = @Column(name = "HA_street")),
+		@AttributeOverride(name = "city", column = @Column(name = "HA_city")),
+		@AttributeOverride(name = "state", column = @Column(name = "HA_state")),
+		@AttributeOverride(name = "zip", column = @Column(name = "HA_zip")) })
 */
-    Address homeAddress;
+	Address homeAddress;
 
 /*
-    @Embedded
-    @AttributeOverrides({
-        @AttributeOverride(name = "street", column = @Column(name = "MA_street")),
-        @AttributeOverride(name = "city", column = @Column(name = "MA_city")),
-        @AttributeOverride(name = "state", column = @Column(name = "MA_state")),
-        @AttributeOverride(name = "zip", column = @Column(name = "MA_zip")) })
+	@Embedded
+	@AttributeOverrides({
+		@AttributeOverride(name = "street", column = @Column(name = "MA_street")),
+		@AttributeOverride(name = "city", column = @Column(name = "MA_city")),
+		@AttributeOverride(name = "state", column = @Column(name = "MA_state")),
+		@AttributeOverride(name = "zip", column = @Column(name = "MA_zip")) })
 */
-    Address mailAddress;
+	Address mailAddress;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Address getHomeAddress() {
-        return homeAddress;
-    }
+	public Address getHomeAddress() {
+		return homeAddress;
+	}
 
-    public void setHomeAddress(Address homeAddress) {
-        this.homeAddress = homeAddress;
-    }
+	public void setHomeAddress(Address homeAddress) {
+		this.homeAddress = homeAddress;
+	}
 
-    public Address getMailAddress() {
-        return mailAddress;
-    }
+	public Address getMailAddress() {
+		return mailAddress;
+	}
 
-    public void setMailAddress(Address mailAddress) {
-        this.mailAddress = mailAddress;
-    }
+	public void setMailAddress(Address mailAddress) {
+		this.mailAddress = mailAddress;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java
index fdbeb3a7f2d4..c8057df92590 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Light.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Light.java
index 240d1f39da84..0da8251ffb9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Light.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Light.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.xml;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Lighter.java
index 90b12b8615ba..2afdd6271beb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Lighter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Lighter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.jpa.xml;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Qualifier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Qualifier.java
index 0c3d03fd7bcc..eb944be816b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Qualifier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Qualifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java
index 3d042439a3a0..43ff28db2d08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAttributeOverrideTest.java
index f188f2c8f136..e13fd86b193f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java
index e02c81df01e6..07409d9c6da4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Address.java
index 4f16c19dece0..c8452e1a9ed8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.jpa.xml.sequences;
 
 
@@ -59,4 +55,4 @@ public String getZip() {
 	public void setZip(String zip) {
 		this.zip = zip;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java
index a4f3fab950ec..f16edce99ceb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.jpa.xml.sequences;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java
index 9f2ddc84f5fe..f2c015be6d45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.jpa.xml.sequences;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -15,58 +11,58 @@
  */
 @Entity
 public class Employee {
-    @Id
+	@Id
 	Long id;
-    String name;
+	String name;
 /*
-    @Embedded
-    @AttributeOverrides({
-        @AttributeOverride(name = "street", column = @Column(name = "HA_street")),
-        @AttributeOverride(name = "city", column = @Column(name = "HA_city")),
-        @AttributeOverride(name = "state", column = @Column(name = "HA_state")),
-        @AttributeOverride(name = "zip", column = @Column(name = "HA_zip")) })
+	@Embedded
+	@AttributeOverrides({
+		@AttributeOverride(name = "street", column = @Column(name = "HA_street")),
+		@AttributeOverride(name = "city", column = @Column(name = "HA_city")),
+		@AttributeOverride(name = "state", column = @Column(name = "HA_state")),
+		@AttributeOverride(name = "zip", column = @Column(name = "HA_zip")) })
 */
-    Address homeAddress;
+	Address homeAddress;
 
 /*
-    @Embedded
-    @AttributeOverrides({
-        @AttributeOverride(name = "street", column = @Column(name = "MA_street")),
-        @AttributeOverride(name = "city", column = @Column(name = "MA_city")),
-        @AttributeOverride(name = "state", column = @Column(name = "MA_state")),
-        @AttributeOverride(name = "zip", column = @Column(name = "MA_zip")) })
+	@Embedded
+	@AttributeOverrides({
+		@AttributeOverride(name = "street", column = @Column(name = "MA_street")),
+		@AttributeOverride(name = "city", column = @Column(name = "MA_city")),
+		@AttributeOverride(name = "state", column = @Column(name = "MA_state")),
+		@AttributeOverride(name = "zip", column = @Column(name = "MA_zip")) })
 */
-    Address mailAddress;
+	Address mailAddress;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Address getHomeAddress() {
-        return homeAddress;
-    }
+	public Address getHomeAddress() {
+		return homeAddress;
+	}
 
-    public void setHomeAddress(Address homeAddress) {
-        this.homeAddress = homeAddress;
-    }
+	public void setHomeAddress(Address homeAddress) {
+		this.homeAddress = homeAddress;
+	}
 
-    public Address getMailAddress() {
-        return mailAddress;
-    }
+	public Address getMailAddress() {
+		return mailAddress;
+	}
 
-    public void setMailAddress(Address mailAddress) {
-        this.mailAddress = mailAddress;
-    }
+	public void setMailAddress(Address mailAddress) {
+		this.mailAddress = mailAddress;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Light.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Light.java
index 9b3d3a6e1d71..6ab67fac8ad6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Light.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Light.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.jpa.xml.sequences;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Lighter.java
index e1acaa92e608..67e12effd6f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Lighter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Lighter.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.jpa.xml.sequences;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlAttributeOverrideTest.java
index 4e77377f9d85..0b9f6bf27754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlAttributeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlAttributeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml.sequences;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java
index 12ce70ae9cb4..1ae4ef9b6366 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml.sequences;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java
index 8fdd4d19f668..0c77eea1672b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jpa.xml.versions;
 
@@ -37,7 +35,7 @@
  * @author Steve Ebersole
  */
 public class JpaXsdVersionsTest {
-    @Test
+	@Test
 	public void testOrm1() {
 		PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm1-test", "1.0" )
 				.addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml" );
@@ -63,7 +61,7 @@ public void testOrm20() {
 		}
 	}
 
-    @Test
+	@Test
 	public void testOrm21() {
 		PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.1" )
 				.addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml" );
@@ -73,7 +71,7 @@ public void testOrm21() {
 		}
 	}
 
-    @Test
+	@Test
 	public void testOrm22() {
 		PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.2")
 				.addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml" );
@@ -83,7 +81,7 @@ public void testOrm22() {
 		}
 	}
 
-    @Test
+	@Test
 	public void testInvalidOrm1() {
 		PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "invalid-orm1-test", "1.0" )
 				.addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Customer.java
index 23f0b9a2fd96..83b26e747ca3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.component;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java
index 0956e6d28062..65564863ba02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
index 278f035fbbfa..8897d8f4845f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java
index 6f625fc546b5..51f740e9da1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.component;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Order.java
index 3c7009c7b96a..c3f8daf2d01d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.component;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Customer.java
index 83eeab1c3a25..6799701cbb57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.embedded;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java
index 58dc67a7f7d1..371459d84b29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Order.java
index ab32dd4d2694..300f8ab3eb04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.embedded;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Customer.java
index 65079262e749..8837b022f0f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java
index c0a18d07e5ef..f330480364d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Order.java
index b392dfc20582..6744f830b137 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.bidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Customer.java
index bba15d1f3f09..d735d331de3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.unidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java
index d2c34fef56a0..efdc37c1a8be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.unidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Order.java
index a85891a61970..ec64aa269680 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.keymanytoone.unidir.ondelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java
index 1f1e69a86442..ce06f3264f90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazydetachedpersist;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java
index 251cd18acb7a..749b422dafad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java
index 27f3f43146cf..ba6de653e390 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java
index c5d2c25aab6e..fa7ee5e46d8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java
index 1e6e5d8e0e96..82e7cd55b110 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java
index 31f33b8f3f48..9ad0a5a78c2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java
index be4000737285..a8466d8edf45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdJpaComplianceTest.java
index b2b1a9e667ab..3fd23ca7a69d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdJpaComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdJpaComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java
index e86c0a8c8607..9c83ab5661ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java
index a88af434aa28..abfa977f9da2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employee.java
index cbc00c56f2f3..ad5b84eea5e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.lazyonetoone;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,7 +12,7 @@
 public class Employee {
 	private String personName;
 	private Person person;
-	private Collection employments = new ArrayList(); 
+	private Collection employments = new ArrayList();
 	Employee() {}
 	public Employee(Person p) {
 		this.person = p;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employment.java
index 1a10d93822ab..22bc6124d55f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Employment.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employment.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.lazyonetoone;
 import java.io.Serializable;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java
index 9735fbd5ce0b..393309fb8254 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lazyonetoone;
 
@@ -84,4 +82,3 @@ public void testLazy(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Person.java
index 2fe556406d39..5354134c43a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.lazyonetoone;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
index b54f31f0571f..db39b63a96a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -25,7 +23,7 @@ public A(Long id) {
 	public Long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the name.
 	 * @return String
@@ -33,7 +31,7 @@ public Long getId() {
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -41,7 +39,7 @@ public String getName() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the name.
 	 * @param name The name to set
@@ -49,7 +47,7 @@ public void setId(Long id) {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public E getForward() {
 		return forward;
 	}
@@ -59,9 +57,3 @@ public void setForward(E e) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
index 2215d5598420..16be961d1ef9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -76,7 +74,7 @@ public void testHigherLevelIndexDefinition(SessionFactoryScope scope) {
 				.getDatabase()
 				.getDefaultNamespace()
 				.locateTable( Identifier.toIdentifier( "TA" ) );
-        Iterator indexItr = table.getIndexes().values().iterator();
+		Iterator indexItr = table.getIndexes().values().iterator();
 		boolean found = false;
 		while ( indexItr.hasNext() ) {
 			final Index index = indexItr.next();
@@ -182,4 +180,3 @@ private Cache getCache(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
index d86f8d9613cd..4163849ee935 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
@@ -1,40 +1,30 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Abstract.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.Set;
 
 public abstract class Abstract extends Foo implements AbstractProxy {
-	
+
 	private java.sql.Time time;
 	private Set abstracts;
-	
+
 	public java.sql.Time getTime() {
 		return time;
 	}
-	
+
 	public void setTime(java.sql.Time time) {
 		this.time = time;
 	}
-	
+
 	public Set getAbstracts() {
 		return abstracts;
 	}
-	
+
 	public void setAbstracts(Set abstracts) {
 		this.abstracts = abstracts;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
index 9249ebc5a037..235017f5feb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,8 +10,3 @@ public interface AbstractProxy extends FooProxy {
 	void setTime(java.sql.Time arg0);
 	java.sql.Time getTime();
 }
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
index 25708c87f25b..7c10e17378de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
index 385b4be85938..92617817c2dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.util.Map;
@@ -12,15 +10,15 @@ public class B extends A {
 	private int count;
 	private Map map;
 	private String bName = "B Name";
-	
+
 	public int getCount() {
 		return count;
 	}
-	
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public Map getMap() {
 		return map;
 	}
@@ -37,9 +35,3 @@ public void setBName(String name) {
 		bName = name;
 	}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
index 5f7913880954..4a1a229f9740 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bar.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 public class Bar extends Abstract implements BarProxy, Named {
@@ -14,7 +10,7 @@ public class Bar extends Abstract implements BarProxy, Named {
 	private Baz baz;
 	private int x;
 	private Object object;
-	
+
 	public int getX() {
 		return x;
 	}
@@ -25,33 +21,33 @@ public void setX(int x) {
 	public String getBarString() {
 		return barString;
 	}
-	
+
 	void setBarString(String barString) {
 		this.barString = barString;
 	}
-	
+
 	public FooComponent getBarComponent() {
 		return barComponent;
 	}
-	
+
 	public void setBarComponent(FooComponent barComponent) {
 		this.barComponent = barComponent;
 	}
-	
+
 	public Baz getBaz() {
 		return baz;
 	}
-	
+
 	public void setBaz(Baz baz) {
 		this.baz = baz;
 	}
-	
+
 	private String name = "bar";
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -65,10 +61,3 @@ public void setObject(Object object) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
index 2f7dfd57e052..201b4b2de862 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BarProxy.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -19,8 +15,3 @@ public interface BarProxy extends AbstractProxy {
 	Object getObject();
 	void setObject(Object o);
 }
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
index a219eb02f909..6471a2e3a2ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BasicNameable.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -15,42 +11,36 @@
  *
  */
 public class BasicNameable implements Nameable {
-	
+
 	private String name;
 	private Long id;
-	
+
 	/**
 	 * @see Nameable#getName()
 	 */
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * @see Nameable#setName()
 	 */
 	public void setName(String n) {
 		name = n;
 	}
-	
+
 	/**
 	 * @see Nameable#getKey()
 	 */
 	public Long getKey() {
 		return id;
 	}
-	
+
 	/**
 	 * @see Nameable#setKey()
 	 */
 	public void setKey(Long k) {
 		id = k;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
index 8ff681ca95fb..bc27e2c128be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Baz.java 4688 2004-10-26 09:10:50Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
@@ -60,9 +56,9 @@ public class Baz implements Named, Serializable, Comparable {
 	private List moreParts;
 	public List subs;
 	public Baz superBaz;
-	
+
 	Baz() {}
-	
+
 	public SortedSet getStringSet() {
 		return stringSet;
 	}
@@ -99,14 +95,14 @@ public String[] getStringArray() {
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
-	
+
 	public String getCode() {
 		return code;
 	}
 	public void setCode(String code) {
 		this.code = code;
 	}
-	
+
 	public void setDefaults() {
 		SortedSet set = new TreeSet();
 		set.add("foo"); set.add("bar"); set.add("baz");
@@ -122,7 +118,7 @@ public void setDefaults() {
 		setIntArray( new int[] { 1,3,3,7 } );
 		setFooArray( new Foo[0] );
 		setStringArray( (String[]) list.toArray( new String[0] ) );
-		
+
 		fooSet = new HashSet();
 		components = new FooComponent[] {
 			new FooComponent("foo", 42, null, null),
@@ -133,7 +129,7 @@ public void setDefaults() {
 		x.add("w"); x.add("x"); x.add("y"); x.add("z");
 		TreeSet a = new TreeSet();
 		a.add("a"); a.add("b"); a.add("d"); a.add("c");
-		
+
 		count = 667;
 		name="Bazza";
 		topComponents = new ArrayList();
@@ -156,10 +152,10 @@ public void setDefaults() {
 		cached.add(ce2);
 		cachedMap = new TreeMap();
 		cachedMap.put(this, ce);
-		
+
 		text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 		for (int i=0; i<10; i++) text+=text;
-		
+
 	}
 
 	public Set getFooSet() {
@@ -168,103 +164,103 @@ public Set getFooSet() {
 	public void setFooSet(Set fooSet) {
 		this.fooSet = fooSet;
 	}
-	
+
 	public FooComponent[] getComponents() {
 		return components;
 	}
 	public void setComponents(FooComponent[] components) {
 		this.components = components;
 	}
-	
+
 	public Date[] getTimeArray() {
 		return timeArray;
 	}
-	
+
 	public void setTimeArray(Date[] timeArray) {
 		this.timeArray = timeArray;
 	}
-	
+
 	public int getCount() {
 		return count;
 	}
-	
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public List getTopComponents() {
 		return topComponents;
 	}
-	
+
 	public void setTopComponents(List topComponents) {
 		this.topComponents = topComponents;
 	}
-	
+
 	public Collection getBag() {
 		return bag;
 	}
-	
+
 	public void setBag(Collection bag) {
 		this.bag = bag;
 	}
-	
+
 	public Set getTopFoos() {
 		return topFoos;
 	}
-	
+
 	public void setTopFoos(Set topFoos) {
 		this.topFoos = topFoos;
 	}
-	
-	
+
+
 	public Map getTopGlarchez() {
 		return topGlarchez;
 	}
-	
+
 	public void setTopGlarchez(Map topGlarchez) {
 		this.topGlarchez = topGlarchez;
 	}
-	
+
 	public Set getCascadingBars() {
 		return cascadingBars;
 	}
-	
+
 	public void setCascadingBars(Set cascadingBars) {
 		this.cascadingBars = cascadingBars;
 	}
-	
+
 	public Map getFooToGlarch() {
 		return fooToGlarch;
 	}
-	
+
 	public void setFooToGlarch(Map fooToGlarch) {
 		this.fooToGlarch = fooToGlarch;
 	}
-	
+
 	public Map getFooComponentToFoo() {
 		return fooComponentToFoo;
 	}
-	
+
 	public void setFooComponentToFoo(Map fooComponentToFoo) {
 		this.fooComponentToFoo = fooComponentToFoo;
 	}
-	
+
 	public Map getGlarchToFoo() {
 		return glarchToFoo;
 	}
-	
+
 	public void setGlarchToFoo(Map glarchToFoo) {
 		this.glarchToFoo = glarchToFoo;
 	}
-	
+
 	public List getFees() {
 		return fees;
 	}
@@ -438,10 +434,3 @@ public void setMoreParts(List moreParts) {
 		this.moreParts = moreParts;
 	}
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
index 3f2462b59ab7..08ca4e77ca12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
index a0e76d0503bd..ff7e7e24b722 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Broken.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
@@ -41,13 +37,13 @@ public String getOtherId() {
 	public void setOtherId(String string) {
 		otherId = string;
 	}
-	
+
 	public boolean equals(Object other) {
 		if ( !(other instanceof Broken) ) return false;
 		Broken that = (Broken) other;
 		return this.id.equals(that.id) && this.otherId.equals(that.otherId);
 	}
-	
+
 	public int hashCode() {
 		return 1;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
index 82f8f429c8da..d16bea8ba511 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: C1.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
@@ -24,7 +20,7 @@ public class C1 extends B{
 	public String getAddress() {
 		return address;
 	}
-	
+
 	/**
 	 * Sets the address.
 	 * @param address The address to set
@@ -32,7 +28,7 @@ public String getAddress() {
 	public void setAddress(String address) {
 		this.address = address;
 	}
-	
+
 	/**
 	 * Returns the d.
 	 * @return D
@@ -40,7 +36,7 @@ public void setAddress(String address) {
 	public D getD() {
 		return d;
 	}
-	
+
 	/**
 	 * Sets the d.
 	 * @param d The d to set
@@ -48,7 +44,7 @@ public D getD() {
 	public void setD(D d) {
 		this.d = d;
 	}
-	
+
 	/**
 	 * @return Returns the c.
 	 */
@@ -90,9 +86,3 @@ public void setC1Name(String name) {
 		c1Name = name;
 	}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
index 1e5397f205c0..4b3991534600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: C2.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
@@ -23,7 +19,7 @@ public class C2 extends B {
 	public String getAddress() {
 		return address;
 	}
-	
+
 	/**
 	 * Sets the address.
 	 * @param address The address to set
@@ -31,7 +27,7 @@ public String getAddress() {
 	public void setAddress(String address) {
 		this.address = address;
 	}
-	
+
 	/**
 	 * @return Returns the c.
 	 */
@@ -68,9 +64,3 @@ public void setC2Name(String name) {
 		c2Name = name;
 	}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
index 9b18cbe27b1f..4f9370b4d05b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Category.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
@@ -15,7 +11,7 @@
  *
  */
 public class Category {
-	
+
 	public static final String ROOT_CATEGORY = "/";
 	public static final int ROOT_ID = 42;
 
@@ -30,7 +26,7 @@ public class Category {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -38,7 +34,7 @@ public long getId() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Returns the subcategories.
 	 * @return List
@@ -46,7 +42,7 @@ public void setId(long id) {
 	public List getSubcategories() {
 		return subcategories;
 	}
-	
+
 	/**
 	 * Sets the subcategories.
 	 * @param subcategories The subcategories to set
@@ -54,7 +50,7 @@ public List getSubcategories() {
 	public void setSubcategories(List subcategories) {
 		this.subcategories = subcategories;
 	}
-	
+
 	/**
 	 * Returns the name.
 	 * @return String
@@ -62,7 +58,7 @@ public void setSubcategories(List subcategories) {
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Sets the name.
 	 * @param name The name to set
@@ -70,7 +66,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Assignable getAssignable() {
 		return assignable;
 	}
@@ -78,15 +74,9 @@ public Assignable getAssignable() {
 	public void setAssignable(Assignable assignable) {
 		this.assignable = assignable;
 	}
-	
+
 	public String toString() {
 		return id + ":" + name;
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
index b72a12b786d1..64c528881969 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Child.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -13,44 +9,37 @@ public class Child {
 	private Parent parent;
 	private int count;
 	private int x;
-	
+
 	public int getX() {
 		return x;
 	}
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public Parent getParent() {
 		return parent;
 	}
-	
-	
+
+
 	public void setParent(Parent parent) {
 		this.parent = parent;
 	}
-	
-	
+
+
 	public int getCount() {
 		return count;
 	}
-	
-	
+
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public long getId() {
 		return parent.getId();
 	}
 	private void setId(long id) {
 	}
-	
-}
-
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
index 9f19e9d5fa5a..d6267bbb4f9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Circular.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 public class Circular {
@@ -87,9 +83,3 @@ public void setAnyEntity(Object anyEntity) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java
index f24caaa25390..78550ac979dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,25 +10,25 @@
  */
 public class Company extends Party {
 
-   String id;
-   String president;
+String id;
+String president;
 
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
-  String getPresident() {
-    return president;
-  }
+String getPresident() {
+	return president;
+}
 
-  void  setPresident(String newValue) {
-    president = newValue;
-  }
+void  setPresident(String newValue) {
+	president = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
index b9e8521ec86c..ab7d9918eb8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
@@ -1,50 +1,46 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Component.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
 /**
  * Component
- * 
+ *
  * @author Emmanuel Bernard
  */
 public class Component {
-    private String _name;
-    
-    private SubComponent _subComponent;
-
-    /**
-     * @return
-     */
-    public String getName() {
-        return _name;
-    }
-
-    /**
-     * @param string
-     */
-    public void setName(String string) {
-        _name = string;
-    }
-
-    /**
-     * @return
-     */
-    public SubComponent getSubComponent() {
-        return _subComponent;
-    }
-
-    /**
-     * @param component
-     */
-    public void setSubComponent(SubComponent component) {
-        _subComponent = component;
-    }
+	private String _name;
+
+	private SubComponent _subComponent;
+
+	/**
+	 * @return
+	 */
+	public String getName() {
+		return _name;
+	}
+
+	/**
+	 * @param string
+	 */
+	public void setName(String string) {
+		_name = string;
+	}
+
+	/**
+	 * @return
+	 */
+	public SubComponent getSubComponent() {
+		return _subComponent;
+	}
+
+	/**
+	 * @param component
+	 */
+	public void setSubComponent(SubComponent component) {
+		_subComponent = component;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
index 33e25cfde2b0..0215e7d9e4ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ComponentCollection.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
index 590b131bdcaa..20d92b4862c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
@@ -1,24 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ComponentNotNull.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
 /**
  * Component used to check not-null sub properties management
- * 
+ *
  * @author Emmanuel Bernard
  */
 public class ComponentNotNull {
-	/* 
+	/*
 	 * I've flatten several components in one class, this is kind of ugly but
- 	 * I don't have to write tons of classes
- 	 */
+	* I don't have to write tons of classes
+	*/
 	private String prop1Nullable;
 	private String prop2Nullable;
 	private ComponentNotNull supercomp;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
index a94f065a6432..0704248d80fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -10,11 +8,11 @@
 
 /**
  * Entity containing components for not-null testing
- * 
+ *
  * @author Emmanuel Bernard
  */
 public class ComponentNotNullRoot {
-	
+
 	private int id;
 	private String test;
 	private ComponentNotNull nullable;
@@ -46,11 +44,11 @@ public static final class ContainerInnerClass {
 		private int count;
 		private ContainerInnerClass nested;
 		private String nestedproperty;
-		
+
 		public void setSimple(Simple simple) {
 			this.simple = simple;
 		}
-		
+
 		public Simple getSimple() {
 			return simple;
 		}
@@ -58,26 +56,26 @@ public Simple getSimple() {
 		public String getName() {
 			return name;
 		}
-		
+
 
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 		public String toString() {
 			return name +  " = " + simple.getCount() +
-			 "/"  + ( one==null ? "nil" : one.getKey().toString() ) +
-			 "/"  + ( many==null ? "nil" : many.getKey().toString() );
+			"/"  + ( one==null ? "nil" : one.getKey().toString() ) +
+			"/"  + ( many==null ? "nil" : many.getKey().toString() );
 		}
-		
+
 		public One getOne() {
 			return one;
 		}
-		
+
 		public void setOne(One one) {
 			this.one = one;
 		}
-		
+
 		public Many getMany() {
 			return many;
 		}
@@ -85,7 +83,7 @@ public Many getMany() {
 		public void setMany(Many many) {
 			this.many = many;
 		}
-		
+
 		public int getCount() {
 			return count;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
index 98e506f0059d..10c8f2fe74b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
@@ -1,68 +1,64 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Componentizable.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
 /**
  * contains components
- * 
+ *
  * @author emmanuel
  */
 public class Componentizable {
 	/** surrogate id */
 	private Integer _id;
-    
-    public String _nickName;
-	
+
+	public String _nickName;
+
 	/** component */
-    private Component _component;
+	private Component _component;
 
-    /**
-     * @return
-     */
-    public Integer getId() {
-        return _id;
-    }
+	/**
+	 * @return
+	 */
+	public Integer getId() {
+		return _id;
+	}
 
-    /**
-     * @param integer
-     */
-    public void setId(Integer integer) {
-        _id = integer;
-    }
+	/**
+	 * @param integer
+	 */
+	public void setId(Integer integer) {
+		_id = integer;
+	}
 
-    /**
-     * @return
-     */
-    public Component getComponent() {
-        return _component;
-    }
+	/**
+	 * @return
+	 */
+	public Component getComponent() {
+		return _component;
+	}
 
-    /**
-     * @param component
-     */
-    public void setComponent(Component component) {
-        _component = component;
-    }
+	/**
+	 * @param component
+	 */
+	public void setComponent(Component component) {
+		_component = component;
+	}
 
-    /**
-     * @return
-     */
-    public String getNickName() {
-        return _nickName;
-    }
+	/**
+	 * @return
+	 */
+	public String getNickName() {
+		return _nickName;
+	}
 
-    /**
-     * @param string
-     */
-    public void setNickName(String string) {
-        _nickName = string;
-    }
+	/**
+	 * @param string
+	 */
+	public void setNickName(String string) {
+		_nickName = string;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
index cd45751db573..8803561ce383 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: CompositeElement.java 6844 2005-05-21 14:22:16Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
@@ -51,11 +47,11 @@ public void setFoo(String foo) {
 	public int compareTo(Object o) {
 		return ( (CompositeElement) o ).foo.compareTo(foo);
 	}
-	
+
 	public int hashCode() {
 		return foo.hashCode() + bar.hashCode();
 	}
-	
+
 	public boolean equals(Object that) {
 		CompositeElement ce = (CompositeElement) that;
 		return ce.bar.equals(bar) && ce.foo.equals(foo);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
index 78453cd2af7b..4853b94c62e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
@@ -1,13 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Created on 20-Dec-2004
- *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -19,44 +12,44 @@
  */
 public class CompositeIdId implements Serializable {
 
-    String user;
-    String id;
-    String name;
-    CompositeElement composite;
-    
-    
-    public String getId() {
-        return id;
-    }
-    public void setId(String id) {
-        this.id = id;
-    }
-    public String getUser() {
-        return user;
-    }
-    public void setUser(String user) {
-        this.user = user;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object obj) {
-        // not totally NP or type safe equals, but enough for the unittests. 
-        CompositeIdId o = (CompositeIdId) obj;
-        if(o==null) return false;
-        return o.getUser().equals( getUser()) && o.getId().equals(getId());
-    }
-    public CompositeElement getComposite() {
-        return composite;
-    }
-    public void setComposite(CompositeElement composite) {
-        this.composite = composite;
-    }
+	String user;
+	String id;
+	String name;
+	CompositeElement composite;
+
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getUser() {
+		return user;
+	}
+	public void setUser(String user) {
+		this.user = user;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object obj) {
+		// not totally NP or type safe equals, but enough for the unittests.
+		CompositeIdId o = (CompositeIdId) obj;
+		if(o==null) return false;
+		return o.getUser().equals( getUser()) && o.getId().equals(getId());
+	}
+	public CompositeElement getComposite() {
+		return composite;
+	}
+	public void setComposite(CompositeElement composite) {
+		this.composite = composite;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
index 0a1e5535e564..c4e2afe697f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Contained.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
@@ -16,14 +12,14 @@ public class Contained {
 	private long id;
 	private Collection bag = new ArrayList();
 	private Collection lazyBag = new ArrayList();
-	
+
 	public boolean equals(Object other) {
 		return id==( (Contained) other ).getId();
 	}
 	public int hashCode() {
 		return new Long(id).hashCode();
 	}
-	
+
 	/**
 	 * Returns the container.
 	 * @return Container
@@ -31,7 +27,7 @@ public int hashCode() {
 	public Container getContainer() {
 		return container;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return long
@@ -39,7 +35,7 @@ public Container getContainer() {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the container.
 	 * @param container The container to set
@@ -47,7 +43,7 @@ public long getId() {
 	public void setContainer(Container container) {
 		this.container = container;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -55,7 +51,7 @@ public void setContainer(Container container) {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Returns the bag.
 	 * @return Collection
@@ -63,7 +59,7 @@ public void setId(long id) {
 	public Collection getBag() {
 		return bag;
 	}
-	
+
 	/**
 	 * Sets the bag.
 	 * @param bag The bag to set
@@ -71,7 +67,7 @@ public Collection getBag() {
 	public void setBag(Collection bag) {
 		this.bag = bag;
 	}
-	
+
 	/**
 	 * Returns the lazyBag.
 	 * @return Collection
@@ -79,7 +75,7 @@ public void setBag(Collection bag) {
 	public Collection getLazyBag() {
 		return lazyBag;
 	}
-	
+
 	/**
 	 * Sets the lazyBag.
 	 * @param lazyBag The lazyBag to set
@@ -87,11 +83,5 @@ public Collection getLazyBag() {
 	public void setLazyBag(Collection lazyBag) {
 		this.lazyBag = lazyBag;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
index f2a247740ffe..00cb75f9abc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Container.java 6844 2005-05-21 14:22:16Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
@@ -15,18 +11,18 @@
 import java.util.Set;
 
 public class Container {
-	
+
 	public static final class ContainerInnerClass {
 		private Simple simple;
 		private String name;
 		private One one;
 		private Many many;
 		private int count;
-		
+
 		public void setSimple(Simple simple) {
 			this.simple = simple;
 		}
-		
+
 		public Simple getSimple() {
 			return simple;
 		}
@@ -37,7 +33,7 @@ public Simple getSimple() {
 		public String getName() {
 			return name;
 		}
-		
+
 		/**
 		 * Sets the name.
 		 * @param name The name to set
@@ -45,15 +41,15 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 		public String toString() {
-			return name + " = " 
+			return name + " = "
 			+ (simple==null ? "nil" : Integer.toString( simple.getCount() ) )
 			+ "/" + ( one==null ? "nil" : one.getKey().toString() )
 			+ "/" + ( many==null ? "nil" : many.getKey().toString() );
 		}
-		
-		
+
+
 		/**
 		 * Returns the one.
 		 * @return One
@@ -61,7 +57,7 @@ public String toString() {
 		public One getOne() {
 			return one;
 		}
-		
+
 		/**
 		 * Sets the one.
 		 * @param one The one to set
@@ -69,7 +65,7 @@ public One getOne() {
 		public void setOne(One one) {
 			this.one = one;
 		}
-		
+
 		/**
 		 * Returns the many.
 		 * @return Many
@@ -77,7 +73,7 @@ public void setOne(One one) {
 		public Many getMany() {
 			return many;
 		}
-		
+
 		/**
 		 * Sets the many.
 		 * @param many The many to set
@@ -85,7 +81,7 @@ public Many getMany() {
 		public void setMany(Many many) {
 			this.many = many;
 		}
-		
+
 		/**
 		 * Returns the count.
 		 * @return int
@@ -101,22 +97,22 @@ public int getCount() {
 		public void setCount(int count) {
 			this.count = count;
 		}
-		
+
 		public int hashCode() {
 			return count + name.hashCode();
 		}
-		
+
 		public boolean equals(Object other) {
 			ContainerInnerClass cic = (ContainerInnerClass) other;
-			return cic.name.equals(name) 
-				&& cic.count==count 
+			return cic.name.equals(name)
+				&& cic.count==count
 				&& cic.one.getKey().equals(one.getKey())
 				&& cic.many.getKey().equals(many.getKey())
 				&& cic.simple.getCount()==simple.getCount();
 		}
 
 	}
-	
+
 	private List oneToMany;
 	private List manyToMany;
 	private List components;
@@ -127,14 +123,14 @@ public boolean equals(Object other) {
 	private Collection lazyBag = new ArrayList();
 	private Map ternaryMap;
 	private Set ternarySet;
-	
+
 	/**
 	 * Constructor for Container.
 	 */
 	public Container() {
 		super();
 	}
-	
+
 	/**
 	 * Returns the components.
 	 * @return List
@@ -142,7 +138,7 @@ public Container() {
 	public List getComponents() {
 		return components;
 	}
-	
+
 	/**
 	 * Returns the manyToMany.
 	 * @return List
@@ -150,7 +146,7 @@ public List getComponents() {
 	public List getManyToMany() {
 		return manyToMany;
 	}
-	
+
 	/**
 	 * Returns the oneToMany.
 	 * @return List
@@ -158,7 +154,7 @@ public List getManyToMany() {
 	public List getOneToMany() {
 		return oneToMany;
 	}
-	
+
 	/**
 	 * Sets the components.
 	 * @param components The components to set
@@ -166,7 +162,7 @@ public List getOneToMany() {
 	public void setComponents(List components) {
 		this.components = components;
 	}
-	
+
 	/**
 	 * Sets the manyToMany.
 	 * @param manyToMany The manyToMany to set
@@ -174,7 +170,7 @@ public void setComponents(List components) {
 	public void setManyToMany(List manyToMany) {
 		this.manyToMany = manyToMany;
 	}
-	
+
 	/**
 	 * Sets the oneToMany.
 	 * @param oneToMany The oneToMany to set
@@ -182,7 +178,7 @@ public void setManyToMany(List manyToMany) {
 	public void setOneToMany(List oneToMany) {
 		this.oneToMany = oneToMany;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return long
@@ -190,7 +186,7 @@ public void setOneToMany(List oneToMany) {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -198,7 +194,7 @@ public long getId() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Gets the composites.
 	 * @return Returns a Set
@@ -206,7 +202,7 @@ public void setId(long id) {
 	public Set getComposites() {
 		return composites;
 	}
-	
+
 	/**
 	 * Sets the composites.
 	 * @param composites The composites to set
@@ -214,7 +210,7 @@ public Set getComposites() {
 	public void setComposites(Set composites) {
 		this.composites = composites;
 	}
-	
+
 	/**
 	 * Returns the bag.
 	 * @return Collection
@@ -222,7 +218,7 @@ public void setComposites(Set composites) {
 	public Collection getBag() {
 		return bag;
 	}
-	
+
 	/**
 	 * Sets the bag.
 	 * @param bag The bag to set
@@ -230,7 +226,7 @@ public Collection getBag() {
 	public void setBag(Collection bag) {
 		this.bag = bag;
 	}
-	
+
 	/**
 	 * Returns the ternary.
 	 * @return Map
@@ -238,7 +234,7 @@ public void setBag(Collection bag) {
 	public Map getTernaryMap() {
 		return ternaryMap;
 	}
-	
+
 	/**
 	 * Sets the ternary.
 	 * @param ternary The ternary to set
@@ -246,7 +242,7 @@ public Map getTernaryMap() {
 	public void setTernaryMap(Map ternary) {
 		this.ternaryMap = ternary;
 	}
-	
+
 	public static final class Ternary {
 		private String name;
 		private Foo foo;
@@ -258,7 +254,7 @@ public static final class Ternary {
 		public Foo getFoo() {
 			return foo;
 		}
-		
+
 		/**
 		 * Returns the glarch.
 		 * @return Glarch
@@ -266,7 +262,7 @@ public Foo getFoo() {
 		public Glarch getGlarch() {
 			return glarch;
 		}
-		
+
 		/**
 		 * Returns the name.
 		 * @return String
@@ -274,7 +270,7 @@ public Glarch getGlarch() {
 		public String getName() {
 			return name;
 		}
-		
+
 		/**
 		 * Sets the foo.
 		 * @param foo The foo to set
@@ -282,7 +278,7 @@ public String getName() {
 		public void setFoo(Foo foo) {
 			this.foo = foo;
 		}
-		
+
 		/**
 		 * Sets the glarch.
 		 * @param glarch The glarch to set
@@ -290,7 +286,7 @@ public void setFoo(Foo foo) {
 		public void setGlarch(Glarch glarch) {
 			this.glarch = glarch;
 		}
-		
+
 		/**
 		 * Sets the name.
 		 * @param name The name to set
@@ -298,9 +294,9 @@ public void setGlarch(Glarch glarch) {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	}
-	
+
 	/**
 	 * Returns the ternarySet.
 	 * @return Set
@@ -308,7 +304,7 @@ public void setName(String name) {
 	public Set getTernarySet() {
 		return ternarySet;
 	}
-	
+
 	/**
 	 * Sets the ternarySet.
 	 * @param ternarySet The ternarySet to set
@@ -316,7 +312,7 @@ public Set getTernarySet() {
 	public void setTernarySet(Set ternarySet) {
 		this.ternarySet = ternarySet;
 	}
-	
+
 	/**
 	 * Returns the lazyBag.
 	 * @return Collection
@@ -324,7 +320,7 @@ public void setTernarySet(Set ternarySet) {
 	public Collection getLazyBag() {
 		return lazyBag;
 	}
-	
+
 	/**
 	 * Sets the lazyBag.
 	 * @param lazyBag The lazyBag to set
@@ -332,7 +328,7 @@ public Collection getLazyBag() {
 	public void setLazyBag(Collection lazyBag) {
 		this.lazyBag = lazyBag;
 	}
-	
+
 	/**
 	 * Returns the cascades.
 	 * @return Collection
@@ -350,9 +346,3 @@ public void setCascades(Collection cascades) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
index 09420e91089f..37db6b18da94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Custom.java 7275 2005-06-22 18:58:16Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 public class Custom implements Cloneable {
 	String id;
 	private String name;
-	
+
 	public Object clone() {
 		try {
 			return super.clone();
@@ -30,9 +26,3 @@ String getName() {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
index 09eb6c5a5a34..806ee962b3c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -874,10 +872,10 @@ public EntityRepresentationStrategy getRepresentationStrategy() {
 		return null;
 	}
 
-    @Override
-    public int[] resolveAttributeIndexes(String[] attributeNames) {
-        return null;
-    }
+	@Override
+	public int[] resolveAttributeIndexes(String[] attributeNames) {
+		return null;
+	}
 
 	@Override
 	public boolean canUseReferenceCacheEntries() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
index e07680e261ac..c3b6ce39a7d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: D.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -19,7 +15,7 @@ public D() {
 		// try to induce an infinite loop in the lazy-loading machinery
 		setAmount(100.0f);
 		getAmount();
-	}	
+	}
 
 	public D(Long id) {
 		this();
@@ -33,7 +29,7 @@ public D(Long id) {
 	public float getAmount() {
 		return amount;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return long
@@ -41,7 +37,7 @@ public float getAmount() {
 	public Long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the amount.
 	 * @param amount The amount to set
@@ -49,7 +45,7 @@ public Long getId() {
 	public void setAmount(float amount) {
 		this.amount = amount;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -57,7 +53,7 @@ public void setAmount(float amount) {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	public A getReverse() {
 		return reverse;
 	}
@@ -67,9 +63,3 @@ public void setReverse(A a) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
index 512c6e42b0c8..e500745bb85d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Detail.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
@@ -13,35 +9,35 @@
 import java.util.Set;
 
 public class Detail implements Serializable {
-	
+
 	private Root root;
 	private int i;
 	private Set details = new HashSet();
 	private int x;
-	
+
 	public int getX() {
 		return x;
 	}
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public Root getRoot() {
 		return root;
 	}
-	
+
 	public void setRoot(Root root) {
 		this.root = root;
 	}
-	
+
 	public int getI() {
 		return i;
 	}
-	
+
 	public void setI(int i) {
 		this.i = i;
 	}
-	
+
 	/**
 	 * Returns the details.
 	 * @return Set
@@ -49,7 +45,7 @@ public void setI(int i) {
 	public Set getSubDetails() {
 		return details;
 	}
-	
+
 	/**
 	 * Sets the details.
 	 * @param details The details to set
@@ -57,11 +53,5 @@ public Set getSubDetails() {
 	public void setSubDetails(Set details) {
 		this.details = details;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
index ac82df7f30c3..147044d442a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Down.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java
index 8082623c0048..bf7896498f4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -11,16 +9,16 @@
  */
 public class Drug extends Resource {
 
-   String id;
+String id;
 
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
index 71f6e3fe57d5..67b09d7d4275 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: E.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.Set;
@@ -22,7 +18,7 @@ public class E {
 	public float getAmount() {
 		return amount;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return long
@@ -30,7 +26,7 @@ public float getAmount() {
 	public Long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the amount.
 	 * @param amount The amount to set
@@ -38,7 +34,7 @@ public Long getId() {
 	public void setAmount(float amount) {
 		this.amount = amount;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -46,7 +42,7 @@ public void setAmount(float amount) {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	public A getReverse() {
 		return reverse;
 	}
@@ -70,9 +66,3 @@ public void setAs(Set as) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
index db33692a3061..2a9e5eeeaa07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Eye.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
index b47dba76e7e5..0c26c3d1835b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Fee.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
@@ -20,66 +16,66 @@ public class Fee implements Serializable {
 	private Qux qux;
 	private FooComponent compon;
 	private int count;
-	
+
 	public Fee() {
 	}
 
 	public Fee getFee() {
 		return fee;
 	}
-	
+
 	public void setFee(Fee fee) {
 		this.fee = fee;
 	}
-	
+
 	public String getFi() {
 		return fi;
 	}
-	
+
 	public void setFi(String fi) {
 		this.fi = fi;
 	}
-	
+
 	public String getKey() {
 		return key;
 	}
-	
+
 	public void setKey(String key) {
 		this.key = key;
 	}
-	
+
 	public Set getFees() {
 		return fees;
 	}
-	
+
 	public void setFees(Set fees) {
 		this.fees = fees;
 	}
-	
+
 	public Fee getAnotherFee() {
 		return anotherFee;
 	}
-	
+
 	public void setAnotherFee(Fee anotherFee) {
 		this.anotherFee = anotherFee;
 	}
-	
+
 	public Qux getQux() {
 		return qux;
 	}
-	
+
 	public void setQux(Qux qux) {
 		this.qux = qux;
 	}
-	
+
 	public FooComponent getCompon() {
 		return compon;
 	}
-	
+
 	public void setCompon(FooComponent compon) {
 		this.compon = compon;
 	}
-	
+
 	/**
 	 * Returns the count.
 	 * @return int
@@ -97,9 +93,3 @@ public void setCount(int count) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
index cbc5de0e930f..f85704e9b6b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Fixed.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
index cf91bba87d65..c81ff187e6f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Fo.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 public final class Fo {
-	
+
 	public static Fo newFo(FumCompositeID id) {
 		Fo fo = newFo();
 		fo.id = id;
@@ -20,7 +16,7 @@ public static Fo newFo(FumCompositeID id) {
 	public static Fo newFo() {
 		return new Fo();
 	}
-	
+
 	private Fo() {}
 
 	private FumCompositeID id;
@@ -43,39 +39,32 @@ public int getX() {
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public byte[] getBuf() {
 		return buf;
 	}
-	
-	
+
+
 	public Serializable getSerial() {
 		return serial;
 	}
-	
-	
+
+
 	public void setBuf(byte[] buf) {
 		this.buf = buf;
 	}
-	
-	
+
+
 	public void setSerial(Serializable serial) {
 		this.serial = serial;
 	}
-	
+
 	public long getVersion() {
 		return version;
 	}
-	
+
 	public void setVersion(long version) {
 		this.version = version;
 	}
-	
-}
-
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
index f2b2f23ad23b..4391066377d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Foo.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -429,8 +425,3 @@ public void setJoinedProp(String joinedProp) {
 	}
 
 }
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
index 9583fa6940a3..6c7733d3099d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: FooComponent.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Date;
 
 public class FooComponent implements Serializable {
-	
+
 	int count;
 	String name;
 	Date[] importantDates;
@@ -20,16 +16,16 @@ public class FooComponent implements Serializable {
 	GlarchProxy glarch;
 	private FooProxy parent;
 	private Baz baz;
-	
+
 	public boolean equals(Object that) {
 		FooComponent fc = (FooComponent) that;
 		return count==fc.count;
 	}
-	
+
 	public int hashCode() {
 		return count;
 	}
-	
+
 	public String toString() {
 		String result = "FooComponent: " + name + "=" + count;
 		result+="; dates=[";
@@ -44,16 +40,16 @@ public String toString() {
 		}
 		return result;
 	}
-	
+
 	public FooComponent() {}
-	
+
 	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent) {
 		this.name = name;
 		this.count = count;
 		this.importantDates = dates;
 		this.subcomponent = subcomponent;
 	}
-	
+
 	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent, Fee fee) {
 		this.name = name;
 		this.count = count;
@@ -61,35 +57,35 @@ public FooComponent() {}
 		this.subcomponent = subcomponent;
 		this.fee = fee;
 	}
-	
+
 	public int getCount() {
 		return count;
 	}
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Date[] getImportantDates() {
 		return importantDates;
 	}
 	public void setImportantDates(Date[] importantDates) {
 		this.importantDates = importantDates;
 	}
-	
+
 	public FooComponent getSubcomponent() {
 		return subcomponent;
 	}
 	public void setSubcomponent(FooComponent subcomponent) {
 		this.subcomponent = subcomponent;
 	}
-	
+
 	private String getNull() {
 		return null;
 	}
@@ -99,41 +95,34 @@ private void setNull(String str) throws Exception {
 	public Fee getFee() {
 		return fee;
 	}
-	
+
 	public void setFee(Fee fee) {
 		this.fee = fee;
 	}
-	
+
 	public GlarchProxy getGlarch() {
 		return glarch;
 	}
-	
+
 	public void setGlarch(GlarchProxy glarch) {
 		this.glarch = glarch;
 	}
-	
+
 	public FooProxy getParent() {
 		return parent;
 	}
-	
+
 	public void setParent(FooProxy parent) {
 		//if (parent==null) throw new RuntimeException("null parent set");
 		this.parent = parent;
 	}
-	
+
 	public Baz getBaz() {
 		return baz;
 	}
-	
+
 	public void setBaz(Baz baz) {
 		this.baz = baz;
 	}
-	
-}
-
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
index 5a5c5a8cc481..5182e50884e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -61,9 +59,3 @@ public interface FooProxy {
 	public Fee getDependent();
 	public float getFormula();
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
index 58115171771f..726ebbb26e7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Fum.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.sql.SQLException;
@@ -182,10 +178,3 @@ public void setMapComponent(MapComponent mapComponent) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
index 775493ae0c58..71d60d17ba70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: FumCompositeID.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -33,10 +29,3 @@ public void setShort(short short_) {
 		this.short_ = short_;
 	}
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
index ccf239b2367d..9becc89700d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
@@ -1,29 +1,25 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Fumm.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.Locale;
 
 public class Fumm {
-	
+
 	private Locale locale;
 	private Fum fum;
-	
+
 	public FumCompositeID getId() {
 		return fum.getId();
 	}
 	public void setId(FumCompositeID id) {
 	}
-	
+
 	public Fumm() {
 		super();
 	}
-	
+
 	/**
 	 * Returns the fum.
 	 * @return Fum
@@ -31,7 +27,7 @@ public Fumm() {
 	public Fum getFum() {
 		return fum;
 	}
-	
+
 	/**
 	 * Returns the locale.
 	 * @return Locale
@@ -39,7 +35,7 @@ public Fum getFum() {
 	public Locale getLocale() {
 		return locale;
 	}
-	
+
 	/**
 	 * Sets the fum.
 	 * @param fum The fum to set
@@ -47,7 +43,7 @@ public Locale getLocale() {
 	public void setFum(Fum fum) {
 		this.fum = fum;
 	}
-	
+
 	/**
 	 * Sets the locale.
 	 * @param locale The locale to set
@@ -55,11 +51,5 @@ public void setFum(Fum fum) {
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
index 7077a27c0de8..8c9ca4594f88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Glarch.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -198,10 +194,3 @@ public String getName() {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
index d6e31900b1df..219c8963becb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.util.List;
@@ -10,45 +8,38 @@
 import java.util.Set;
 
 public interface GlarchProxy {
-	
+
 	public int getVersion();
 	public int getDerivedVersion();
 	public void setVersion(int version);
-	
+
 	public String getName();
 	public void setName(String name);
-	
+
 	public GlarchProxy getNext();
 	public void setNext(GlarchProxy next);
-	
+
 	public short getOrder();
 	public void setOrder(short order);
-	
+
 	public List getStrings();
 	public void setStrings(List strings);
-	
+
 	public Map getDynaBean();
 	public void setDynaBean(Map bean);
-	
+
 	public Map getStringSets();
 	public void setStringSets(Map stringSets);
-	
+
 	public List getFooComponents();
 	public void setFooComponents(List fooComponents);
-	
+
 	public GlarchProxy[] getProxyArray();
 	public void setProxyArray(GlarchProxy[] proxyArray);
-	
+
 	public Set getProxySet();
 	public void setProxySet(Set proxySet);
-	
+
 	public Object getAny();
 	public void setAny(Object any);
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
index 7df9022f973e..6daf03f54e6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Holder.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
@@ -17,13 +13,13 @@ public class Holder implements Named {
 	private Set foos;
 	private String name;
 	private Holder otherHolder;
-	
+
 	public Holder() {
 	}
 	public Holder(String name) {
 		this.name=name;
 	}
-	
+
 	/**
 	 * Returns the fooArray.
 	 * @return Foo[]
@@ -31,7 +27,7 @@ public Holder(String name) {
 	public Foo[] getFooArray() {
 		return fooArray;
 	}
-	
+
 	/**
 	 * Returns the foos.
 	 * @return Set
@@ -39,7 +35,7 @@ public Foo[] getFooArray() {
 	public Set getFoos() {
 		return foos;
 	}
-	
+
 	/**
 	 * Sets the fooArray.
 	 * @param fooArray The fooArray to set
@@ -47,7 +43,7 @@ public Set getFoos() {
 	public void setFooArray(Foo[] fooArray) {
 		this.fooArray = fooArray;
 	}
-	
+
 	/**
 	 * Sets the foos.
 	 * @param foos The foos to set
@@ -55,7 +51,7 @@ public void setFooArray(Foo[] fooArray) {
 	public void setFoos(Set foos) {
 		this.foos = foos;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return String
@@ -63,7 +59,7 @@ public void setFoos(Set foos) {
 	public String getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -71,7 +67,7 @@ public String getId() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Returns the name.
 	 * @return String
@@ -79,7 +75,7 @@ public void setId(String id) {
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Sets the name.
 	 * @param name The name to set
@@ -87,7 +83,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	/**
 	 * Returns the ones.
 	 * @return List
@@ -95,7 +91,7 @@ public void setName(String name) {
 	public List getOnes() {
 		return ones;
 	}
-	
+
 	/**
 	 * Sets the ones.
 	 * @param ones The ones to set
@@ -103,7 +99,7 @@ public List getOnes() {
 	public void setOnes(List ones) {
 		this.ones = ones;
 	}
-	
+
 	public Holder getOtherHolder() {
 		return otherHolder;
 	}
@@ -113,9 +109,3 @@ public void setOtherHolder(Holder holder) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
index 54eabf485e69..2d9bd091bd75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: I.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -17,11 +13,11 @@ public class I {
 	private String name;
 	private char type;
 	private K parent;
-	
+
 	public K getParent() {
 		return parent;
 	}
-	
+
 	public void setParent(K parent) {
 		this.parent = parent;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
index 909e3dcd1c70..f0caa58753af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Immutable.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -13,35 +9,29 @@ public class Immutable {
 	private String foo;
 	private String bar;
 	private String id;
-	
+
 	public String getFoo() {
 		return foo;
 	}
-	
+
 	public void setFoo(String foo) {
 		this.foo = foo;
 	}
-	
+
 	public String getBar() {
 		return bar;
 	}
-	
+
 	public void setBar(String bar) {
 		this.bar = bar;
 	}
-	
+
 	public String getId() {
 		return id;
 	}
-	
+
 	public void setId(String id) {
 		this.id = id;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
index ce5514b94cc9..4ef85f2cc725 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
index 361e6c73d9c3..0671d181255c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
index 4aba74d83206..dd94f1ddd8df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,26 +10,26 @@
  */
 public class Intervention {
 
-   String id;
-   long version;
+String id;
+long version;
 
-   String description;
+String description;
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
-  long getVersion() {
-    return version;
-  }
+long getVersion() {
+	return version;
+}
 
-  void  setVersion(long newValue) {
-    version = newValue;
-  }
+void  setVersion(long newValue) {
+	version = newValue;
+}
 
 
 public String getDescription() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
index 414c5e4cc710..3a0e2a806f99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: J.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
index 6e153747dc33..35d86e712a7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Jay.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -42,9 +38,9 @@ public long getId() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	public Jay() {}
-	
+
 	public Jay(Eye eye) {
 		eye.getJays().add(this);
 		this.eye = eye;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
index b107aac51f93..196a211da996 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: K.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
index c754f3a1ed67..9946718f4836 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Location.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Locale;
@@ -17,7 +13,7 @@ public class Location implements Serializable {
 	private String countryCode;
 	private Locale locale;
 	private String description;
-	
+
 	/**
 	 * Returns the countryCode.
 	 * @return String
@@ -25,7 +21,7 @@ public class Location implements Serializable {
 	public String getCountryCode() {
 		return countryCode;
 	}
-	
+
 	/**
 	 * Returns the description.
 	 * @return String
@@ -33,7 +29,7 @@ public String getCountryCode() {
 	public String getDescription() {
 		return description;
 	}
-	
+
 	/**
 	 * Returns the locale.
 	 * @return Locale
@@ -41,7 +37,7 @@ public String getDescription() {
 	public Locale getLocale() {
 		return locale;
 	}
-	
+
 	/**
 	 * Returns the streetName.
 	 * @return String
@@ -49,7 +45,7 @@ public Locale getLocale() {
 	public String getStreetName() {
 		return streetName;
 	}
-	
+
 	/**
 	 * Returns the streetNumber.
 	 * @return int
@@ -57,7 +53,7 @@ public String getStreetName() {
 	public int getStreetNumber() {
 		return streetNumber;
 	}
-	
+
 	/**
 	 * Sets the countryCode.
 	 * @param countryCode The countryCode to set
@@ -65,7 +61,7 @@ public int getStreetNumber() {
 	public void setCountryCode(String countryCode) {
 		this.countryCode = countryCode;
 	}
-	
+
 	/**
 	 * Sets the description.
 	 * @param description The description to set
@@ -73,7 +69,7 @@ public void setCountryCode(String countryCode) {
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	
+
 	/**
 	 * Sets the locale.
 	 * @param locale The locale to set
@@ -81,7 +77,7 @@ public void setDescription(String description) {
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
-	
+
 	/**
 	 * Sets the streetName.
 	 * @param streetName The streetName to set
@@ -89,7 +85,7 @@ public void setLocale(Locale locale) {
 	public void setStreetName(String streetName) {
 		this.streetName = streetName;
 	}
-	
+
 	/**
 	 * Sets the streetNumber.
 	 * @param streetNumber The streetNumber to set
@@ -97,7 +93,7 @@ public void setStreetName(String streetName) {
 	public void setStreetNumber(int streetNumber) {
 		this.streetNumber = streetNumber;
 	}
-	
+
 	/**
 	 * Returns the city.
 	 * @return String
@@ -105,7 +101,7 @@ public void setStreetNumber(int streetNumber) {
 	public String getCity() {
 		return city;
 	}
-	
+
 	/**
 	 * Sets the city.
 	 * @param city The city to set
@@ -113,7 +109,7 @@ public String getCity() {
 	public void setCity(String city) {
 		this.city = city;
 	}
-	
+
 	public boolean equals(Object other) {
 		Location l = (Location) other;
 		return l.getCity().equals(city) && l.getStreetName().equals(streetName) && l.getCountryCode().equals(countryCode) && l.getStreetNumber()==streetNumber;
@@ -121,11 +117,5 @@ public boolean equals(Object other) {
 	public int hashCode() {
 		return streetName.hashCode();
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
index 51fe7d32bd23..4f018b274e46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Lower.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
@@ -26,7 +22,7 @@ public class Lower extends Top {
 	public int getIntprop() {
 		return intprop;
 	}
-	
+
 	/**
 	 * Sets the intprop.
 	 * @param intprop The intprop to set
@@ -34,7 +30,7 @@ public int getIntprop() {
 	public void setIntprop(int intprop) {
 		this.intprop = intprop;
 	}
-	
+
 	/**
 	 * Returns the foo.
 	 * @return String
@@ -42,7 +38,7 @@ public void setIntprop(int intprop) {
 	public String getFoo() {
 		return foo;
 	}
-	
+
 	/**
 	 * Sets the foo.
 	 * @param foo The foo to set
@@ -50,7 +46,7 @@ public String getFoo() {
 	public void setFoo(String foo) {
 		this.foo = foo;
 	}
-	
+
 	/**
 	 * Returns the set.
 	 * @return Set
@@ -58,7 +54,7 @@ public void setFoo(String foo) {
 	public Set getSet() {
 		return set;
 	}
-	
+
 	/**
 	 * Sets the set.
 	 * @param set The set to set
@@ -66,7 +62,7 @@ public Set getSet() {
 	public void setSet(Set set) {
 		this.set = set;
 	}
-	
+
 	/**
 	 * Returns the another.
 	 * @return Simple
@@ -74,7 +70,7 @@ public void setSet(Set set) {
 	public Top getAnother() {
 		return another;
 	}
-	
+
 	/**
 	 * Returns the yetanother.
 	 * @return LessSimple
@@ -82,7 +78,7 @@ public Top getAnother() {
 	public Lower getYetanother() {
 		return yetanother;
 	}
-	
+
 	/**
 	 * Sets the another.
 	 * @param another The another to set
@@ -90,7 +86,7 @@ public Lower getYetanother() {
 	public void setAnother(Top another) {
 		this.another = another;
 	}
-	
+
 	/**
 	 * Sets the yetanother.
 	 * @param yetanother The yetanother to set
@@ -98,7 +94,7 @@ public void setAnother(Top another) {
 	public void setYetanother(Lower yetanother) {
 		this.yetanother = yetanother;
 	}
-	
+
 	/**
 	 * Returns the bag.
 	 * @return List
@@ -106,7 +102,7 @@ public void setYetanother(Lower yetanother) {
 	public List getBag() {
 		return bag;
 	}
-	
+
 	/**
 	 * Sets the bag.
 	 * @param bag The bag to set
@@ -114,7 +110,7 @@ public List getBag() {
 	public void setBag(List bag) {
 		this.bag = bag;
 	}
-	
+
 	/**
 	 * Returns the mypo.
 	 * @return Po
@@ -122,7 +118,7 @@ public void setBag(List bag) {
 	public Po getMypo() {
 		return mypo;
 	}
-	
+
 	/**
 	 * Sets the mypo.
 	 * @param mypo The mypo to set
@@ -130,11 +126,5 @@ public Po getMypo() {
 	public void setMypo(Po mypo) {
 		this.mypo = mypo;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
index 8bf39e96d91b..8ba554739e1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
index b1f9aaf49081..98176e487ce6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Many.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -13,33 +9,27 @@ public class Many {
 	Long key;
 	One one;
 	private int x;
-	
+
 	public int getX() {
 		return x;
 	}
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public void setKey(Long key) {
 		this.key = key;
 	}
-	
+
 	public Long getKey() {
 		return this.key;
 	}
-	
+
 	public void setOne(One one) {
 		this.one = one;
 	}
-	
+
 	public One getOne() {
 		return this.one;
 	}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java
index 05d5fefcff96..ec4d98573443 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,16 +10,16 @@
  */
 public class Medication extends Intervention {
 
-   Drug prescribedDrug;
+Drug prescribedDrug;
 
-  
-  Drug getPrescribedDrug() {
-    return prescribedDrug;
-  }
 
-  void  setPrescribedDrug(Drug newValue) {
-    prescribedDrug = newValue;
-  }
+Drug getPrescribedDrug() {
+	return prescribedDrug;
+}
+
+void  setPrescribedDrug(Drug newValue) {
+	prescribedDrug = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
index e16fd430aec6..851deef58f34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
index e09b689d0e81..693fd09e3169 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
index c968e29a0f0a..7f63557066b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Mono.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 
 public class Mono extends Top {
-	
+
 	private Set strings;
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
index 22900a38be77..3592112d52a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: MoreStuff.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Collection;
@@ -16,15 +12,15 @@ public class MoreStuff implements Serializable {
 	private int intId;
 	private Collection stuffs;
 	private String name;
-	
+
 	public boolean equals(Object other) {
 		return ( (MoreStuff) other ).getIntId()==intId && ( (MoreStuff) other ).getStringId().equals(stringId);
 	}
-	
+
 	public int hashCode() {
 		return stringId.hashCode();
 	}
-	
+
 	/**
 	 * Returns the stuffs.
 	 * @return Collection
@@ -32,7 +28,7 @@ public int hashCode() {
 	public Collection getStuffs() {
 		return stuffs;
 	}
-	
+
 	/**
 	 * Sets the stuffs.
 	 * @param stuffs The stuffs to set
@@ -40,7 +36,7 @@ public Collection getStuffs() {
 	public void setStuffs(Collection stuffs) {
 		this.stuffs = stuffs;
 	}
-	
+
 	/**
 	 * Returns the name.
 	 * @return String
@@ -48,7 +44,7 @@ public void setStuffs(Collection stuffs) {
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Sets the name.
 	 * @param name The name to set
@@ -56,7 +52,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	/**
 	 * Returns the intId.
 	 * @return int
@@ -64,7 +60,7 @@ public void setName(String name) {
 	public int getIntId() {
 		return intId;
 	}
-	
+
 	/**
 	 * Returns the stringId.
 	 * @return String
@@ -72,7 +68,7 @@ public int getIntId() {
 	public String getStringId() {
 		return stringId;
 	}
-	
+
 	/**
 	 * Sets the intId.
 	 * @param intId The intId to set
@@ -80,7 +76,7 @@ public String getStringId() {
 	public void setIntId(int intId) {
 		this.intId = intId;
 	}
-	
+
 	/**
 	 * Sets the stringId.
 	 * @param stringId The stringId to set
@@ -88,11 +84,5 @@ public void setIntId(int intId) {
 	public void setStringId(String stringId) {
 		this.stringId = stringId;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
index 7efde0b0f439..9d50ea6281c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
@@ -1,29 +1,25 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Multi.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.Calendar;
 
 
 public class Multi extends Top {
-	
+
 	/**
 	 * Constructor for Multi.
 	 */
 	public Multi() {
 		super();
 	}
-	
+
 	private String extraProp;
 	private String derived;
 	private Component comp;
 	private Po po;
-	
+
 	/**
 	 * Returns the extraProp.
 	 * @return String
@@ -31,7 +27,7 @@ public Multi() {
 	public String getExtraProp() {
 		return extraProp;
 	}
-	
+
 	/**
 	 * Sets the extraProp.
 	 * @param extraProp The extraProp to set
@@ -39,7 +35,7 @@ public String getExtraProp() {
 	public void setExtraProp(String extraProp) {
 		this.extraProp = extraProp;
 	}
-	
+
 	public static final class Component {
 		private Calendar cal;
 		private Float floaty;
@@ -50,7 +46,7 @@ public static final class Component {
 		public Calendar getCal() {
 			return cal;
 		}
-		
+
 		/**
 		 * Sets the cal.
 		 * @param cal The cal to set
@@ -58,7 +54,7 @@ public Calendar getCal() {
 		public void setCal(Calendar cal) {
 			this.cal = cal;
 		}
-		
+
 		/**
 		 * Returns the floaty.
 		 * @return Float
@@ -66,7 +62,7 @@ public void setCal(Calendar cal) {
 		public Float getFloaty() {
 			return floaty;
 		}
-		
+
 		/**
 		 * Sets the floaty.
 		 * @param floaty The floaty to set
@@ -74,9 +70,9 @@ public Float getFloaty() {
 		public void setFloaty(Float floaty) {
 			this.floaty = floaty;
 		}
-		
+
 	}
-	
+
 	/**
 	 * Returns the comp.
 	 * @return Component
@@ -84,7 +80,7 @@ public void setFloaty(Float floaty) {
 	public Component getComp() {
 		return comp;
 	}
-	
+
 	/**
 	 * Sets the comp.
 	 * @param comp The comp to set
@@ -92,7 +88,7 @@ public Component getComp() {
 	public void setComp(Component comp) {
 		this.comp = comp;
 	}
-	
+
 	/**
 	 * Returns the po.
 	 * @return Po
@@ -100,7 +96,7 @@ public void setComp(Component comp) {
 	public Po getPo() {
 		return po;
 	}
-	
+
 	/**
 	 * Sets the po.
 	 * @param po The po to set
@@ -108,7 +104,7 @@ public Po getPo() {
 	public void setPo(Po po) {
 		this.po = po;
 	}
-	
+
 	public String getDerived() {
 		return derived;
 	}
@@ -118,9 +114,3 @@ public void setDerived(String derived) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
index 6352b2c36f8f..9fed812a55e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Multiplicity.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
index 5b8e9554045a..75fda8309afa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Nameable.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -18,9 +14,3 @@ public interface Nameable {
 	public Long getKey();
 	public void setKey(Long key);
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
index ab9dc7ddf047..684b5864ece2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Named.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -13,9 +9,3 @@
 public interface Named {
 	public String getName();
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
index d9697af5f88d..786c096216b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
index 4ecf43a07c3f..699e61f61c59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -72,7 +70,7 @@ public void testMetaInheritance() {
 		assertThat( metaAttribute.getValues().get( 0 ), is( "java.lang.Observer" ) );
 		assertThat( metaAttribute.getValues().get( 1 ), is( "java.lang.Observer" ) );
 		assertThat( metaAttribute.getValues().get( 2 ), is( "org.foo.BogusVisitor" ) );
-				
+
 		/*Property property = cm.getIdentifierProperty();
 		property.getMetaAttribute(null);*/
 
@@ -115,7 +113,7 @@ public void testNonMutatedInheritance() {
 		MetaAttribute metaAttribute = cm.getMetaAttribute( "globalmutated" );
 
 		assertNotNull( metaAttribute );
-		/*assertEquals( metaAttribute.getValues().size(), 2 );		
+		/*assertEquals( metaAttribute.getValues().size(), 2 );
 		assertEquals( "top level", metaAttribute.getValues().get(0) );*/
 		assertThat( metaAttribute.getValue(), is( "wicked level" ) );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
index 3fac930a84c4..8794fe8e3ad5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
@@ -1,16 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
 
 /**
- * 
+ *
  * @author Wolfgang Voelkl
- * 
+ *
  */
 public class Object2 {
 	private Long id;
@@ -24,7 +22,7 @@ public Long getId() {
 	public void setId(Long l) {
 		this.id = l;
 	}
-	
+
 	public String getDummy() {
 		return dummy;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
index 8e63cf9a1f26..9fbed817f8aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: One.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
@@ -14,42 +10,36 @@ public class One {
 	String value;
 	Set manies;
 	private int x;
-	
+
 	public int getX() {
 		return x;
 	}
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public void setKey(Long key) {
 		this.key = key;
 	}
-	
+
 	public Long getKey() {
 		return this.key;
 	}
-	
+
 	public void setValue(String value) {
 		this.value = value;
 	}
-	
+
 	public String getValue() {
 		return this.value;
 	}
-	
+
 	public Set getManies() {
 		return manies;
 	}
-	
+
 	public void setManies(Set manies) {
 		this.manies = manies;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
index 4faaa53b428d..c81de04b0a26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
index 75174991c04b..0122963a5a64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
index d7e10dcf2e06..96549a348876 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Parent.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -15,43 +11,43 @@ public class Parent {
 	private Child child;
 	private Object any;
 	private int x;
-	
+
 	public int getX() {
 		return x;
 	}
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public int getCount() {
 		return count;
 	}
-	
-	
+
+
 	public long getId() {
 		return id;
 	}
-	
-	
+
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
-	
+
+
 	public void setId(long id) {
 		this.id = id;
 	}
-	
-	
+
+
 	public Child getChild() {
 		return child;
 	}
-	
-	
+
+
 	public void setChild(Child child) {
 		this.child = child;
 	}
-	
+
 	public Object getAny() {
 		return any;
 	}
@@ -61,10 +57,3 @@ public void setAny(Object any) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
index 976d12b8a801..421b2d232561 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Part.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -16,7 +12,7 @@ public class Part {
 
 	private Long id;
 	private String description;
-	
+
 	public String getDescription() {
 		return description;
 	}
@@ -32,7 +28,7 @@ public void setDescription(String string) {
 	public void setId(Long long1) {
 		id = long1;
 	}
-	
+
 	public static class SpecialPart extends Part {}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
index dd50d89107bb..3c1b74ef344c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,34 +10,34 @@
  */
 public class Party {
 
-   String id;
-   String name;
-   String address;
+String id;
+String name;
+String address;
 
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
-  String getName() {
-    return name;
-  }
+String getName() {
+	return name;
+}
 
-  void  setName(String newValue) {
-    name = newValue;
-  }
+void  setName(String newValue) {
+	name = newValue;
+}
 
-  String getAddress() {
-    return address;
-  }
+String getAddress() {
+	return address;
+}
 
-  void  setAddress(String newValue) {
-    address = newValue;
-  }
+void  setAddress(String newValue) {
+	address = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java
index e1edd78dd42b..0d4e3c4915e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,43 +10,43 @@
  */
 public class Person extends Party {
 
-   String id;
-   String givenName;
-   String lastName;
-   String nationalID;
+String id;
+String givenName;
+String lastName;
+String nationalID;
 
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
-  String getGivenName() {
-    return givenName;
-  }
+String getGivenName() {
+	return givenName;
+}
 
-  void  setGivenName(String newValue) {
-    givenName = newValue;
-  }
+void  setGivenName(String newValue) {
+	givenName = newValue;
+}
 
-  String getLastName() {
-    return lastName;
-  }
+String getLastName() {
+	return lastName;
+}
 
-  void  setLastName(String newValue) {
-    lastName = newValue;
-  }
+void  setLastName(String newValue) {
+	lastName = newValue;
+}
 
-  String getNationalID() {
-    return nationalID;
-  }
+String getNationalID() {
+	return nationalID;
+}
 
-  void  setNationalID(String newValue) {
-    nationalID = newValue;
-  }
+void  setNationalID(String newValue) {
+	nationalID = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
index e39924d48925..4a979bcdbca8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Po.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
@@ -28,7 +24,7 @@ public class Po {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the value.
 	 * @return String
@@ -36,7 +32,7 @@ public long getId() {
 	public String getValue() {
 		return value;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -44,7 +40,7 @@ public String getValue() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the value.
 	 * @param value The value to set
@@ -52,7 +48,7 @@ public void setId(long id) {
 	public void setValue(String value) {
 		this.value = value;
 	}
-	
+
 	/**
 	 * Returns the set.
 	 * @return Set
@@ -60,7 +56,7 @@ public void setValue(String value) {
 	public Set getSet() {
 		return set;
 	}
-	
+
 	/**
 	 * Sets the set.
 	 * @param set The set to set
@@ -68,7 +64,7 @@ public Set getSet() {
 	public void setSet(Set set) {
 		this.set = set;
 	}
-	
+
 	/**
 	 * Returns the list.
 	 * @return List
@@ -76,7 +72,7 @@ public void setSet(Set set) {
 	public List getList() {
 		return list;
 	}
-	
+
 	/**
 	 * Sets the list.
 	 * @param list The list to set
@@ -84,7 +80,7 @@ public List getList() {
 	public void setList(List list) {
 		this.list = list;
 	}
-	
+
 	public Lower getLower() {
 		return lower;
 	}
@@ -102,9 +98,3 @@ public void setTop(Top top) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
index b3fbc40841b4..cbc33602028f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Qux.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.sql.SQLException;
 import java.util.List;
@@ -176,10 +172,3 @@ public void setHolder(Holder holder) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
index 2c2cc45f33e1..69712f77b564 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -12,34 +10,34 @@
  */
 public class Resource {
 
-   String id;
-   String name;
-   String userCode;
+String id;
+String name;
+String userCode;
 
 
-  String getId() {
-    return id;
-  }
+String getId() {
+	return id;
+}
 
-  void  setId(String newValue) {
-    id = newValue;
-  }
+void  setId(String newValue) {
+	id = newValue;
+}
 
-  String getName() {
-    return name;
-  }
+String getName() {
+	return name;
+}
 
-  void  setName(String newValue) {
-    name = newValue;
-  }
+void  setName(String newValue) {
+	name = newValue;
+}
 
-  String getUserCode() {
-    return userCode;
-  }
+String getUserCode() {
+	return userCode;
+}
 
-  void  setUserCode(String newValue) {
-    userCode = newValue;
-  }
+void  setUserCode(String newValue) {
+	userCode = newValue;
+}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
index f8dea7cca1ed..0c727ba146cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -59,13 +57,13 @@ public void setCount(long count) {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Result(String n, long a, int c) {
 		name = n;
 		amount = a;
 		count = c;
 	}
-	
+
 	public Result(String n, long a, long c) {
 		name = n;
 		amount = a;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
index 2f1f6196805d..18d2ee090842 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: ReverseComparator.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Comparator;
@@ -14,19 +10,13 @@ public final class ReverseComparator implements Comparator, Serializable {
 	public int compare(Object x, Object y) {
 		return - ( (Comparable) x ).compareTo(y);
 	}
-	
+
 	public boolean equals(Object obj) {
 		return obj instanceof ReverseComparator;
 	}
-	
+
 	public int hashCode() {
 		return 0;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
index 31112b641aee..cb9fe2b87e60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.util.HashSet;
@@ -14,40 +12,40 @@
  */
 public class Role {
 
-   long id;
-   String name;
-   Set interventions = new HashSet();
+long id;
+String name;
+Set interventions = new HashSet();
 private List bunchOfStrings;
 
-  long getId() {
-    return id;
-  }
-
-  void  setId(long newValue) {
-    id = newValue;
-  }
-
-  String getName() {
-    return name;
-  }
-
-  void  setName(String newValue) {
-    name = newValue;
-  }
-
-  public Set getInterventions() {
-  	return interventions;
-  }
-  
-  public void setInterventions(Set iv) {
-  	interventions = iv;
-  }
-
-  List getBunchOfStrings() {
-  	return bunchOfStrings;
-  }
-  
-  void setBunchOfStrings(List s) {
-  	bunchOfStrings = s;
-  }
+long getId() {
+	return id;
+}
+
+void  setId(long newValue) {
+	id = newValue;
+}
+
+String getName() {
+	return name;
+}
+
+void  setName(String newValue) {
+	name = newValue;
+}
+
+public Set getInterventions() {
+	return interventions;
+}
+
+public void setInterventions(Set iv) {
+	interventions = iv;
+}
+
+List getBunchOfStrings() {
+	return bunchOfStrings;
+}
+
+void setBunchOfStrings(List s) {
+	bunchOfStrings = s;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java
index 9d647b567b1d..0ab9b83b59ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -45,87 +43,87 @@ public int getX() {
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public Set getDetails() {
 		return details;
 	}
-	
+
 	private void setDetails(Set details) {
 		this.details = details;
 	}
-	
+
 	public void addDetail(Detail d) {
 		details.add(d);
 	}
-	
+
 	public void removeDetail(Detail d) {
 		details.remove(d);
 	}
-	
+
 	public void addIncoming(Root m) {
 		incoming.add(m);
 	}
-	
+
 	public void removeIncoming(Root m) {
 		incoming.remove(m);
 	}
-	
+
 	public void addOutgoing(Root m) {
 		outgoing.add(m);
 	}
-	
+
 	public void removeOutgoing(Root m) {
 		outgoing.remove(m);
 	}
-	
+
 	public Set getIncoming() {
 		return incoming;
 	}
-	
+
 	public void setIncoming(Set incoming) {
 		this.incoming = incoming;
 	}
-	
+
 	public Set getOutgoing() {
 		return outgoing;
 	}
-	
+
 	public void setOutgoing(Set outgoing) {
 		this.outgoing = outgoing;
 	}
-	
+
 	public Set getMoreDetails() {
 		return moreDetails;
 	}
-	
+
 	public void setMoreDetails(Set moreDetails) {
 		this.moreDetails = moreDetails;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Date getStamp() {
 		return stamp;
 	}
-	
+
 	public void setStamp(Date stamp) {
 		this.stamp = stamp;
 	}
-	
+
 	public BigDecimal getBigDecimal() {
 		return bigDecimal;
 	}
-	
+
 	public void setBigDecimal(BigDecimal bigDecimal) {
 		this.bigDecimal = bigDecimal;
 	}
-	
+
 	/**
 	 * @return
 	 */
@@ -153,9 +151,3 @@ public void setAllDetails(Collection allDetails) {
 		this.allDetails = allDetails;
 	}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
index 00b1ec36f93f..3e6a404ba025 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: S.java 4599 2004-09-26 05:18:27Z oneovthafew $
-
 package org.hibernate.orm.test.legacy;
 
 
@@ -18,7 +13,7 @@ public S(int countArg, String addressArg) {
 		count = countArg;
 		address = addressArg;
 	}
-	
+
 	/**
 	 * Gets the address
 	 * @return Returns a String
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
index 48e9367166ff..3fbc3f7b95c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Several.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
@@ -22,7 +18,7 @@ public class Several implements Serializable {
 	public String getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the prop.
 	 * @return String
@@ -30,7 +26,7 @@ public String getId() {
 	public String getProp() {
 		return prop;
 	}
-	
+
 	/**
 	 * Returns the single.
 	 * @return Single
@@ -38,7 +34,7 @@ public String getProp() {
 	public Single getSingle() {
 		return single;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -46,7 +42,7 @@ public Single getSingle() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the prop.
 	 * @param prop The prop to set
@@ -54,7 +50,7 @@ public void setId(String id) {
 	public void setProp(String prop) {
 		this.prop = prop;
 	}
-	
+
 	/**
 	 * Sets the single.
 	 * @param single The single to set
@@ -62,7 +58,7 @@ public void setProp(String prop) {
 	public void setSingle(Single single) {
 		this.single = single;
 	}
-	
+
 	/**
 	 * Returns the string.
 	 * @return String
@@ -70,7 +66,7 @@ public void setSingle(Single single) {
 	public String getString() {
 		return string;
 	}
-	
+
 	/**
 	 * Sets the string.
 	 * @param string The string to set
@@ -78,19 +74,13 @@ public String getString() {
 	public void setString(String string) {
 		this.string = string;
 	}
-	
+
 	/*public boolean equals(Object other) {
 		return ( (Several) other ).id.equals(id) && ( (Several) other ).string.equals(string);
 	}
-	
+
 	public int hashCode() {
 		return id.hashCode();
 	}*/
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
index 13d685194ecf..5ccd50a114ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -140,10 +138,3 @@ public void setOther(Simple other) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
index 204be36e6b07..be91485972cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Single.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Collection;
@@ -24,7 +20,7 @@ public class Single implements Serializable {
 	public String getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the prop.
 	 * @return String
@@ -32,7 +28,7 @@ public String getId() {
 	public String getProp() {
 		return prop;
 	}
-	
+
 	/**
 	 * Returns the several.
 	 * @return Set
@@ -40,7 +36,7 @@ public String getProp() {
 	public Collection getSeveral() {
 		return several;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -48,7 +44,7 @@ public Collection getSeveral() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the prop.
 	 * @param prop The prop to set
@@ -56,7 +52,7 @@ public void setId(String id) {
 	public void setProp(String prop) {
 		this.prop = prop;
 	}
-	
+
 	/**
 	 * Sets the several.
 	 * @param several The several to set
@@ -64,7 +60,7 @@ public void setProp(String prop) {
 	public void setSeveral(Collection several) {
 		this.several = several;
 	}
-	
+
 	/**
 	 * Returns the string.
 	 * @return String
@@ -72,7 +68,7 @@ public void setSeveral(Collection several) {
 	public String getString() {
 		return string;
 	}
-	
+
 	/**
 	 * Sets the string.
 	 * @param string The string to set
@@ -80,20 +76,14 @@ public String getString() {
 	public void setString(String string) {
 		this.string = string;
 	}
-	
+
 	/*public boolean equals(Object other) {
 		if ( !(other instanceof Single) ) return false;
 		return ( (Single) other ).id.equals(id) && ( (Single) other ).string.equals(string);
 	}
-	
+
 	public int hashCode() {
 		return id.hashCode();
 	}*/
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
index fc7ba0b17d6a..bd97bc083652 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
@@ -1,22 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
 
 public class Sortable implements Comparable {
-	
+
 	private int id;
 	private String name;
-	
+
 	private Sortable() {}
 	Sortable(String name) {
 		this.name = name;
 	}
-	
+
 	public int compareTo(Object o) {
 		return name.compareTo( ( (Sortable) o).name );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
index a4d8db6eab22..51c6c58b3fa6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
index ca48443871dd..bcd9c378782c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
@@ -1,27 +1,23 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Stuff.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.TimeZone;
 
 public class Stuff implements Serializable {
-	
+
 	public int hashCode() {
 		return new Long(id).hashCode();
 	}
-	
+
 	public boolean equals(Object other) {
 		if ( ! (other instanceof Stuff) ) return false;
 		Stuff otherStuff = (Stuff) other;
 		return otherStuff.getId()==id && otherStuff.getFoo().getKey().equals( foo.getKey() ) && otherStuff.getMoreStuff().equals(moreStuff);
 	}
-	
+
 	private long id;
 	private FooProxy foo;
 	private MoreStuff moreStuff;
@@ -33,7 +29,7 @@ public boolean equals(Object other) {
 	public FooProxy getFoo() {
 		return foo;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return long
@@ -41,7 +37,7 @@ public FooProxy getFoo() {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the property.
 	 * @return TimeZone
@@ -49,7 +45,7 @@ public long getId() {
 	public TimeZone getProperty() {
 		return property;
 	}
-	
+
 	/**
 	 * Sets the foo.
 	 * @param foo The foo to set
@@ -57,7 +53,7 @@ public TimeZone getProperty() {
 	public void setFoo(FooProxy foo) {
 		this.foo = foo;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -65,7 +61,7 @@ public void setFoo(FooProxy foo) {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the property.
 	 * @param property The property to set
@@ -73,7 +69,7 @@ public void setId(long id) {
 	public void setProperty(TimeZone property) {
 		this.property = property;
 	}
-	
+
 	/**
 	 * Returns the moreStuff.
 	 * @return MoreStuff
@@ -81,7 +77,7 @@ public void setProperty(TimeZone property) {
 	public MoreStuff getMoreStuff() {
 		return moreStuff;
 	}
-	
+
 	/**
 	 * Sets the moreStuff.
 	 * @param moreStuff The moreStuff to set
@@ -89,11 +85,5 @@ public MoreStuff getMoreStuff() {
 	public void setMoreStuff(MoreStuff moreStuff) {
 		this.moreStuff = moreStuff;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
index f0d57673189a..13ce66202f16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
@@ -1,49 +1,45 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SubComponent.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 /**
  * Sub component
- * 
+ *
  * @author emmanuel
  */
 public class SubComponent {
-    private String _subName;
-    
-    private String _subName1;
-    
-    /**
-     * @return
-     */
-    public String getSubName() {
-        return _subName;
-    }
+	private String _subName;
+
+	private String _subName1;
+
+	/**
+	 * @return
+	 */
+	public String getSubName() {
+		return _subName;
+	}
 
-    /**
-     * @param string
-     */
-    public void setSubName(String string) {
-        _subName = string;
-    }
+	/**
+	 * @param string
+	 */
+	public void setSubName(String string) {
+		_subName = string;
+	}
 
-    /**
-     * @return
-     */
-    public String getSubName1() {
-        return _subName1;
-    }
+	/**
+	 * @return
+	 */
+	public String getSubName1() {
+		return _subName1;
+	}
 
-    /**
-     * @param string
-     */
-    public void setSubName1(String string) {
-        _subName1 = string;
-    }
+	/**
+	 * @param string
+	 */
+	public void setSubName1(String string) {
+		_subName1 = string;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
index 6eee38a4b597..445a30d2d275 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SubDetail.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
@@ -19,7 +15,7 @@ public class SubDetail {
 	public long getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Returns the name.
 	 * @return String
@@ -27,7 +23,7 @@ public long getId() {
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -35,7 +31,7 @@ public String getName() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Sets the name.
 	 * @param name The name to set
@@ -43,11 +39,5 @@ public void setId(long id) {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
index d4feb99c849d..4ad53646edbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SubMulti.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.List;
 
@@ -21,7 +17,7 @@ public class SubMulti extends Multi {
 	public float getAmount() {
 		return amount;
 	}
-	
+
 	/**
 	 * Sets the amount.
 	 * @param amount The amount to set
@@ -29,7 +25,7 @@ public float getAmount() {
 	public void setAmount(float amount) {
 		this.amount = amount;
 	}
-	
+
 	/**
 	 * Returns the childen.
 	 * @return List
@@ -37,7 +33,7 @@ public void setAmount(float amount) {
 	public List getChildren() {
 		return children;
 	}
-	
+
 	/**
 	 * Returns the parent.
 	 * @return SubMulti
@@ -45,7 +41,7 @@ public List getChildren() {
 	public SubMulti getParent() {
 		return parent;
 	}
-	
+
 	/**
 	 * Sets the childen.
 	 * @param childen The childen to set
@@ -53,7 +49,7 @@ public SubMulti getParent() {
 	public void setChildren(List children) {
 		this.children = children;
 	}
-	
+
 	/**
 	 * Sets the parent.
 	 * @param parent The parent to set
@@ -61,7 +57,7 @@ public void setChildren(List children) {
 	public void setParent(SubMulti parent) {
 		this.parent = parent;
 	}
-	
+
 	/**
 	 * Returns the moreChildren.
 	 * @return List
@@ -79,9 +75,3 @@ public void setMoreChildren(List moreChildren) {
 	}
 
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
index ed08aba9c404..929655b6c3e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -17,6 +15,6 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
index 48da82319a42..050a7cd2fe34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Top.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.legacy;
 
 
@@ -17,14 +13,14 @@ public class Top {
 	private java.util.Date date;
 	private Top other;
 	private Top top;
-	
+
 	public Top(int c) {
 		count=c;
 	}
 
 	public Top() {
 	}
-	
+
 	public void init() {
 		name="Someone With Along Name";
 		address="1234 Some Street, Some City, Victoria, 3000, Austraya";
@@ -45,7 +41,7 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	/**
 	 * Gets the address
 	 * @return Returns a String
@@ -60,7 +56,7 @@ public String getAddress() {
 	public void setAddress(String address) {
 		this.address = address;
 	}
-	
+
 	/**
 	 * Gets the count
 	 * @return Returns a int
@@ -75,7 +71,7 @@ public int getCount() {
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	/**
 	 * Gets the date
 	 * @return Returns a java.util.Date
@@ -90,7 +86,7 @@ public java.util.Date getDate() {
 	public void setDate(java.util.Date date) {
 		this.date = date;
 	}
-	
+
 	/**
 	 * Returns the other.
 	 * @return Simple
@@ -98,7 +94,7 @@ public void setDate(java.util.Date date) {
 	public Top getOther() {
 		return other;
 	}
-	
+
 	/**
 	 * Sets the other.
 	 * @param other The other to set
@@ -106,7 +102,7 @@ public Top getOther() {
 	public void setOther(Top other) {
 		this.other = other;
 	}
-	
+
 	public long getId() {
 		return id;
 	}
@@ -116,10 +112,3 @@ public void setId(long l) {
 	}
 
 }
-
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
index 9101f0cd442e..12a15f81125e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
@@ -1,21 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Trivial.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
 
 public class Trivial extends Foo {
-	
-}
-
-
-
-
-
 
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
index 5d3e28b1b823..845f8382ed1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: TrivialClass.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
index 88981eb9f341..592228ffbcb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
index 4356e4c04ce3..ebd6ad388b76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Up.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
@@ -32,7 +28,7 @@ public void setId1(String string) {
 	public void setId2(long l) {
 		id2 = l;
 	}
-	
+
 	public boolean equals(Object other) {
 		if ( !(other instanceof Up) ) return false;
 		Up that = (Up) other;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
index 0fc46da0fcfc..6737296882af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Vetoer.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 
 import org.hibernate.CallbackException;
@@ -65,9 +61,3 @@ public boolean onDelete(Session s) throws CallbackException {
 
 	public void onLoad(Session s, Object id) {}
 }
-
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
index 1b54d5045998..c718be8bef0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
@@ -1,19 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 public class W {
-	
+
 	private long id;
 	private Set zeds;
-	
+
 	/**
-	 * 
+	 *
 	 */
 	public W() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
index 49eed37b8d3b..42a2d71645cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: X.java 4599 2004-09-26 05:18:27Z oneovthafew $
 package org.hibernate.orm.test.legacy;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +44,7 @@ public void setId(long id) {
 	public void setY(Y y) {
 		this.y = y;
 	}
-	
+
 	public List getXxs() {
 		return xxs;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
index 94de526c7f80..aebf8983107b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
index 714657cc3c1b..1d2d28a78719 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.legacy;
 
@@ -13,7 +11,7 @@ public class Z {
 	private W w;
 
 	/**
-	 * 
+	 *
 	 */
 	public Z() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/length/BinaryLengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/length/BinaryLengthTest.java
index 72eeaed6235f..f73e54bd470c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/length/BinaryLengthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/length/BinaryLengthTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.length;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -10,23 +14,23 @@
 @SessionFactory
 @DomainModel(annotatedClasses = WithLongByteArrays.class)
 public class BinaryLengthTest {
-    @Test
-    public void testLength(SessionFactoryScope scope) {
-        WithLongByteArrays arrays = new WithLongByteArrays();
-        arrays.longish = "hello world ".repeat(2500).getBytes();
-        arrays.long16 = "hello world ".repeat(2700).getBytes();
-        arrays.long32 = "hello world ".repeat(20000).getBytes();
-        // This is an important test that it's possible to handle
-        // very long binary types in a way that's portable across
-        // both Postgres (bytea) and other databases (blob)
-        arrays.lob = "hello world ".repeat(40000).getBytes();
-        scope.inTransaction(s -> s.persist(arrays));
-        scope.inTransaction(s -> {
-            WithLongByteArrays arrs = s.find(WithLongByteArrays.class, arrays.id);
-            assertArrayEquals(arrs.longish, arrays.longish);
-            assertArrayEquals(arrs.long16, arrays.long16);
-            assertArrayEquals(arrs.long32, arrays.long32);
-            assertArrayEquals(arrs.lob, arrays.lob);
-        });
-    }
+	@Test
+	public void testLength(SessionFactoryScope scope) {
+		WithLongByteArrays arrays = new WithLongByteArrays();
+		arrays.longish = "hello world ".repeat(2500).getBytes();
+		arrays.long16 = "hello world ".repeat(2700).getBytes();
+		arrays.long32 = "hello world ".repeat(20000).getBytes();
+		// This is an important test that it's possible to handle
+		// very long binary types in a way that's portable across
+		// both Postgres (bytea) and other databases (blob)
+		arrays.lob = "hello world ".repeat(40000).getBytes();
+		scope.inTransaction(s -> s.persist(arrays));
+		scope.inTransaction(s -> {
+			WithLongByteArrays arrs = s.find(WithLongByteArrays.class, arrays.id);
+			assertArrayEquals(arrs.longish, arrays.longish);
+			assertArrayEquals(arrs.long16, arrays.long16);
+			assertArrayEquals(arrs.long32, arrays.long32);
+			assertArrayEquals(arrs.lob, arrays.lob);
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/length/LengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/length/LengthTest.java
index d1aba0d93c2c..6f69290c6705 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/length/LengthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/length/LengthTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.length;
 
 import org.hibernate.Length;
@@ -15,49 +19,49 @@
 @SessionFactory
 @DomainModel(annotatedClasses = {WithLongStrings.class,WithLongTypeStrings.class})
 public class LengthTest {
-    @Test
-    public void testLength(SessionFactoryScope scope) {
-        WithLongStrings strings = new WithLongStrings();
-        strings.longish = "hello world ".repeat(2500);
-        strings.long16 = "hello world ".repeat(2700);
-        strings.long32 = "hello world ".repeat(20000);
-        strings.clob = "hello world ".repeat(40000);
-        scope.inTransaction(s -> s.persist(strings));
-        scope.inTransaction(s -> {
-            WithLongStrings strs = s.find(WithLongStrings.class, strings.id);
-            assertEquals(strs.longish, strings.longish);
-            assertEquals(strs.long16, strings.long16);
-            assertEquals(strs.long32, strings.long32);
-            assertEquals(strs.clob, strings.clob);
-        });
-    }
+	@Test
+	public void testLength(SessionFactoryScope scope) {
+		WithLongStrings strings = new WithLongStrings();
+		strings.longish = "hello world ".repeat(2500);
+		strings.long16 = "hello world ".repeat(2700);
+		strings.long32 = "hello world ".repeat(20000);
+		strings.clob = "hello world ".repeat(40000);
+		scope.inTransaction(s -> s.persist(strings));
+		scope.inTransaction(s -> {
+			WithLongStrings strs = s.find(WithLongStrings.class, strings.id);
+			assertEquals(strs.longish, strings.longish);
+			assertEquals(strs.long16, strings.long16);
+			assertEquals(strs.long32, strings.long32);
+			assertEquals(strs.clob, strings.clob);
+		});
+	}
 
-    @Test
-    public void testSqlType(SessionFactoryScope scope) {
-        WithLongTypeStrings strings = new WithLongTypeStrings();
-        strings.longish = "hello world ".repeat(2500);
-        strings.long32 = "hello world ".repeat(20000);
-        scope.inTransaction(s -> s.persist(strings));
-        scope.inTransaction(s -> {
-            WithLongTypeStrings strs = s.find(WithLongTypeStrings.class, strings.id);
-            assertEquals(strs.longish, strings.longish);
-            assertEquals(strs.long32, strings.long32);
-        });
-    }
+	@Test
+	public void testSqlType(SessionFactoryScope scope) {
+		WithLongTypeStrings strings = new WithLongTypeStrings();
+		strings.longish = "hello world ".repeat(2500);
+		strings.long32 = "hello world ".repeat(20000);
+		scope.inTransaction(s -> s.persist(strings));
+		scope.inTransaction(s -> {
+			WithLongTypeStrings strs = s.find(WithLongTypeStrings.class, strings.id);
+			assertEquals(strs.longish, strings.longish);
+			assertEquals(strs.long32, strings.long32);
+		});
+	}
 
-    @Test
-    public void testLong32(SessionFactoryScope scope) {
-        final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
-        final BasicValuedMapping mapping = (BasicValuedMapping) scope.getSessionFactory()
-                .getRuntimeMetamodels()
-                .getMappingMetamodel()
-                .getEntityDescriptor( WithLongStrings.class )
-                .findAttributeMapping( "long32" );
-        if ( dialect.useMaterializedLobWhenCapacityExceeded() && Length.LONG32 > dialect.getMaxVarcharCapacity() ) {
-            assertEquals( SqlTypes.CLOB, mapping.getJdbcMapping().getJdbcType().getJdbcTypeCode() );
-        }
-        else {
-            assertEquals( SqlTypes.VARCHAR, mapping.getJdbcMapping().getJdbcType().getJdbcTypeCode() );
-        }
-    }
+	@Test
+	public void testLong32(SessionFactoryScope scope) {
+		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
+		final BasicValuedMapping mapping = (BasicValuedMapping) scope.getSessionFactory()
+				.getRuntimeMetamodels()
+				.getMappingMetamodel()
+				.getEntityDescriptor( WithLongStrings.class )
+				.findAttributeMapping( "long32" );
+		if ( dialect.useMaterializedLobWhenCapacityExceeded() && Length.LONG32 > dialect.getMaxVarcharCapacity() ) {
+			assertEquals( SqlTypes.CLOB, mapping.getJdbcMapping().getJdbcType().getJdbcTypeCode() );
+		}
+		else {
+			assertEquals( SqlTypes.VARCHAR, mapping.getJdbcMapping().getJdbcType().getJdbcTypeCode() );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongByteArrays.java b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongByteArrays.java
index e31ab5e924c4..4f0f8b1f0207 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongByteArrays.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongByteArrays.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.length;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongStrings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongStrings.java
index 9f48caeec4f6..79fc0e3d658d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongStrings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongStrings.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.length;
 
 import jakarta.persistence.Column;
@@ -9,19 +13,19 @@
 
 @Entity
 public class WithLongStrings {
-    @Id
-    @GeneratedValue
-    public int id;
+	@Id
+	@GeneratedValue
+	public int id;
 
-    @Column(length = LONG)
-    public String longish;
+	@Column(length = LONG)
+	public String longish;
 
-    @Column(length = LONG16)
-    public String long16;
+	@Column(length = LONG16)
+	public String long16;
 
-    @Column(length = LONG32)
-    public String long32;
+	@Column(length = LONG32)
+	public String long32;
 
-    @Column(length = LOB_DEFAULT+1)
-    public String clob;
+	@Column(length = LOB_DEFAULT+1)
+	public String clob;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongTypeStrings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongTypeStrings.java
index 2c0c7d089129..43d59dfa9d89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongTypeStrings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/length/WithLongTypeStrings.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.length;
 
 import jakarta.persistence.Entity;
@@ -8,13 +12,13 @@
 
 @Entity
 public class WithLongTypeStrings {
-    @Id
-    @GeneratedValue
-    public int id;
+	@Id
+	@GeneratedValue
+	public int id;
 
-    @JdbcTypeCode(SqlTypes.LONGVARCHAR)
-    public String longish;
+	@JdbcTypeCode(SqlTypes.LONGVARCHAR)
+	public String longish;
 
-    @JdbcTypeCode(SqlTypes.LONG32VARCHAR)
-    public String long32;
+	@JdbcTypeCode(SqlTypes.LONG32VARCHAR)
+	public String long32;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java
index 523e5d1b2731..11402b9a5db2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.limit;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/HqlSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/HqlSelectTest.java
index 4636ba3102be..43d2122af5b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/HqlSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/HqlSelectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loaders;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/SqlSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/SqlSelectTest.java
index 2ae2a871327c..992ce2fa1e08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/SqlSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loaders/SqlSelectTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loaders;
 
 import jakarta.persistence.CollectionTable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java
index b68a4a501a6d..dc431d6810b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/EntityLoadingLoggingTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java
index 327d97bb8337..c25d02d85dd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java
index 50cc1d81d8f0..861ec9d22a4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loading;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
index 558690293857..121d63a68213 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
index 19eda50fa669..177871f21cdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/PreLoadEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/PreLoadEventTest.java
index 5f19083b2af8..2165e79c829c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/PreLoadEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/PreLoadEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java
index 4e73bdfbe054..81bba02286b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loading;
 
 import java.util.Collections;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllFetchProfileTest.java
index 77b54a654aba..2b892e6a164f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllFetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllFetchProfileTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loading.multiLoad;
 
 import jakarta.persistence.Entity;
@@ -23,58 +27,58 @@
 @SessionFactory
 @DomainModel(annotatedClasses = {FindAllFetchProfileTest.Record.class, FindAllFetchProfileTest.Owner.class})
 public class FindAllFetchProfileTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction(s-> {
-            Owner gavin = new Owner("gavin");
-            s.persist(gavin);
-            s.persist(new Record(123L,gavin,"hello earth"));
-            s.persist(new Record(456L,gavin,"hello mars"));
-        });
-        scope.inTransaction(s-> {
-            List all = s.findAll(Record.class, List.of(456L, 123L, 2L));
-            assertEquals("hello mars",all.get(0).message);
-            assertEquals("hello earth",all.get(1).message);
-            assertNull(all.get(2));
-            assertFalse(Hibernate.isInitialized(all.get(0).owner));
-            assertFalse(Hibernate.isInitialized(all.get(1).owner));
-        });
-        scope.inTransaction(s-> {
-            List all = s.findAll(Record.class, List.of(456L, 123L),
-                    new EnabledFetchProfile("withOwner"));
-            assertEquals("hello mars",all.get(0).message);
-            assertEquals("hello earth",all.get(1).message);
-            assertTrue(Hibernate.isInitialized(all.get(0).owner));
-            assertTrue(Hibernate.isInitialized(all.get(1).owner));
-        });
-    }
-    @Entity
-    @FetchProfile(name = "withOwner")
-    static class Record {
-        @Id Long id;
-        String message;
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction(s-> {
+			Owner gavin = new Owner("gavin");
+			s.persist(gavin);
+			s.persist(new Record(123L,gavin,"hello earth"));
+			s.persist(new Record(456L,gavin,"hello mars"));
+		});
+		scope.inTransaction(s-> {
+			List all = s.findAll(Record.class, List.of(456L, 123L, 2L));
+			assertEquals("hello mars",all.get(0).message);
+			assertEquals("hello earth",all.get(1).message);
+			assertNull(all.get(2));
+			assertFalse(Hibernate.isInitialized(all.get(0).owner));
+			assertFalse(Hibernate.isInitialized(all.get(1).owner));
+		});
+		scope.inTransaction(s-> {
+			List all = s.findAll(Record.class, List.of(456L, 123L),
+					new EnabledFetchProfile("withOwner"));
+			assertEquals("hello mars",all.get(0).message);
+			assertEquals("hello earth",all.get(1).message);
+			assertTrue(Hibernate.isInitialized(all.get(0).owner));
+			assertTrue(Hibernate.isInitialized(all.get(1).owner));
+		});
+	}
+	@Entity
+	@FetchProfile(name = "withOwner")
+	static class Record {
+		@Id Long id;
+		String message;
 
-        @FetchProfileOverride(profile = "withOwner")
-        @ManyToOne(fetch = FetchType.LAZY)
-        Owner owner;
+		@FetchProfileOverride(profile = "withOwner")
+		@ManyToOne(fetch = FetchType.LAZY)
+		Owner owner;
 
-        Record(Long id, Owner owner, String message) {
-            this.id = id;
-            this.owner = owner;
-            this.message = message;
-        }
+		Record(Long id, Owner owner, String message) {
+			this.id = id;
+			this.owner = owner;
+			this.message = message;
+		}
 
-        Record() {
-        }
-    }
-    @Entity
-    static class Owner {
-        @Id String name;
+		Record() {
+		}
+	}
+	@Entity
+	static class Owner {
+		@Id String name;
 
-        Owner(String name) {
-            this.name = name;
-        }
+		Owner(String name) {
+			this.name = name;
+		}
 
-        Owner() {
-        }
-    }
+		Owner() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllTest.java
index c4368bc9be9c..c10e69448b5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindAllTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loading.multiLoad;
 
 import jakarta.persistence.Entity;
@@ -18,41 +22,41 @@
 @SessionFactory
 @DomainModel(annotatedClasses = FindAllTest.Record.class)
 public class FindAllTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inTransaction(s-> {
-            s.persist(new Record(123L,"hello earth"));
-            s.persist(new Record(456L,"hello mars"));
-        });
-        scope.inTransaction(s-> {
-            List all = s.findAll(Record.class, List.of(456L, 123L, 2L));
-            assertEquals("hello mars",all.get(0).message);
-            assertEquals("hello earth",all.get(1).message);
-            assertNull(all.get(2));
-        });
-        scope.inTransaction(s-> {
-            List all = s.findAll(Record.class, List.of(456L, 123L), READ_ONLY);
-            assertEquals("hello mars",all.get(0).message);
-            assertEquals("hello earth",all.get(1).message);
-            assertTrue(s.isReadOnly(all.get(0)));
-            assertTrue(s.isReadOnly(all.get(1)));
-        });
-        scope.inTransaction(s-> {
-            Record record = s.getReference(Record.class, 456L);
-            List all = s.findAll(Record.class, List.of(456L, 123L));
-            assertSame(record, all.get(0));
-        });
-    }
-    @Entity
-    static class Record {
-        @Id Long id;
-        String message;
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction(s-> {
+			s.persist(new Record(123L,"hello earth"));
+			s.persist(new Record(456L,"hello mars"));
+		});
+		scope.inTransaction(s-> {
+			List all = s.findAll(Record.class, List.of(456L, 123L, 2L));
+			assertEquals("hello mars",all.get(0).message);
+			assertEquals("hello earth",all.get(1).message);
+			assertNull(all.get(2));
+		});
+		scope.inTransaction(s-> {
+			List all = s.findAll(Record.class, List.of(456L, 123L), READ_ONLY);
+			assertEquals("hello mars",all.get(0).message);
+			assertEquals("hello earth",all.get(1).message);
+			assertTrue(s.isReadOnly(all.get(0)));
+			assertTrue(s.isReadOnly(all.get(1)));
+		});
+		scope.inTransaction(s-> {
+			Record record = s.getReference(Record.class, 456L);
+			List all = s.findAll(Record.class, List.of(456L, 123L));
+			assertSame(record, all.get(0));
+		});
+	}
+	@Entity
+	static class Record {
+		@Id Long id;
+		String message;
 
-        Record(Long id, String message) {
-            this.id = id;
-            this.message = message;
-        }
+		Record(Long id, String message) {
+			this.id = id;
+			this.message = message;
+		}
 
-        Record() {
-        }
-    }
+		Record() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java
index ce2d998215c7..359c3e90e976 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSecondLlvCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSecondLlvCacheTest.java
index f29d70701658..8cad8b690dfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSecondLlvCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSecondLlvCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSingleEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSingleEventTest.java
index bf3c78c77a20..f304ca9b5f61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSingleEventTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSingleEventTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java
index a0d3484d43cb..7ebe47ab4836 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.loading.multiLoad;
 
 import java.util.ArrayList;
@@ -13,7 +17,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
-import org.hibernate.loader.ast.internal.MultiKeyLoadHelper;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java
index f4e42367e393..397e7715f985 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java
index 0ad5ada88cfd..886f26dfaed1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
@@ -24,7 +22,6 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -646,8 +643,8 @@ public void testMultiLoadClearsBatchFetchQueue(SessionFactoryScope scope) {
 
 					assertEquals( 56, list.size() );
 					assertFalse( session.getPersistenceContext()
-										 .getBatchFetchQueue()
-										 .containsEntityKey( entityKey ) );
+										.getBatchFetchQueue()
+										.containsEntityKey( entityKey ) );
 
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java
index b7d145cfaa14..4dd0f547a8e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
 import java.sql.Blob;
 import java.util.Arrays;
 
-import org.hibernate.Hibernate;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.dialect.SybaseDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java
index 8c748cfe4975..4e466586fb4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ImageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ImageTest.java
index 68e4e002eb78..4796e45d92b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ImageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ImageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java
index 43b7e8ea2e86..3cf64f23e1ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
@@ -12,16 +10,13 @@
 import java.util.Random;
 
 import org.hibernate.LobHelper;
-import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.H2Dialect;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueEntity.java
index ce4108e00765..91dad190a53b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java
index 886f3db77375..5b18fa9c6cab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
index dae0fed7ef82..bd21cc81bb54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
@@ -20,27 +18,27 @@
 @Entity
 public class LobEntity {
 	public static final int BLOB_LENGTH = 100000000;
-    private Long id;
+	private Long id;
 
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
+	@Id
+	@GeneratedValue
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    @Lob
-    @Column(length = BLOB_LENGTH)
-    private Blob blob;
+	@Lob
+	@Column(length = BLOB_LENGTH)
+	private Blob blob;
 
-    public Blob getBlob() {
-        return blob;
-    }
+	public Blob getBlob() {
+		return blob;
+	}
 
-    public void setBlob(Blob blob) {
-        this.blob = blob;
-    }
+	public void setBlob(Blob blob) {
+		this.blob = blob;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobHolder.java
index 92888c9b8e32..250f21668a52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 import java.sql.Blob;
@@ -18,7 +16,7 @@
  * {@link #blobLocator} is used to hold BLOB data that is materialized lazily
  * via a JDBC BLOB locator; it is mapped via the
  * {@link org.hibernate.type.StandardBasicTypes#BLOB}
- * 
+ *
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java
index 0772cedc63e1..618032ab8ef3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java
index b0b578c859e4..375b4631a947 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
index 52c6e4b8b376..5edc18af5b41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
@@ -11,14 +9,12 @@
 import java.sql.SQLException;
 import java.util.List;
 
-import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.hibernate.testing.orm.junit.RequiresDialects;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -31,7 +27,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-import jakarta.persistence.Tuple;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayHolder.java
index 8b0f0ae10eaa..7c98b3cd34a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayHolder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.lob;
 
 
@@ -14,7 +9,7 @@
  * An entity containing data that is materialized into a byte array immediately.
  * The hibernate type mapped for {@link #longByteArray} determines the SQL type
  * asctually used.
- * 
+ *
  * @author Gail Badner
  */
 public class LongByteArrayHolder {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java
index d0880c9c0f81..4a5074933d13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringHolder.java
index 066188b6a123..a34f4c52510d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringHolder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.lob;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java
index a3484430b219..538b97450048 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedBlobTest.java
index 7e8d07ab255e..dae2c6bdba49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedBlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedBlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedClobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedClobTest.java
index 172618661c56..b1bfcd556ece 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedClobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/MaterializedClobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
index 1273a013cd89..64ea54ae2456 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
@@ -34,7 +32,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java
index ea8eaacce4b4..390c554137c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: SerializableData.java 4704 2004-11-04 21:59:22Z steveebersole $
 package org.hibernate.orm.test.lob;
 import java.io.Serializable;
 
@@ -16,20 +12,20 @@
  */
 public class SerializableData implements Serializable
 {
-   private String payload;
+private String payload;
 
-   public SerializableData(String payload)
-   {
-      this.payload = payload;
-   }
+public SerializableData(String payload)
+{
+	this.payload = payload;
+}
 
-   public String getPayload()
-   {
-      return payload;
-   }
+public String getPayload()
+{
+	return payload;
+}
 
-   public void setPayload(String payload)
-   {
-      this.payload = payload;
-   }
+public void setPayload(String payload)
+{
+	this.payload = payload;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableHolder.java
index 4ca19a0aa641..5e6efd61425d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableHolder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.lob;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java
index 9fc3cccbe037..90af3c2742cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/TextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/TextTest.java
index e88fa0525cb4..e6ddba0b789f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/TextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/TextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java
index 6e451e06e56e..f9b3173c0b1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java
index 506a81d7c3fb..e0870eb9ae95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import java.util.Arrays;
@@ -197,7 +201,7 @@ private List nextFiveBatchJobs(Session session, Integer maxResult) {
 				"select j from BatchJob j", BatchJob.class )
 				.setMaxResults( maxResult )
 				.unwrap( Query.class );
-		
+
 		applySkipLocked(query);
 
 		return query.list();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CompositeIdBatchDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CompositeIdBatchDeletionTest.java
index daf9fc2cfa43..53ad786af990 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CompositeIdBatchDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CompositeIdBatchDeletionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/EmbeddableWithManyToManyAndOptimistickLockingDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/EmbeddableWithManyToManyAndOptimistickLockingDeletionTest.java
index 38ea8ef8fb47..0079f62f83d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/EmbeddableWithManyToManyAndOptimistickLockingDeletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/EmbeddableWithManyToManyAndOptimistickLockingDeletionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
index d87537296ba6..431772d13622 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java
index 4df00277f460..205acb64ce6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java
index 86bbbc4a77ed..2382abc1083b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockExistingBytecodeProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockExistingBytecodeProxyTest.java
index 42e45b78e23c..690d9ec43aa6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockExistingBytecodeProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockExistingBytecodeProxyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
index fe96b777e581..2ec53da24f0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
@@ -221,15 +219,15 @@ public void testRefreshLockedEntity() {
 	@JiraKey(value = "HHH-12257")
 	public void testRefreshWithExplicitLowerLevelLockMode() {
 		doInHibernate( this::sessionFactory, session -> {
-						   A a = session.get( A.class, id, LockMode.PESSIMISTIC_READ );
-						   checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
-						   session.refresh( a, LockMode.READ );
-						   checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
-						   session.refresh( a, LockModeType.READ );
-						   checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
-						   session.refresh( a, LockModeType.READ, Collections.emptyMap() );
-						   checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
-					   } );
+						A a = session.get( A.class, id, LockMode.PESSIMISTIC_READ );
+						checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
+						session.refresh( a, LockMode.READ );
+						checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
+						session.refresh( a, LockModeType.READ );
+						checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
+						session.refresh( a, LockModeType.READ, Collections.emptyMap() );
+						checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
+					} );
 	}
 
 
@@ -238,13 +236,13 @@ public void testRefreshWithExplicitLowerLevelLockMode() {
 	@SkipForDialect( dialectClass = CockroachDialect.class )
 	public void testRefreshWithExplicitHigherLevelLockMode1() {
 		doInHibernate( this::sessionFactory, session -> {
-						   A a = session.get( A.class, id );
-						   checkLockMode( a, LockMode.READ, session );
-						   session.refresh( a, LockMode.UPGRADE_NOWAIT );
-						   checkLockMode( a, LockMode.UPGRADE_NOWAIT, session );
-						   session.refresh( a, LockModeType.PESSIMISTIC_WRITE, Collections.emptyMap() );
-						   checkLockMode( a, LockMode.PESSIMISTIC_WRITE, session );
-					   } );
+						A a = session.get( A.class, id );
+						checkLockMode( a, LockMode.READ, session );
+						session.refresh( a, LockMode.UPGRADE_NOWAIT );
+						checkLockMode( a, LockMode.UPGRADE_NOWAIT, session );
+						session.refresh( a, LockModeType.PESSIMISTIC_WRITE, Collections.emptyMap() );
+						checkLockMode( a, LockMode.PESSIMISTIC_WRITE, session );
+					} );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
index 2dd59f56a60c..342f4020df55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.Hibernate;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
index 25f62e1dcc80..c8fd6bc869c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
-import java.util.List;
 
 import org.hibernate.Hibernate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java
index 84b7ab08a320..f0150834d3bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
index 62763467a42e..97289f363a8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
index 006865240519..55b71071165c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeAllTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeAllTest.java
index d4a5c67d3646..b6bb13980960 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeAllTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeAllTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeDirtyTest.java
index 86f36f850598..f4b97f60f628 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeDirtyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTypeDirtyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingInstantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingInstantTest.java
index 721d30ee5907..7d17163eedba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingInstantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingInstantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTest.java
index fcbcd50abece..43e1b6a55f08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTimestampTest.java
index 76197e4dfb45..43317984340a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockingTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticReadSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticReadSkipLockedTest.java
index d2d0716ceaca..1d1a3f06bfdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticReadSkipLockedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticReadSkipLockedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
index daa615210546..f12935884e1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.LockMode;
@@ -66,7 +70,7 @@ public void testNoWait()
 			.unwrap( Query.class )
 			.setLockOptions(
 				new LockOptions( LockMode.PESSIMISTIC_WRITE )
-		 	.setTimeOut( LockOptions.NO_WAIT ) )
+			.setTimeOut( LockOptions.NO_WAIT ) )
 			.list();
 
 			String lockingQuery = sqlStatementInterceptor.getSqlQueries().getLast();
@@ -92,7 +96,7 @@ public void testSkipLocked()
 			.unwrap( Query.class )
 			.setLockOptions(
 				new LockOptions( LockMode.PESSIMISTIC_WRITE )
-		 	.setTimeOut( LockOptions.SKIP_LOCKED ) )
+			.setTimeOut( LockOptions.SKIP_LOCKED ) )
 			.list();
 
 			String lockingQuery = sqlStatementInterceptor.getSqlQueries().getLast();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteSkipLockedTest.java
index ffac603f7bde..30ad7e50c485 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteSkipLockedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteSkipLockedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java
index 4f278ea0b193..e37a78cf2950 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import java.util.Collection;
@@ -20,7 +24,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java
index 5513de0b5ce6..76a0b90b6f3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeSkipLockedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking;
 
 import org.hibernate.LockMode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/VersionSourceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/VersionSourceTest.java
index ebe8ebeb2c46..fe88d5c3fae7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/VersionSourceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/VersionSourceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/AdvancedFollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/AdvancedFollowOnLockingTest.java
index e16c0ea7629d..9b2208dd5af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/AdvancedFollowOnLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/AdvancedFollowOnLockingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.locking.jpa;
 
 import org.hibernate.dialect.SQLServerDialect;
@@ -56,9 +60,9 @@ public void testNoFollowonLocking(SessionFactoryScope scope) {
 	public void testNoFollowonLockingOnGroupBy(SessionFactoryScope scope) {
 		SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
 		scope.inTransaction( session -> {
-								 final Department engineering = new Department( 1, "Engineering" );
-								 session.persist( engineering );
-							 }
+								final Department engineering = new Department( 1, "Engineering" );
+								session.persist( engineering );
+							}
 		);
 
 		scope.inTransaction(
@@ -85,4 +89,4 @@ public void dropTestData(SessionFactoryScope scope) {
 			session.createMutationQuery( "delete Department" ).executeUpdate();
 		} );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Department.java
index 03a31bd5e8bf..9deb7b747fd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Department.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.jpa;
 
@@ -42,4 +40,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Employee.java
index 661fc9c9250d..c03357945b92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.jpa;
 
@@ -68,4 +66,4 @@ public Department getDepartment() {
 	public void setDepartment(Department department) {
 		this.department = department;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
index 5009f27ef21f..500abbaa7ec1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.jpa;
 
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.hibernate.community.dialect.AltibaseDialect;
@@ -32,7 +29,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.hibernate.jpa.SpecHints.HINT_SPEC_QUERY_TIMEOUT;
 
 /**
  * @author Steve Ebersole
@@ -124,4 +120,4 @@ public void dropTestData(SessionFactoryScope scope) {
 			session.createMutationQuery( "delete Department" ).executeUpdate();
 		} );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java
index 9bb983ac68ee..898deb3e5ff5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.paging;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java
index 2093832eaba2..1523a8aad27c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.paging;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java
index 66355b84bee3..a19094cf181b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.locking.warning;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java
index 89c77f0b8fe0..766fee910183 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
@@ -21,28 +19,28 @@
  */
 @Entity
 public class Advertisement {
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    @SQLRestriction("deleted <> 'true'")
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "advertisements")
-    @OrderBy("id asc")
-    private Set attachments;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Set getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(Set attachments) {
-        this.attachments = attachments;
-    }
+	@Id
+	@GeneratedValue
+	private Integer id;
+
+	@SQLRestriction("deleted <> 'true'")
+	@ManyToMany(fetch = FetchType.EAGER, mappedBy = "advertisements")
+	@OrderBy("id asc")
+	private Set attachments;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Set getAttachments() {
+		return attachments;
+	}
+
+	public void setAttachments(Set attachments) {
+		this.attachments = attachments;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java
index 221eddd75e3c..8c7e7a80d0ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
@@ -17,46 +15,46 @@
  */
 @Entity
 public class Attachment {
-    @Id
-    @GeneratedValue
-    private Integer id;
+	@Id
+	@GeneratedValue
+	private Integer id;
 
-    @ManyToMany
-    private Set advertisements;
+	@ManyToMany
+	private Set advertisements;
 
-    private String fileName;
+	private String fileName;
 
-    private String deleted = "false";
+	private String deleted = "false";
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    public Set getAdvertisements() {
-        return advertisements;
-    }
+	public Set getAdvertisements() {
+		return advertisements;
+	}
 
-    public void setAdvertisements(Set advertisements) {
-        this.advertisements = advertisements;
-    }
+	public void setAdvertisements(Set advertisements) {
+		this.advertisements = advertisements;
+	}
 
-    public String getFileName() {
-        return fileName;
-    }
+	public String getFileName() {
+		return fileName;
+	}
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
 
-    public String getDeleted() {
-        return deleted;
-    }
+	public String getDeleted() {
+		return deleted;
+	}
 
-    public void setDeleted(String deleted) {
-        this.deleted = deleted;
-    }
+	public void setDeleted(String deleted) {
+		this.deleted = deleted;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java
index be9e022709f8..3648bd8d0d95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 7085 2005-06-08 17:59:47Z oneovthafew $
 package org.hibernate.orm.test.manytomany;
 import java.io.Serializable;
 import java.util.HashSet;
@@ -18,7 +14,7 @@ public class Group implements Serializable {
 	private String description;
 
 	private Set users = new HashSet();
-	
+
 	public Group(String name, String org) {
 		this.org = org;
 		this.name = name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
index 60399a8d3ad5..ac7de92467c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java
index 0803c109c750..952d60ed704d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
@@ -141,4 +139,3 @@ public void testManyToManyWithFormula(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java
index 71f1727e786e..d9f07e3de084 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java
index 63454d8c8dda..b3011a94aea9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
@@ -15,15 +13,15 @@
  */
 @Entity
 public class PageAdvertisement extends SubjectAdvertisement {
-    @Id
-    @GeneratedValue
-    private Integer id;
+	@Id
+	@GeneratedValue
+	private Integer id;
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	public void setId(Integer id) {
+		this.id = id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java
index 16560155344c..cd15ebbcd34d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany;
 
@@ -14,14 +12,14 @@
  */
 @MappedSuperclass
 public class SubjectAdvertisement {
-    @OneToOne
-    private Advertisement advertisement;
+	@OneToOne
+	private Advertisement advertisement;
 
-    public Advertisement getAdvertisement() {
-        return advertisement;
-    }
+	public Advertisement getAdvertisement() {
+		return advertisement;
+	}
 
-    public void setAdvertisement(Advertisement advertisement) {
-        this.advertisement = advertisement;
-    }
+	public void setAdvertisement(Advertisement advertisement) {
+		this.advertisement = advertisement;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java
index e22ec74b6077..5a0737202552 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 7085 2005-06-08 17:59:47Z oneovthafew $
 package org.hibernate.orm.test.manytomany;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 public class User implements Serializable {
-	
+
 	private String org;
 	private String name;
 	private Set groups = new HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java
index d778d4334845..5101c3535bea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.batchload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/Group.java
index d8a950899e59..c65b324c7ebf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.batchload;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/User.java
index 2242e5c0b5ae..c9b705ae6d63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.batchload;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyMapKeyTest.java
index 7a4afd6349ca..e497a788689a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyMapKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyMapKeyTest.java
@@ -1,10 +1,13 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.manytomany.mapkey;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java
index 072834fce025..93ba1b57a1c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.mapkey;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/Group.java
index 6d84dce83792..e18440bd0e9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.ordered;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java
index 391e7888c7a7..d32395877c97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/User.java
index 2e2a92338d7e..39f9a7aded7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomany.ordered;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java
index 1a32d5ee0591..8039467fc416 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Group.java
index 7511798b8223..b3a987806ebe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Membership.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Membership.java
index 66cc057588da..dfef2729bf56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Membership.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/Membership.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/User.java
index 2fffd0e9c9a9..f5bc3a0e803a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
index 64ec36826600..cf2feaa47278 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
@@ -1,41 +1,39 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.manytomanyassociationclass.compositeid;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.orm.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest;
-import org.hibernate.orm.test.manytomanyassociationclass.Group;
-import org.hibernate.orm.test.manytomanyassociationclass.Membership;
-import org.hibernate.orm.test.manytomanyassociationclass.User;
-
-/**
- * Tests on many-to-many association using an association class with a composite ID containing
- * the IDs from the associated entities.
- *
- * @author Gail Badner
- */
-@DomainModel(
-		xmlMappings = "org/hibernate/orm/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml"
-)
-public class ManyToManyAssociationClassCompositeIdTest extends AbstractManyToManyAssociationClassTest {
-
-	@Override
-	public Membership createMembership(String name) {
-		return new MembershipWithCompositeId( name );
-	}
-
-	@Override
-	public void deleteMembership(User u, Group g, Membership ug) {
-		if ( u == null || g == null ) {
-			throw new IllegalArgumentException();
-		}
-		u.getMemberships().remove( ug );
-		g.getMemberships().remove( ug );
-		ug.setId( null );
-	}
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.manytomanyassociationclass.compositeid;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.orm.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest;
+import org.hibernate.orm.test.manytomanyassociationclass.Group;
+import org.hibernate.orm.test.manytomanyassociationclass.Membership;
+import org.hibernate.orm.test.manytomanyassociationclass.User;
+
+/**
+ * Tests on many-to-many association using an association class with a composite ID containing
+ * the IDs from the associated entities.
+ *
+ * @author Gail Badner
+ */
+@DomainModel(
+		xmlMappings = "org/hibernate/orm/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml"
+)
+public class ManyToManyAssociationClassCompositeIdTest extends AbstractManyToManyAssociationClassTest {
+
+	@Override
+	public Membership createMembership(String name) {
+		return new MembershipWithCompositeId( name );
+	}
+
+	@Override
+	public void deleteMembership(User u, Group g, Membership ug) {
+		if ( u == null || g == null ) {
+			throw new IllegalArgumentException();
+		}
+		u.getMemberships().remove( ug );
+		g.getMemberships().remove( ug );
+		ug.setId( null );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java
index a7c35a188e8b..45aa0b4e7ba1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.compositeid;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/Item.java
index bdf68c580260..2e5a5ffa5c06 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.nestedreference;
 import java.util.ArrayList;
@@ -33,20 +31,20 @@ public Item( String name, String description ) {
 	}
 
 	public String getDescription() {
-		  return description;
-	 }
+		return description;
+	}
 
 	public void setDescription(String description) {
-		  this.description = description;
-	 }
+		this.description = description;
+	}
 
 	public Long getId() {
-		  return id;
-	 }
+		return id;
+	}
 
 	public void setId(Long id) {
-		  this.id = id;
-	 }
+		this.id = id;
+	}
 
 	public long getVersion() {
 		return version;
@@ -57,12 +55,12 @@ public void setVersion(long version) {
 	}
 
 	public String getName() {
-		  return name;
-	 }
+		return name;
+	}
 
 	public void setName(String name) {
-		  this.name = name;
-	 }
+		this.name = name;
+	}
 
 	public Item getOwner() {
 		return owner;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/ItemSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/ItemSelfReferenceTest.java
index aa109e80c418..fed7b8f2674b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/ItemSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/ItemSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.nestedreference;
 
@@ -36,4 +34,3 @@ public void testSimpleCreateAndDelete(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/OtherItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/OtherItem.java
index d108df657401..1d56c92369ae 100755
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/OtherItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/nestedreference/OtherItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.nestedreference;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java
index 96d71ddf3760..2d0d3f30fdef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.surrogateid.assigned;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
index bd6d881c0ca8..ea42bb6d5143 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.manytomanyassociationclass.surrogateid.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java
index 71c04cc8a021..424737c0776c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.map;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
index 1764d2c879f9..eedba493279f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.map;
 
@@ -152,4 +150,3 @@ public void testSQLQuery(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java
index 7ab39e4350d2..e4d4b7072263 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SessionAttribute.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.map;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java
index 39d4cace87ec..dcbbefdcc85c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.map;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java
index 68a12a9d07f8..fc450587e882 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.mapelemformula;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java
index ac037ddca05f..8062f7c558b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapelemformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java
index fbcabc65c7b0..e61153e6945b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.mapelemformula;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java
index cd9eb0856f8e..156317770a6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java
index a56d1352afcf..9b2b20e38379 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfEntity.java
index eab10fac6252..06f566013c0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -37,7 +35,7 @@ public class ConfEntity implements Serializable{
 
 	@OneToMany(mappedBy="conf", cascade = ALL, orphanRemoval = true, fetch = FetchType.LAZY)
 	private Set userConf = new HashSet();
-	
+
 	public String getConfKey() {
 		return confKey;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfId.java
index ceecc9957d46..02b63a7d46ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ConfId.java
@@ -1,73 +1,71 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.mapping;
-
-import java.io.Serializable;
-
-public class ConfId  implements Serializable{
-
-	private static final long serialVersionUID = -6722022851594514199L;
-
-	private String confKey;
-
-	private String confValue;
-	
-	public ConfId(){
-	}
-
-	public ConfId(String confKey, String confValue) {
-		this.confKey = confKey;
-		this.confValue = confValue;
-	}
-
-	public String getConfKey() {
-		return confKey;
-	}
-
-	public void setConfKey(String confKey) {
-		this.confKey = confKey;
-	}
-
-	public String getConfValue() {
-		return confValue;
-	}
-
-	public void setConfValue(String confValue) {
-		this.confValue = confValue;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((confKey == null) ? 0 : confKey.hashCode());
-		result = prime * result + ((confValue == null) ? 0 : confValue.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ConfId other = (ConfId) obj;
-		if (confKey == null) {
-			if (other.confKey != null)
-				return false;
-		} else if (!confKey.equals(other.confKey))
-			return false;
-		else if (confValue == null) {
-			if (other.confValue != null)
-				return false;
-		} else if (!confValue.equals(other.confValue))
-			return false;
-		return true;
-	}
-}
\ No newline at end of file
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping;
+
+import java.io.Serializable;
+
+public class ConfId  implements Serializable{
+
+	private static final long serialVersionUID = -6722022851594514199L;
+
+	private String confKey;
+
+	private String confValue;
+
+	public ConfId(){
+	}
+
+	public ConfId(String confKey, String confValue) {
+		this.confKey = confKey;
+		this.confValue = confValue;
+	}
+
+	public String getConfKey() {
+		return confKey;
+	}
+
+	public void setConfKey(String confKey) {
+		this.confKey = confKey;
+	}
+
+	public String getConfValue() {
+		return confValue;
+	}
+
+	public void setConfValue(String confValue) {
+		this.confValue = confValue;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((confKey == null) ? 0 : confKey.hashCode());
+		result = prime * result + ((confValue == null) ? 0 : confValue.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ConfId other = (ConfId) obj;
+		if (confKey == null) {
+			if (other.confKey != null)
+				return false;
+		} else if (!confKey.equals(other.confKey))
+			return false;
+		else if (confValue == null) {
+			if (other.confValue != null)
+				return false;
+		} else if (!confValue.equals(other.confValue))
+			return false;
+		return true;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/EntityTableMappingsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/EntityTableMappingsTests.java
index 6e2c50fc73c1..72eaf67daca0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/EntityTableMappingsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/EntityTableMappingsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -132,9 +130,9 @@ private void verifyTableMappings(
 	@Entity( name = "UnionRoot" )
 	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 	public static abstract class UnionRoot {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private UnionRoot() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappedSuperclassWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappedSuperclassWithGenericsTest.java
index fdf0d4363d1e..8c253d3d02a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappedSuperclassWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappedSuperclassWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
index 642fac600638..d2fcfcb6a573 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingReorderedAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingReorderedAliasTest.java
index 5513b66c8038..902181012016 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingReorderedAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingReorderedAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassTest.java
index 26ef3f147fde..1c3e82eb3955 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassVisitorTest.java
index 97a24a61929b..d291564e8615 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassVisitorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/PersistentClassVisitorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -23,7 +21,7 @@
 
 /**
  * Simple smoke style tests to make sure visitors keep working.
- * 
+ *
  * @author max
  */
 @BaseUnitTest
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java
index af9391e1c9ca..12b6c062a3d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java
index a22e442c48d3..1949c7d66394 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table1.java
index faffbdb6e4b1..d3437be9d627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -17,7 +15,7 @@
 @Entity
 @Table( name = "Table1" )
 public class Table1 {
-	
+
 	@Id
 	@GeneratedValue
 	private long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table2.java
index c3eb7dc40dde..c962964c9689 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/Table2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -17,7 +15,7 @@
 @Entity
 @Table( name = "Table2" )
 public class Table2 {
-	
+
 	@Id
 	@GeneratedValue
 	private long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfEntity.java
index 6eac3d46110c..30726d3bc2e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -19,14 +17,14 @@
 @Table(name = "USER_CONFS")
 @IdClass(UserConfId.class)
 public class UserConfEntity implements Serializable{
-	
+
 	private static final long serialVersionUID = 9153314908821604322L;
 
 	@Id
 	@ManyToOne
 	@JoinColumn(name="user_id", nullable = false)
 	private UserEntity user;
-	
+
 	@Id
 	@ManyToOne
 	@JoinColumn(name="cnf_key", referencedColumnName="confKey")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfId.java
index 24d8a77247fd..8f14a06f5498 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserConfId.java
@@ -1,76 +1,74 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.mapping;
-
-import java.io.Serializable;
-
-
-
-public class UserConfId  implements Serializable{
-	
-	private static final long serialVersionUID = -161134972658451944L;
-
-	private Long user;
-
-	private ConfId conf;
-	
-	public UserConfId(){
-	}
-
-	public UserConfId(Long user, ConfId conf) {
-		this.user = user;
-		this.conf = conf;
-	}
-
-	public Long getUser() {
-		return user;
-	}
-
-	public void setUser(Long user) {
-		this.user = user;
-	}
-
-
-	public ConfId getConf() {
-		return conf;
-	}
-
-	public void setConf(ConfId conf) {
-		this.conf = conf;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((conf == null) ? 0 : conf.hashCode());
-		result = prime * result + ((user == null) ? 0 : user.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		UserConfId other = (UserConfId) obj;
-		if (conf == null) {
-			if (other.conf != null)
-				return false;
-		} else if (!conf.equals(other.conf))
-			return false;
-		if (user == null) {
-			if (other.user != null)
-				return false;
-		} else if (!user.equals(other.user))
-			return false;
-		return true;
-	}
-}
\ No newline at end of file
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping;
+
+import java.io.Serializable;
+
+
+
+public class UserConfId  implements Serializable{
+
+	private static final long serialVersionUID = -161134972658451944L;
+
+	private Long user;
+
+	private ConfId conf;
+
+	public UserConfId(){
+	}
+
+	public UserConfId(Long user, ConfId conf) {
+		this.user = user;
+		this.conf = conf;
+	}
+
+	public Long getUser() {
+		return user;
+	}
+
+	public void setUser(Long user) {
+		this.user = user;
+	}
+
+
+	public ConfId getConf() {
+		return conf;
+	}
+
+	public void setConf(ConfId conf) {
+		this.conf = conf;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((conf == null) ? 0 : conf.hashCode());
+		result = prime * result + ((user == null) ? 0 : user.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		UserConfId other = (UserConfId) obj;
+		if (conf == null) {
+			if (other.conf != null)
+				return false;
+		} else if (!conf.equals(other.conf))
+			return false;
+		if (user == null) {
+			if (other.user != null)
+				return false;
+		} else if (!user.equals(other.user))
+			return false;
+		return true;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserEntity.java
index ea50d2710e16..af488f8f7437 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/UserEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
@@ -35,9 +33,9 @@ public class UserEntity implements Serializable{
 	@OrderColumn(name = "cnf_order")
 	@OneToMany(mappedBy="user", fetch = EAGER, cascade = ALL, orphanRemoval = true)
 	private Set confs =  new HashSet();
-	
+
 	private String name;
-	
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ValueVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ValueVisitorTest.java
index 5526226516fa..d4bc91612c70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ValueVisitorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ValueVisitorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/ElementCollectionAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/ElementCollectionAccessTest.java
index 42d72b063c20..e30d9c825fe4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/ElementCollectionAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/ElementCollectionAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
-import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
@@ -69,7 +66,7 @@ public static class Book {
 
 		//Getters and setters are omitted for brevity
 	//end::access-element-collection-mapping-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
@@ -127,5 +124,5 @@ public void setLastName(String lastName) {
 		}
 	}
 	//end::access-embeddable-mapping-example[]
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTest.java
index bf565960e8b7..c562e7ee9383 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
@@ -60,7 +58,7 @@ public static class Book {
 
 		//Getters and setters are omitted for brevity
 	//end::access-embedded-mapping-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
@@ -122,5 +120,5 @@ public void setLastName(String lastName) {
 		}
 	}
 	//end::access-embeddable-mapping-example[]
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTests.java
index 3e229c464b47..7dcdec432d2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableDefaultAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableDefaultAccessTests.java
index a47b5b9b1c07..c9dcad565472 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableDefaultAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableDefaultAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/FieldAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/FieldAccessTest.java
index 3bb572216f6e..dc1abde05e76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/FieldAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/FieldAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
@@ -14,7 +12,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name.java
index 1faf2fe9efd9..daea9589f3e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name2.java
index 021858569a39..4bc66688f3e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Name2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/NestedEmbeddableDefaultAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/NestedEmbeddableDefaultAccessTests.java
index a20246851c88..8d48b3d7e291 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/NestedEmbeddableDefaultAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/NestedEmbeddableDefaultAccessTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
@@ -79,9 +77,9 @@ private void verifyMapping(Component outerEmbeddable) {
 	@Entity( name = "MyEntity" )
 	@Table( name = "MyEntity" )
 	public static class MyEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Embedded
 		private OuterEmbeddable outerEmbeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person.java
index 0aa3cd4dcee7..896643200d41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access; /**
  * @author Steve Ebersole
@@ -12,7 +10,6 @@
 import java.util.Set;
 
 import jakarta.persistence.Access;
-import jakarta.persistence.AccessType;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -76,4 +73,3 @@ public void addAlias(Name alias) {
 		aliases.add( alias );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person2.java
index 7965e6a932d0..35a0bdf3550d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/Person2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
@@ -73,4 +71,3 @@ public void addAlias(Name2 alias) {
 		aliases.add( alias );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessOverrideTest.java
index 66b5ff81df31..1f4f6d241ea5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessTest.java
index 7338d4690dcb..f4306fe757b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/SillyConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/SillyConverter.java
index 9a6a8115d273..d88daa5a7260 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/SillyConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/SillyConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.access;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/package-info.java
index 9cf7154e74ef..7c03dde9888e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Test support for {@link jakarta.persistence.Access} / {@link jakarta.persistence.AccessType}
  */
-package org.hibernate.orm.test.mapping.access;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.access;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java
index d6bb71887f7e..fb24fd3746ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.array;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/Foo.java
index 81c08b14d552..06e44ee846a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/Foo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/FooBinder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/FooBinder.java
index 394a7b7b7ea2..c2624c6039a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/FooBinder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/FooBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/SimpleAttributeBinderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/SimpleAttributeBinderTests.java
index 12b8689bb395..ca70edb2dcb5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/SimpleAttributeBinderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/SimpleAttributeBinderTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/System.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/System.java
index a7b7f63bcf2b..35f1aad688fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/System.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/System.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
@@ -50,4 +48,4 @@ public boolean isActive() {
 	public void setActive(boolean active) {
 		this.active = active;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNo.java
index 58982c35e04a..3c07da0e413d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
index 9be4039c7c90..03a555bace47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attributebinder;
 
@@ -34,4 +32,3 @@ public void bind(
 	}
 }
 //end::attribute-binder-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/package-info.java
index eac1a739bc11..0d4c89cd146f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/package-info.java
@@ -9,4 +9,3 @@
  * Tests (and doc example) for {@link org.hibernate.annotations.AttributeBinderType}
  */
 package org.hibernate.orm.test.mapping.attributebinder;
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/NoResultCheck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/NoResultCheck.java
index e08cd6ff13e3..32b8048a1678 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/NoResultCheck.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/NoResultCheck.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.attributebinder.typebinder;
 
 import org.hibernate.annotations.TypeBinderType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
index d3fdd3bfde30..ed49e90a6e99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.attributebinder.typebinder;
 
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/AttributeOrderingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/AttributeOrderingTests.java
index eee1f3d03459..82534caa0995 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/AttributeOrderingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/AttributeOrderingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attrorder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java
index 8062d16cfef2..5373ba680dd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attrorder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java
index bc23c0d415ed..fcba9a0b7084 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.attrorder;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/AutoQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/AutoQuotingTest.java
index a027e70f9e85..0008e67a8d7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/AutoQuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/AutoQuotingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicArrayMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicArrayMappingTests.java
index 2fdf2ce3f642..ec606c25da01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicArrayMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicArrayMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicCollectionMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicCollectionMappingTests.java
index 99c6ba91e32e..b99c8e6789d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicCollectionMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BasicCollectionMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigDecimalMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigDecimalMappingTests.java
index 50e1dae2f89f..c66453d82b66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigDecimalMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigDecimalMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigIntegerMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigIntegerMappingTests.java
index 24f236d0d562..11ec5e225030 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigIntegerMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BigIntegerMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobAttributeQueryUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobAttributeQueryUpdateTest.java
index 05afcf6cf1f8..f30960cf6862 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobAttributeQueryUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobAttributeQueryUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.basic;
 
 import java.nio.charset.StandardCharsets;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobByteArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobByteArrayTest.java
index 7627ce329283..3c672eff2486 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobByteArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobByteArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -22,71 +20,71 @@
  */
 public class BlobByteArrayTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
-
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
-            product.setImage(new byte[] {1, 2, 3});
-
-            entityManager.persist(product);
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Product product = entityManager.find(Product.class, productId);
-
-            assertArrayEquals(new byte[] {1, 2, 3}, product.getImage());
-        });
-    }
-
-    //tag::basic-blob-byte-array-example[]
-    @Entity(name = "Product")
-    public static class Product {
-
-        @Id
-        private Integer id;
-
-        private String name;
-
-        @Lob
-        private byte[] image;
-
-        //Getters and setters are omitted for brevity
-
-    //end::basic-blob-byte-array-example[]
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public byte[] getImage() {
-            return image;
-        }
-
-        public void setImage(byte[] image) {
-            this.image = image;
-        }
-
-        //tag::basic-blob-byte-array-example[]
-    }
-    //end::basic-blob-byte-array-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
+
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
+			product.setImage(new byte[] {1, 2, 3});
+
+			entityManager.persist(product);
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Product product = entityManager.find(Product.class, productId);
+
+			assertArrayEquals(new byte[] {1, 2, 3}, product.getImage());
+		});
+	}
+
+	//tag::basic-blob-byte-array-example[]
+	@Entity(name = "Product")
+	public static class Product {
+
+		@Id
+		private Integer id;
+
+		private String name;
+
+		@Lob
+		private byte[] image;
+
+		//Getters and setters are omitted for brevity
+
+	//end::basic-blob-byte-array-example[]
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public byte[] getImage() {
+			return image;
+		}
+
+		public void setImage(byte[] image) {
+			this.image = image;
+		}
+
+		//tag::basic-blob-byte-array-example[]
+	}
+	//end::basic-blob-byte-array-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobTest.java
index 63f193930581..ca62c070976f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -30,104 +28,104 @@
  */
 public class BlobTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
 
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
 
-            //tag::basic-blob-persist-example[]
-            byte[] image = new byte[] {1, 2, 3};
+			//tag::basic-blob-persist-example[]
+			byte[] image = new byte[] {1, 2, 3};
 
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
 
-            product.setImage(BlobProxy.generateProxy(image));
+			product.setImage(BlobProxy.generateProxy(image));
 
-            entityManager.persist(product);
-            //end::basic-blob-persist-example[]
+			entityManager.persist(product);
+			//end::basic-blob-persist-example[]
 
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            try {
-                //tag::basic-blob-find-example[]
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			try {
+				//tag::basic-blob-find-example[]
 
-                Product product = entityManager.find(Product.class, productId);
+				Product product = entityManager.find(Product.class, productId);
 
-                try (InputStream inputStream = product.getImage().getBinaryStream()) {
-                    assertArrayEquals(new byte[] {1, 2, 3}, toBytes(inputStream));
-                }
-                //end::basic-blob-find-example[]
-            }
-            catch (Exception e) {
-                fail(e.getMessage());
-            }
-        });
-    }
+				try (InputStream inputStream = product.getImage().getBinaryStream()) {
+					assertArrayEquals(new byte[] {1, 2, 3}, toBytes(inputStream));
+				}
+				//end::basic-blob-find-example[]
+			}
+			catch (Exception e) {
+				fail(e.getMessage());
+			}
+		});
+	}
 
-    private byte[] toBytes(InputStream inputStream) throws IOException {
-        BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+	private byte[] toBytes(InputStream inputStream) throws IOException {
+		BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 
-        int result = bufferedInputStream.read();
+		int result = bufferedInputStream.read();
 
-        while(result != -1) {
-            byteArrayOutputStream.write((byte) result);
-            result = bufferedInputStream.read();
-        }
+		while(result != -1) {
+			byteArrayOutputStream.write((byte) result);
+			result = bufferedInputStream.read();
+		}
 
-        return byteArrayOutputStream.toByteArray();
-    }
+		return byteArrayOutputStream.toByteArray();
+	}
 
 
-    //tag::basic-blob-example[]
-    @Entity(name = "Product")
-    public static class Product {
+	//tag::basic-blob-example[]
+	@Entity(name = "Product")
+	public static class Product {
 
-        @Id
-        private Integer id;
+		@Id
+		private Integer id;
 
-        private String name;
+		private String name;
 
-        @Lob
-        private Blob image;
+		@Lob
+		private Blob image;
 
-        //Getters and setters are omitted for brevity
+		//Getters and setters are omitted for brevity
 
-    //end::basic-blob-example[]
-        public Integer getId() {
-            return id;
-        }
+	//end::basic-blob-example[]
+		public Integer getId() {
+			return id;
+		}
 
-        public void setId(Integer id) {
-            this.id = id;
-        }
+		public void setId(Integer id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public Blob getImage() {
-            return image;
-        }
+		public Blob getImage() {
+			return image;
+		}
 
-        public void setImage(Blob image) {
-            this.image = image;
-        }
+		public void setImage(Blob image) {
+			this.image = image;
+		}
 
-        //tag::basic-blob-example[]
-    }
-    //end::basic-blob-example[]
+		//tag::basic-blob-example[]
+	}
+	//end::basic-blob-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java
index 41bfd6cef975..1578a0449532 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -15,7 +13,6 @@
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
index e6f7aa3dbc6e..4f7face7c0c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteMappingTests.java
index e0630bf7f8b9..4036a1bee92e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CalendarWithTemporalTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CalendarWithTemporalTimestampTest.java
index 3f98a3284f4a..28e72fc1d9c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CalendarWithTemporalTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CalendarWithTemporalTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
index ba233c760ebf..90da2bd01973 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
index c94b21c2df68..d7af5b4664de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterMappingTests.java
index f73bfdaa6d35..4b09e74985c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClassMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClassMappingTests.java
index 8355f802b3fe..2952b6238ca8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClassMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClassMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobCharArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobCharArrayTest.java
index b4bd6f919302..690a8c4dbdf1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobCharArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobCharArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobStringTest.java
index 01b6e5c561f5..083b4259e7e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobTest.java
index 3f012ad2ea8b..12e0b275e360 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -30,104 +28,104 @@
  */
 public class ClobTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
 
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
 
-            //tag::basic-clob-persist-example[]
-            String warranty = "My product warranty";
+			//tag::basic-clob-persist-example[]
+			String warranty = "My product warranty";
 
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
 
-            product.setWarranty(ClobProxy.generateProxy(warranty));
+			product.setWarranty(ClobProxy.generateProxy(warranty));
 
-            entityManager.persist(product);
-            //end::basic-clob-persist-example[]
+			entityManager.persist(product);
+			//end::basic-clob-persist-example[]
 
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            try {
-                //tag::basic-clob-find-example[]
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			try {
+				//tag::basic-clob-find-example[]
 
-                Product product = entityManager.find(Product.class, productId);
+				Product product = entityManager.find(Product.class, productId);
 
-                try (Reader reader = product.getWarranty().getCharacterStream()) {
-                    assertEquals("My product warranty", toString(reader));
-                }
-                //end::basic-clob-find-example[]
-            }
-            catch (Exception e) {
-                fail(e.getMessage());
-            }
-        });
-    }
+				try (Reader reader = product.getWarranty().getCharacterStream()) {
+					assertEquals("My product warranty", toString(reader));
+				}
+				//end::basic-clob-find-example[]
+			}
+			catch (Exception e) {
+				fail(e.getMessage());
+			}
+		});
+	}
 
-    private String toString(Reader reader) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(reader);
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+	private String toString(Reader reader) throws IOException {
+		BufferedReader bufferedReader = new BufferedReader(reader);
+		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 
-        int result = bufferedReader.read();
+		int result = bufferedReader.read();
 
-        while(result != -1) {
-            byteArrayOutputStream.write((byte) result);
-            result = bufferedReader.read();
-        }
+		while(result != -1) {
+			byteArrayOutputStream.write((byte) result);
+			result = bufferedReader.read();
+		}
 
-        return byteArrayOutputStream.toString();
-    }
+		return byteArrayOutputStream.toString();
+	}
 
 
-    //tag::basic-clob-example[]
-    @Entity(name = "Product")
-    public static class Product {
+	//tag::basic-clob-example[]
+	@Entity(name = "Product")
+	public static class Product {
 
-        @Id
-        private Integer id;
+		@Id
+		private Integer id;
 
-        private String name;
+		private String name;
 
-        @Lob
-        private Clob warranty;
+		@Lob
+		private Clob warranty;
 
-        //Getters and setters are omitted for brevity
+		//Getters and setters are omitted for brevity
 
-    //end::basic-clob-example[]
-        public Integer getId() {
-            return id;
-        }
+	//end::basic-clob-example[]
+		public Integer getId() {
+			return id;
+		}
 
-        public void setId(Integer id) {
-            this.id = id;
-        }
+		public void setId(Integer id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public Clob getWarranty() {
-            return warranty;
-        }
+		public Clob getWarranty() {
+			return warranty;
+		}
 
-        public void setWarranty(Clob warranty) {
-            this.warranty = warranty;
-        }
+		public void setWarranty(Clob warranty) {
+			this.warranty = warranty;
+		}
 
-        //tag::basic-clob-example[]
-    }
-    //end::basic-clob-example[]
+		//tag::basic-clob-example[]
+	}
+	//end::basic-clob-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ColumnTransformerTest.java
index 0e8a444101c9..5c848183776d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ColumnTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ColumnTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CurrencyMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CurrencyMappingTests.java
index a1b1cc6e2959..4498ea688b46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CurrencyMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CurrencyMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -12,32 +10,25 @@
 import jakarta.persistence.Table;
 import org.assertj.core.api.Assertions;
 import org.hibernate.HibernateException;
-import org.hibernate.engine.jdbc.LobCreator;
-import org.hibernate.engine.jdbc.NonContextualLobCreator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.BasicValuedCollectionPart;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
-import org.hibernate.orm.test.mapping.type.java.YearMappingTests;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.CurrencyJavaType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
-import java.time.Year;
 import java.util.Currency;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.TimeZone;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -200,7 +191,7 @@ public static class EntityWithCurrency {
 		@ElementCollection
 		private Set currencies;
 
-        public EntityWithCurrency() {
+		public EntityWithCurrency() {
 			//
 		}
 
@@ -208,7 +199,7 @@ public EntityWithCurrency(final Integer id, final Currency currency, final Set.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitColumnNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitColumnNamingTest.java
index ae009c88b504..a41439f7b159 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitColumnNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitColumnNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitTypeTest.java
index 5d943222227d..5f9eaf5260ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ExplicitTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -43,7 +41,7 @@ public class Product {
 
 		@Id
 		private Integer id;
-		
+
 		private String sku;
 
 		@Type(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FloatMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FloatMappingTests.java
index cb623420debd..ec7c68d549d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FloatMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FloatMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FormulaTest.java
index 144b34420805..eacf18344900 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/FormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/Gender.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/Gender.java
index 3406dd19b929..218f924c88f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/Gender.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/Gender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -12,29 +10,29 @@
 //tag::basic-enums-converter-example[]
 public enum Gender {
 
-    MALE('M'),
-    FEMALE('F');
+	MALE('M'),
+	FEMALE('F');
 
-    private final char code;
+	private final char code;
 
-    Gender(char code) {
-        this.code = code;
-    }
+	Gender(char code) {
+		this.code = code;
+	}
 
-    public static Gender fromCode(char code) {
-        if (code == 'M' || code == 'm') {
-            return MALE;
-        }
-        if (code == 'F' || code == 'f') {
-            return FEMALE;
-        }
-        throw new UnsupportedOperationException(
-            "The code " + code + " is not supported!"
-       );
-    }
+	public static Gender fromCode(char code) {
+		if (code == 'M' || code == 'm') {
+			return MALE;
+		}
+		if (code == 'F' || code == 'f') {
+			return FEMALE;
+		}
+		throw new UnsupportedOperationException(
+			"The code " + code + " is not supported!"
+	);
+	}
 
-    public char getCode() {
-        return code;
-    }
+	public char getCode() {
+		return code;
+	}
 }
 //end::basic-enums-converter-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderJavaType.java
index ae7f911013b2..94896b8ddf60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -16,33 +14,33 @@
 //tag::basic-enums-custom-type-example[]
 public class GenderJavaType extends AbstractClassJavaType {
 
-    public static final GenderJavaType INSTANCE =
-        new GenderJavaType();
+	public static final GenderJavaType INSTANCE =
+		new GenderJavaType();
 
-    protected GenderJavaType() {
-        super(Gender.class);
-    }
+	protected GenderJavaType() {
+		super(Gender.class);
+	}
 
-    public String toString(Gender value) {
-        return value == null ? null : value.name();
-    }
+	public String toString(Gender value) {
+		return value == null ? null : value.name();
+	}
 
-    public Gender fromString(CharSequence string) {
-        return string == null ? null : Gender.valueOf(string.toString());
-    }
+	public Gender fromString(CharSequence string) {
+		return string == null ? null : Gender.valueOf(string.toString());
+	}
 
-    public  X unwrap(Gender value, Class type, WrapperOptions options) {
-        return CharacterJavaType.INSTANCE.unwrap(
-            value == null ? null : value.getCode(),
-            type,
-            options
-       );
-    }
+	public  X unwrap(Gender value, Class type, WrapperOptions options) {
+		return CharacterJavaType.INSTANCE.unwrap(
+			value == null ? null : value.getCode(),
+			type,
+			options
+	);
+	}
 
-    public  Gender wrap(X value, WrapperOptions options) {
-        return Gender.fromCode(
+	public  Gender wrap(X value, WrapperOptions options) {
+		return Gender.fromCode(
 				CharacterJavaType.INSTANCE.wrap( value, options)
-       );
-    }
+	);
+	}
 }
-//end::basic-enums-custom-type-example[]
\ No newline at end of file
+//end::basic-enums-custom-type-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderType.java
index dfe7413ea049..a8e86bbfa320 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/GenderType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -15,8 +13,8 @@
  */
 //tag::basic-enums-custom-type-example[]
 public class GenderType extends UserTypeSupport {
-    public GenderType() {
-        super(Gender.class, Types.CHAR);
-    }
+	public GenderType() {
+		super(Gender.class, Types.CHAR);
+	}
 }
 //end::basic-enums-custom-type-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ImplicitBasicTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ImplicitBasicTypeTest.java
index 2bccfc9b85ce..2f3ae4f9d2b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ImplicitBasicTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ImplicitBasicTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
index b27787008d47..3d50287b480c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantLiteralTest.java
index 03fee7c334df..4c001417f111 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantLiteralTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantLiteralTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantMappingTests.java
index 31af5dd5fbee..f6a011b2e70f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InstantMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/IntegerMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/IntegerMappingTests.java
index 2c91b3175dd7..75d4536ca60f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/IntegerMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/IntegerMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JpaQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JpaQuotingTest.java
index 7b5e2583aa13..44cbe1021a7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JpaQuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JpaQuotingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
index b441781e8d41..66833e1716bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateMappingTests.java
index 0e445f43459b..ff5c499ed7bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeMappingTests.java
index 9dced8ad6ba9..2173bc628602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeWithTemporalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeWithTemporalTimeTest.java
index 47d54023ca5d..32801491ec0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeWithTemporalTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalDateTimeWithTemporalTimeTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
 import java.time.LocalDateTime;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalTimeMappingTests.java
index bec469a298f2..d384424cbdcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalTimeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocalTimeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocaleMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocaleMappingTests.java
index 75f70e30fdd0..62a59bc4d6db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocaleMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LocaleMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LongMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LongMappingTests.java
index 5df620dac471..69e41bf2a5b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LongMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/LongMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmount.java
index 2856a511ffd2..0be045c1db6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.mapping.basic;
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmountUserType.java
index c43ee11d44ac..4ebd674bb3be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmountUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/MonetaryAmountUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobCharArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobCharArrayTest.java
index 369154ef983c..646e1365479b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobCharArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobCharArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -23,72 +21,72 @@
  */
 public class NClobCharArrayTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
-
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
-            product.setWarranty("My product warranty".toCharArray());
-
-            entityManager.persist(product);
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Product product = entityManager.find(Product.class, productId);
-
-            assertArrayEquals("My product warranty".toCharArray(), product.getWarranty());
-        });
-    }
-
-    //tag::basic-nclob-char-array-example[]
-    @Entity(name = "Product")
-    public static class Product {
-
-        @Id
-        private Integer id;
-
-        private String name;
-
-        @Lob
-        @Nationalized
-        private char[] warranty;
-
-        //Getters and setters are omitted for brevity
-
-    //end::basic-nclob-char-array-example[]
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public char[] getWarranty() {
-            return warranty;
-        }
-
-        public void setWarranty(char[] warranty) {
-            this.warranty = warranty;
-        }
-
-        //tag::basic-nclob-char-array-example[]
-    }
-    //end::basic-nclob-char-array-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
+
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
+			product.setWarranty("My product warranty".toCharArray());
+
+			entityManager.persist(product);
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Product product = entityManager.find(Product.class, productId);
+
+			assertArrayEquals("My product warranty".toCharArray(), product.getWarranty());
+		});
+	}
+
+	//tag::basic-nclob-char-array-example[]
+	@Entity(name = "Product")
+	public static class Product {
+
+		@Id
+		private Integer id;
+
+		private String name;
+
+		@Lob
+		@Nationalized
+		private char[] warranty;
+
+		//Getters and setters are omitted for brevity
+
+	//end::basic-nclob-char-array-example[]
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public char[] getWarranty() {
+			return warranty;
+		}
+
+		public void setWarranty(char[] warranty) {
+			this.warranty = warranty;
+		}
+
+		//tag::basic-nclob-char-array-example[]
+	}
+	//end::basic-nclob-char-array-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobStringTest.java
index d9e65171fa0b..d756b358e10f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -23,72 +21,72 @@
  */
 public class NClobStringTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
-
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
-            product.setWarranty("My product warranty");
-
-            entityManager.persist(product);
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Product product = entityManager.find(Product.class, productId);
-
-            assertEquals("My product warranty", product.getWarranty());
-        });
-    }
-
-    //tag::basic-nclob-string-example[]
-    @Entity(name = "Product")
-    public static class Product {
-
-        @Id
-        private Integer id;
-
-        private String name;
-
-        @Lob
-        @Nationalized
-        private String warranty;
-
-        //Getters and setters are omitted for brevity
-
-    //end::basic-nclob-string-example[]
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getWarranty() {
-            return warranty;
-        }
-
-        public void setWarranty(String warranty) {
-            this.warranty = warranty;
-        }
-
-        //tag::basic-nclob-string-example[]
-    }
-    //end::basic-nclob-string-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
+
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
+			product.setWarranty("My product warranty");
+
+			entityManager.persist(product);
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Product product = entityManager.find(Product.class, productId);
+
+			assertEquals("My product warranty", product.getWarranty());
+		});
+	}
+
+	//tag::basic-nclob-string-example[]
+	@Entity(name = "Product")
+	public static class Product {
+
+		@Id
+		private Integer id;
+
+		private String name;
+
+		@Lob
+		@Nationalized
+		private String warranty;
+
+		//Getters and setters are omitted for brevity
+
+	//end::basic-nclob-string-example[]
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getWarranty() {
+			return warranty;
+		}
+
+		public void setWarranty(String warranty) {
+			this.warranty = warranty;
+		}
+
+		//tag::basic-nclob-string-example[]
+	}
+	//end::basic-nclob-string-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobTest.java
index 0c15a2a98448..be53b0ec6764 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NClobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -32,106 +30,106 @@
  */
 @Jpa(annotatedClasses = NClobTest.Product.class)
 @RequiresDialectFeature(
-        feature = DialectFeatureChecks.SupportsNationalizedDataTypes.class,
-        comment = "This is different from other tests checking generalized nationalization support; " +
-                "because we explicitly map this attribute to the `NClob` java type the database really" +
-                " has to support those types"
+		feature = DialectFeatureChecks.SupportsNationalizedDataTypes.class,
+		comment = "This is different from other tests checking generalized nationalization support; " +
+				"because we explicitly map this attribute to the `NClob` java type the database really" +
+				" has to support those types"
 )
 public class NClobTest {
-    @Test
-    public void test(EntityManagerFactoryScope scope) {
-        scope.inTransaction(
-                (entityManager) -> {
-                    //tag::basic-nclob-persist-example[]
-                    String warranty = "My product warranty";
-
-                    final Product product = new Product();
-                    product.setId(1);
-                    product.setName("Mobile phone");
-
-                    product.setWarranty(NClobProxy.generateProxy(warranty));
-
-                    entityManager.persist(product);
-                    //end::basic-nclob-persist-example[]
-                }
-       );
-
-        scope.inTransaction(
-                (entityManager) -> {
-                    try {
-                        //tag::basic-nclob-find-example[]
-                        Product product = entityManager.find(Product.class, 1);
-
-                        try (Reader reader = product.getWarranty().getCharacterStream()) {
-                            assertEquals("My product warranty", toString(reader));
-                        }
-                        //end::basic-nclob-find-example[]
-                    }
-                    catch (Exception e) {
-                        fail(e.getMessage());
-                    }
-                }
-       );
-    }
-
-    private String toString(Reader reader) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(reader);
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-
-        int result = bufferedReader.read();
-
-        while (result != -1) {
-            byteArrayOutputStream.write((byte) result);
-            result = bufferedReader.read();
-        }
-
-        return byteArrayOutputStream.toString();
-    }
-
-
-    //tag::basic-nclob-example[]
-    @Entity(name = "Product")
-    public static class Product {
-
-        @Id
-        private Integer id;
-
-        private String name;
-
-        @Lob
-        @Nationalized
-        // Clob also works, because NClob extends Clob.
-        // The database type is still NCLOB either way and handled as such.
-        private NClob warranty;
-
-        //Getters and setters are omitted for brevity
-
-        //end::basic-nclob-example[]
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public NClob getWarranty() {
-            return warranty;
-        }
-
-        public void setWarranty(NClob warranty) {
-            this.warranty = warranty;
-        }
-
-        //tag::basic-nclob-example[]
-    }
-    //end::basic-nclob-example[]
+	@Test
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				(entityManager) -> {
+					//tag::basic-nclob-persist-example[]
+					String warranty = "My product warranty";
+
+					final Product product = new Product();
+					product.setId(1);
+					product.setName("Mobile phone");
+
+					product.setWarranty(NClobProxy.generateProxy(warranty));
+
+					entityManager.persist(product);
+					//end::basic-nclob-persist-example[]
+				}
+	);
+
+		scope.inTransaction(
+				(entityManager) -> {
+					try {
+						//tag::basic-nclob-find-example[]
+						Product product = entityManager.find(Product.class, 1);
+
+						try (Reader reader = product.getWarranty().getCharacterStream()) {
+							assertEquals("My product warranty", toString(reader));
+						}
+						//end::basic-nclob-find-example[]
+					}
+					catch (Exception e) {
+						fail(e.getMessage());
+					}
+				}
+	);
+	}
+
+	private String toString(Reader reader) throws IOException {
+		BufferedReader bufferedReader = new BufferedReader(reader);
+		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+		int result = bufferedReader.read();
+
+		while (result != -1) {
+			byteArrayOutputStream.write((byte) result);
+			result = bufferedReader.read();
+		}
+
+		return byteArrayOutputStream.toString();
+	}
+
+
+	//tag::basic-nclob-example[]
+	@Entity(name = "Product")
+	public static class Product {
+
+		@Id
+		private Integer id;
+
+		private String name;
+
+		@Lob
+		@Nationalized
+		// Clob also works, because NClob extends Clob.
+		// The database type is still NCLOB either way and handled as such.
+		private NClob warranty;
+
+		//Getters and setters are omitted for brevity
+
+		//end::basic-nclob-example[]
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public NClob getWarranty() {
+			return warranty;
+		}
+
+		public void setWarranty(NClob warranty) {
+			this.warranty = warranty;
+		}
+
+		//tag::basic-nclob-example[]
+	}
+	//end::basic-nclob-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedTest.java
index c9dc7ed1049f..523c0b69932c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -23,77 +21,77 @@
  * @author Vlad Mihalcea
  */
 @SkipForDialect(dialectClass = SybaseASEDialect.class,
-        reason = "Error converting characters into server's character set")
+		reason = "Error converting characters into server's character set")
 public class NationalizedTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Product.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Product.class
+		};
+	}
 
-    @Test
-    public void test() {
-        Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::basic-nationalized-persist-example[]
-            final Product product = new Product();
-            product.setId(1);
-            product.setName("Mobile phone");
-            product.setWarranty("My product®™ warranty 😍");
+	@Test
+	public void test() {
+		Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::basic-nationalized-persist-example[]
+			final Product product = new Product();
+			product.setId(1);
+			product.setName("Mobile phone");
+			product.setWarranty("My product®™ warranty 😍");
 
-            entityManager.persist(product);
-            //end::basic-nationalized-persist-example[]
+			entityManager.persist(product);
+			//end::basic-nationalized-persist-example[]
 
-            return product.getId();
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Product product = entityManager.find(Product.class, productId);
+			return product.getId();
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Product product = entityManager.find(Product.class, productId);
 
-            assertEquals("My product®™ warranty 😍", product.getWarranty());
-        });
-    }
+			assertEquals("My product®™ warranty 😍", product.getWarranty());
+		});
+	}
 
-    //tag::basic-nationalized-example[]
-    @Entity(name = "Product")
-    public static class Product {
+	//tag::basic-nationalized-example[]
+	@Entity(name = "Product")
+	public static class Product {
 
-        @Id
-        private Integer id;
+		@Id
+		private Integer id;
 
-        private String name;
+		private String name;
 
-        @Nationalized
-        private String warranty;
+		@Nationalized
+		private String warranty;
 
-        //Getters and setters are omitted for brevity
+		//Getters and setters are omitted for brevity
 
-    //end::basic-nationalized-example[]
-        public Integer getId() {
-            return id;
-        }
+	//end::basic-nationalized-example[]
+		public Integer getId() {
+			return id;
+		}
 
-        public void setId(Integer id) {
-            this.id = id;
-        }
+		public void setId(Integer id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public String getWarranty() {
-            return warranty;
-        }
+		public String getWarranty() {
+			return warranty;
+		}
 
-        public void setWarranty(String warranty) {
-            this.warranty = warranty;
-        }
+		public void setWarranty(String warranty) {
+			this.warranty = warranty;
+		}
 
-        //tag::basic-nationalized-example[]
-    }
-    //end::basic-nationalized-example[]
+		//tag::basic-nationalized-example[]
+	}
+	//end::basic-nationalized-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetDateTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetDateTimeMappingTests.java
index d40f898c319d..b9de55349577 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetDateTimeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetDateTimeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetTimeMappingTests.java
index 3b892b785423..d9f88e90f9d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetTimeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/OffsetTimeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ParentTest.java
index fd9c0aa219fd..660e9185260b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -19,7 +17,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
 /**
@@ -119,7 +116,7 @@ public static class City {
 		//Getters and setters omitted for brevity
 
 	//end::mapping-Parent-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java
index c1c0fe227ea9..629dfc6d28d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedStringTest.java
index 700317928b1f..ef63648e060c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PhoneTypeEnumeratedStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
index 849760e99701..5685f6c9cf8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/QuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/QuotingTest.java
index e49083a19333..51b538f48cda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/QuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/QuotingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/RepeatedMappingUserTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/RepeatedMappingUserTypeTests.java
index fc3dec314e70..b7f5081aaacf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/RepeatedMappingUserTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/RepeatedMappingUserTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ShortMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ShortMappingTests.java
index 3cb2725c7bea..6b79593f4c92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ShortMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ShortMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringMappingTests.java
index fa549a651920..cbe87b30f486 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringNationalizedMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringNationalizedMappingTests.java
index e97109eedeec..47bf8ea8c541 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringNationalizedMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/StringNationalizedMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/SubselectTest.java
index 660e56322509..f6ad30662a74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/SubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/SubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneMappingTests.java
index 9067ee8e7d08..08d0a210628a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneStorageMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneStorageMappingTests.java
index 68b916d3bddc..e4eb8c5026d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneStorageMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TimeZoneStorageMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TypeCategoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TypeCategoryTest.java
index 43e45d9752d6..28b52e348034 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TypeCategoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/TypeCategoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingDisallowTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingDisallowTests.java
index e0d27364cb21..6e52f6e3dc2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingDisallowTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingDisallowTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingLegacyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingLegacyTests.java
index dcf2d0909bcb..2c6e273639ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingLegacyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/WrapperArrayHandlingLegacyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
index b8b704720e10..f95526435aae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZoneOffsetMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZoneOffsetMappingTests.java
index 7667ebb7398d..b628ca1c17cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZoneOffsetMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZoneOffsetMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
@@ -81,7 +79,7 @@ public void testUpdateQuery(SessionFactoryScope scope) {
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( session -> session.createMutationQuery( "delete EntityWithZoneOffset" ).executeUpdate() );
 	}
-	
+
 	@Entity(name = "EntityWithZoneOffset")
 	@Table(name = "EntityWithZoneOffset")
 	public static class EntityWithZoneOffset {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZonedDateTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZonedDateTimeMappingTests.java
index 026b788d2d5b..e0991b3e5734 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZonedDateTimeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ZonedDateTimeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterImmutableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterImmutableTests.java
index 74a8f9c00b54..1c5717e01bfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterImmutableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterImmutableTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterMutabilityTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterMutabilityTests.java
index 2c406833cb99..19f818862d82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterMutabilityTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterMutabilityTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterTests.java
index 470cc26471dc..ee2381ac86b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetConverterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
index c23f1dfadbe0..e3fc44e776e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetImplicitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetImplicitTests.java
index 61eb89a830dc..12412834e82c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetImplicitTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetImplicitTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaType.java
index 52be45d7dd6e..b9efaad13dc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
@@ -20,65 +18,65 @@
  */
 //tag::basic-bitset-example-java-type[]
 public class BitSetJavaType extends AbstractClassJavaType {
-    public static final BitSetJavaType INSTANCE = new BitSetJavaType();
+	public static final BitSetJavaType INSTANCE = new BitSetJavaType();
 
-    public BitSetJavaType() {
-        super(BitSet.class);
-    }
+	public BitSetJavaType() {
+		super(BitSet.class);
+	}
 
-    @Override
-    public MutabilityPlan getMutabilityPlan() {
-        return BitSetMutabilityPlan.INSTANCE;
-    }
+	@Override
+	public MutabilityPlan getMutabilityPlan() {
+		return BitSetMutabilityPlan.INSTANCE;
+	}
 
-    @Override
-    public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
-        return indicators.getTypeConfiguration()
-                .getJdbcTypeRegistry()
-                .getDescriptor(Types.VARCHAR);
-    }
+	@Override
+	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
+		return indicators.getTypeConfiguration()
+				.getJdbcTypeRegistry()
+				.getDescriptor(Types.VARCHAR);
+	}
 
-    @Override
-    public String toString(BitSet value) {
-        return BitSetHelper.bitSetToString(value);
-    }
+	@Override
+	public String toString(BitSet value) {
+		return BitSetHelper.bitSetToString(value);
+	}
 
-    @Override
-    public BitSet fromString(CharSequence string) {
-        return BitSetHelper.stringToBitSet(string.toString());
-    }
+	@Override
+	public BitSet fromString(CharSequence string) {
+		return BitSetHelper.stringToBitSet(string.toString());
+	}
 
-    @SuppressWarnings("unchecked")
-    public  X unwrap(BitSet value, Class type, WrapperOptions options) {
-        if (value == null) {
-            return null;
-        }
-        if (BitSet.class.isAssignableFrom(type)) {
-            return (X) value;
-        }
-        if (String.class.isAssignableFrom(type)) {
-            return (X) toString(value);
-        }
-        if (type.isArray()) {
-            if (type.getComponentType() == byte.class) {
-                return (X) value.toByteArray();
-            }
-        }
-        throw unknownUnwrap(type);
-    }
+	@SuppressWarnings("unchecked")
+	public  X unwrap(BitSet value, Class type, WrapperOptions options) {
+		if (value == null) {
+			return null;
+		}
+		if (BitSet.class.isAssignableFrom(type)) {
+			return (X) value;
+		}
+		if (String.class.isAssignableFrom(type)) {
+			return (X) toString(value);
+		}
+		if (type.isArray()) {
+			if (type.getComponentType() == byte.class) {
+				return (X) value.toByteArray();
+			}
+		}
+		throw unknownUnwrap(type);
+	}
 
-    public  BitSet wrap(X value, WrapperOptions options) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof CharSequence) {
-            return fromString((CharSequence) value);
-        }
-        if (value instanceof BitSet) {
-            return (BitSet) value;
-        }
-        throw unknownWrap(value.getClass());
-    }
+	public  BitSet wrap(X value, WrapperOptions options) {
+		if (value == null) {
+			return null;
+		}
+		if (value instanceof CharSequence) {
+			return fromString((CharSequence) value);
+		}
+		if (value instanceof BitSet) {
+			return (BitSet) value;
+		}
+		throw unknownWrap(value.getClass());
+	}
 
 }
 //end::basic-bitset-example-java-type[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributionTests.java
index e5c61956ba74..7c9938f66cba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributor.java
index bb0c08acc04f..b6dc8d746a66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeRegistrationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeRegistrationTests.java
index 8210698d2257..f1a0225ba120 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeRegistrationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeRegistrationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeTests.java
index 72965e35c63e..03088d89be59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJavaTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeCodeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeCodeTests.java
index 36695c3c558d..5fb6ca695868 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeCodeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeCodeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeRegistrationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeRegistrationTests.java
index 265731ebbd74..0903f0245619 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeRegistrationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeRegistrationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeTests.java
index f5ae986e9ad2..f020facebb5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetJdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMutabilityPlan.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMutabilityPlan.java
index df7da658db80..42deb77aca8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMutabilityPlan.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
index 295139c31e52..74e1fd0a6128 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetType.java
index de8a977e886c..950f46afeb82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
@@ -16,18 +14,18 @@
  */
 //tag::basic-custom-type-BitSetType-example[]
 public class BitSetType
-        extends AbstractSingleColumnStandardBasicType {
+		extends AbstractSingleColumnStandardBasicType {
 
-    public static final BitSetType INSTANCE = new BitSetType();
+	public static final BitSetType INSTANCE = new BitSetType();
 
-    public BitSetType() {
-        super( VarcharJdbcType.INSTANCE, BitSetJavaType.INSTANCE );
-    }
+	public BitSetType() {
+		super( VarcharJdbcType.INSTANCE, BitSetJavaType.INSTANCE );
+	}
 
-    @Override
-    public String getName() {
-        return "bitset";
-    }
+	@Override
+	public String getName() {
+		return "bitset";
+	}
 
 }
 //end::basic-custom-type-BitSetType-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetTypeTest.java
index 2aa6cd7baf6a..92d96580c871 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserType.java
index 7122a0e7834c..58b9be4a7f3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
@@ -25,74 +23,74 @@
 //tag::basic-custom-type-BitSetUserType-example[]
 public class BitSetUserType implements UserType {
 
-    private static final Logger log = Logger.getLogger(BitSetUserType.class);
-
-    @Override
-    public int getSqlType() {
-        return Types.VARCHAR;
-    }
-
-    @Override
-    public Class returnedClass() {
-        return BitSet.class;
-    }
-
-    @Override
-    public boolean equals(BitSet x, BitSet y) {
-        return Objects.equals(x, y);
-    }
-
-    @Override
-    public int hashCode(BitSet x) {
-        return Objects.hashCode(x);
-    }
-
-    @Override
-    public BitSet nullSafeGet(ResultSet rs, int position,
-                              SharedSessionContractImplementor session)
-            throws SQLException {
-        String columnValue = rs.getString(position);
-        if (rs.wasNull()) {
-            columnValue = null;
-        }
-
-        log.debugv("Result set column {0} value is {1}", position, columnValue);
-        return BitSetHelper.stringToBitSet(columnValue);
-    }
-
-    @Override
-    public void nullSafeSet(PreparedStatement st, BitSet value, int index,
-                            SharedSessionContractImplementor session)
-            throws SQLException {
-        if (value == null) {
-            log.debugv("Binding null to parameter {0} ",index);
-            st.setNull(index, Types.VARCHAR);
-        }
-        else {
-            String stringValue = BitSetHelper.bitSetToString(value);
-            log.debugv("Binding {0} to parameter {1} ", stringValue, index);
-            st.setString(index, stringValue);
-        }
-    }
-
-    @Override
-    public BitSet deepCopy(BitSet bitSet) {
-        return bitSet == null ? null : (BitSet) bitSet.clone();
-    }
-
-    @Override
-    public boolean isMutable() {
-        return true;
-    }
-
-    @Override
-    public Serializable disassemble(BitSet value) {
-        return deepCopy(value);
-    }
-
-    @Override
-    public BitSet assemble(Serializable cached, Object owner)  {
-        return deepCopy((BitSet) cached);
-    }
+	private static final Logger log = Logger.getLogger(BitSetUserType.class);
+
+	@Override
+	public int getSqlType() {
+		return Types.VARCHAR;
+	}
+
+	@Override
+	public Class returnedClass() {
+		return BitSet.class;
+	}
+
+	@Override
+	public boolean equals(BitSet x, BitSet y) {
+		return Objects.equals(x, y);
+	}
+
+	@Override
+	public int hashCode(BitSet x) {
+		return Objects.hashCode(x);
+	}
+
+	@Override
+	public BitSet nullSafeGet(ResultSet rs, int position,
+							SharedSessionContractImplementor session)
+			throws SQLException {
+		String columnValue = rs.getString(position);
+		if (rs.wasNull()) {
+			columnValue = null;
+		}
+
+		log.debugv("Result set column {0} value is {1}", position, columnValue);
+		return BitSetHelper.stringToBitSet(columnValue);
+	}
+
+	@Override
+	public void nullSafeSet(PreparedStatement st, BitSet value, int index,
+							SharedSessionContractImplementor session)
+			throws SQLException {
+		if (value == null) {
+			log.debugv("Binding null to parameter {0} ",index);
+			st.setNull(index, Types.VARCHAR);
+		}
+		else {
+			String stringValue = BitSetHelper.bitSetToString(value);
+			log.debugv("Binding {0} to parameter {1} ", stringValue, index);
+			st.setString(index, stringValue);
+		}
+	}
+
+	@Override
+	public BitSet deepCopy(BitSet bitSet) {
+		return bitSet == null ? null : (BitSet) bitSet.clone();
+	}
+
+	@Override
+	public boolean isMutable() {
+		return true;
+	}
+
+	@Override
+	public Serializable disassemble(BitSet value) {
+		return deepCopy(value);
+	}
+
+	@Override
+	public BitSet assemble(Serializable cached, Object owner)  {
+		return deepCopy((BitSet) cached);
+	}
 }
 //end::basic-custom-type-BitSetUserType-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
index 4d4df10c24c2..f8a514ba9a7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.basic.bitset;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/package-info.java
index 41f40246a3c9..c06006acae6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/package-info.java
@@ -10,4 +10,4 @@
  *
  * Used as the base for the Case Study section in the documentation
  */
-package org.hibernate.orm.test.mapping.basic.bitset;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.basic.bitset;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java
index 881486d127c1..cc5e45616757 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cascade;
 
@@ -108,8 +106,8 @@ public void testPersistOnNewEntityRelatedToAlreadyPersistentEntityWithUninitiali
 			// load invoice, invoiceLines should not be loaded
 			Invoice invoice = session.get( Invoice.class, _invoice.getId() );
 			assertEquals( 1,
-						  stats.getEntityCount(),
-						  "Invoice lines should not be initialized while loading the invoice, because of the lazy association."
+						stats.getEntityCount(),
+						"Invoice lines should not be initialized while loading the invoice, because of the lazy association."
 			);
 
 			Receipt receipt = new Receipt( RECEIPT_A );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java
index 926742b1fcf1..26eaefbe12c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.aggregated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Customer.java
index d939113ca87c..20b26225cb5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass; /**
  * @author Steve Ebersole
@@ -41,4 +39,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
index b12a413bfac1..5c5f76948dc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Order.java
index befb5c5ba797..ae2c87d942c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass; /**
  * @author Steve Ebersole
@@ -60,4 +58,4 @@ public Float getAmount() {
 	public void setAmount(Float amount) {
 		this.amount = amount;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/OrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/OrderId.java
index 4dab40c5f079..a5e19c548900 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/OrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/OrderId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Payment.java
index a1c7daf01b96..6e40a8a54a6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Payment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass; /**
  * @author Steve Ebersole
@@ -50,4 +48,4 @@ public String getAccountNumber() {
 	public void setAccountNumber(String accountNumber) {
 		this.accountNumber = accountNumber;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/PaymentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/PaymentId.java
index 28e120987a6e..da94dc2244c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/PaymentId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/PaymentId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.idclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
index 9c861858c2bc..79b60ed5b0ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.nonaggregated;
 
@@ -14,16 +12,10 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.transaction.TransactionUtil2;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Customer.java
index 7d13d2289f74..afa7da933b6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.query;
 
@@ -39,4 +37,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/IdClassQueryRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/IdClassQueryRefTests.java
index c2b9dfdf1758..1d288a7ed84d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/IdClassQueryRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/IdClassQueryRefTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Order.java
index e8b2926bcc44..94b7e6d4b930 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.query;
 
@@ -58,4 +56,4 @@ public Float getAmount() {
 	public void setAmount(Float amount) {
 		this.amount = amount;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/OrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/OrderId.java
index 0d48fe17c651..546f74c4712a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/OrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/OrderId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.cid.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/package-info.java
index a2fd48fd7dc5..5ac659fe4a30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/query/package-info.java
@@ -11,4 +11,4 @@
  * {@link org.hibernate.sql.results.graph.embeddable.EmbeddableInitializer}
  * impls
  */
-package org.hibernate.orm.test.mapping.cid.query;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.cid.query;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
index b82cdf448c2e..81f9d5ebf894 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeElementCollectionTest.java
index dd5db75ed66a..8f370e645fd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeOrderColumnElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeOrderColumnElementCollectionTest.java
index f6c33c0aed15..c8eb0227ae0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeOrderColumnElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BasicTypeOrderColumnElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagOrphanRemovalTest.java
index 64c83ea21bb4..a227b961b71a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagTest.java
index 30e01b3aec5f..6ab6bef929bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalComparatorSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalComparatorSortedSetTest.java
index f0a794284a74..48e8fd01278f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalComparatorSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalComparatorSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalMapTest.java
index 0963cb6084dd..0a6ec3406fe6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderByListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderByListTest.java
index 7715c7f5511a..9752cbd513c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderByListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderByListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderColumnListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderColumnListTest.java
index 2ff934a4c8ac..556047f0934e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderColumnListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOrderColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSetTest.java
index 552bfa4e1308..b22aa25b5fd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSortedSetTest.java
index 7fb488365cdf..a1f34cf6d460 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/CollectionTest.java
index 4af25f34b319..8df44105951f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/CollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/CollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCachePerfTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCachePerfTest.java
index 53deded0836b..b57cca1f3084 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCachePerfTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCachePerfTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCustomSqlMutationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCustomSqlMutationsTest.java
index 495dfaa3abc3..1e92ac7499c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCustomSqlMutationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionCustomSqlMutationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapTest.java
index e899d68f844f..58bb5b45c3c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.MapKeyJoinColumn;
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapUpdateTest.java
index 4a853631dbd9..f1bd95dc3a22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionMapUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionPerfTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionPerfTest.java
index 7aa13d347827..f794b72868a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionPerfTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionPerfTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddableTypeElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddableTypeElementCollectionTest.java
index f49ffcf6b928..3b6b17808655 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddableTypeElementCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddableTypeElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddedMapElementCollectionJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddedMapElementCollectionJoinTest.java
index b0a4eb334db9..985c5ce5f1f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddedMapElementCollectionJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/EmbeddedMapElementCollectionJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsBagSemanticsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsBagSemanticsTests.java
index 117dbaacd92d..ac54707e060d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsBagSemanticsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsBagSemanticsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
@@ -69,9 +67,9 @@ void verifyModel(DomainModelScope scope) {
 	@Entity( name = "AnEntity" )
 	@Table( name = "t_entity" )
 	public static class AnEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		@ElementCollection
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsListSemanticsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsListSemanticsTests.java
index 8efe1345fc9b..187a028eeea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsListSemanticsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListAsListSemanticsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.mapping.Bag;
 import org.hibernate.mapping.Property;
-import org.hibernate.metamodel.CollectionClassification;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
@@ -61,9 +58,9 @@ void verifyModel(DomainModelScope scope) {
 	@Entity( name = "AnEntity" )
 	@Table( name = "t_entity" )
 	public static class AnEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		@ElementCollection
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListDefaultSemanticsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListDefaultSemanticsTests.java
index 41115dae4591..4d8b01c4bf78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListDefaultSemanticsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ImplicitListDefaultSemanticsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
@@ -10,16 +8,13 @@
 import java.util.List;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Environment;
 import org.hibernate.mapping.Bag;
 import org.hibernate.mapping.Property;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider;
 import org.hibernate.testing.orm.junit.ImplicitListAsListProvider;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SettingProvider;
 import org.junit.jupiter.api.Test;
 
@@ -69,9 +64,9 @@ void verifyModel(DomainModelScope scope) {
 	@Entity( name = "AnEntity" )
 	@Table( name = "t_entity" )
 	public static class AnEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		@ElementCollection
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java
index 00127620b5c3..fcbd994b3a73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyClassTest.java
index e2b1e248e947..66670cf9b6ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyToOneInEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyToOneInEmbeddedIdTest.java
index 44c3c27ecd87..d83e36f22e96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyToOneInEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyToOneInEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
index 013aa0f0d90e..fac7ddd1b512 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java
index 96782d9d6bb0..9558a21b0353 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderColumnListIndexBaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderColumnListIndexBaseTest.java
index 6d98e042baaf..bdd261db9094 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderColumnListIndexBaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderColumnListIndexBaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderedBySQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderedBySQLTest.java
index 671a1d1729a7..310083bd1626 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderedBySQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/OrderedBySQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/PluralAttributeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/PluralAttributeMappingTests.java
index 280ab2ab96b0..a589867daa2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/PluralAttributeMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/PluralAttributeMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/QueueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/QueueTest.java
index a5f81e7f99b7..afbc1cd9e1ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/QueueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/QueueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ReadOnlyCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ReadOnlyCollectionsTest.java
index f2d0117c3042..3ab0a30a5d74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ReadOnlyCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ReadOnlyCollectionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java
index bd86c4f8e1dd..25f89f28b9a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortAndOrderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortAndOrderTests.java
index 3c174af9ff3b..961ae4b25750 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortAndOrderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortAndOrderTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
@@ -53,10 +51,10 @@ void test(ServiceRegistryScope scope) {
 	@Entity( name = "AnEntity" )
 	@Table( name = "t_entity" )
 	public static class AnEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
-	    private String name;
+		@Id
+		private Integer id;
+		@Basic
+		private String name;
 
 		@ElementCollection
 		@SortNatural
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java
index 8889da88eefb..e8ea60e30d76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.collections;
 
 import java.util.Arrays;
@@ -33,7 +37,7 @@
  *     
  • {@link org.hibernate.annotations.OrderBy @OrderBy(from hibernate)}
    • 
  *     
  • {@link jakarta.persistence.OrderBy @OrderBy(from JPA)}
    • 
  * 
- * 
+ *
  * @author Nathan Xu
  */
 @ServiceRegistry
@@ -46,7 +50,7 @@
 @SessionFactory
 @JiraKey( value = "HHH-13877" )
 public class SortNaturalByDefaultTests {
-	
+
 	@Test
 	void test(SessionFactoryScope scope) {
 		scope.inTransaction(
@@ -73,7 +77,7 @@ void createTestData(SessionFactoryScope scope) {
 		scope.inTransaction(
 			session -> {
 				final Person person = new Person();
-				final SortedSet phones = new TreeSet<>( 
+				final SortedSet phones = new TreeSet<>(
 					Arrays.asList(
 						new Phone( "678-912-345" ),
 						new Phone( "234-567-891" ),
@@ -140,7 +144,7 @@ public static class Phone implements Comparable {
 
 		public Phone() {
 		}
-		
+
 		public Phone(String number) {
 			this.number = number;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalBagTest.java
index 70986f872e20..b2ed6bf3a4c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalComparatorSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalComparatorSortedSetTest.java
index b967849e2563..46d5a71ba27b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalComparatorSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalComparatorSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalMapTest.java
index 7d8bb250bac4..40c32f8fe5c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderColumnListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderColumnListTest.java
index 0fae9fca9eea..4b8db3a3bef0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderColumnListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderedByListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderedByListTest.java
index 7b8abc848ec3..651b2ce8c764 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderedByListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalOrderedByListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSetTest.java
index 25f209382066..b8ddbaedc84f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSortedSetTest.java
index 801e7d457bc1..13dbf98a08f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/UnidirectionalSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverter.java
index cf9cf982f26d..a83c77b24d87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverter.java
@@ -1,16 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.asbasic;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import org.hibernate.internal.util.collections.CollectionHelper;
 
 import jakarta.persistence.AttributeConverter;
 
@@ -40,4 +35,3 @@ public List convertToEntityAttribute(String dbData) {
 	}
 }
 //end::ex-csv-converter[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverterTests.java
index dcf5ff65ddfc..b15456af1f1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/asbasic/CommaDelimitedStringsConverterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.asbasic;
 
@@ -84,9 +82,9 @@ public void dropTestData(SessionFactoryScope scope) {
 //tag::ex-csv-converter-model[]
 	@Entity( name = "Person" )
 	public static class Person {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Basic
 		@Convert( converter = CommaDelimitedStringsConverter.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Name.java
index 56525e69271e..5460915a6329 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/NameComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/NameComparator.java
index 93c5340ce929..6604119d40b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/NameComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/NameComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification;
 
@@ -21,4 +19,3 @@ public int compare(Name o1, Name o2) {
 	}
 }
 //end::collections-name-comparator-ex[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Status.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Status.java
index cfb687e9ff45..cdcddc021b49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Status.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/Status.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/BagTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/BagTests.java
index 39da3634e11e..e4039b8cb0d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/BagTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/BagTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsCollection.java
index e1b9cff3f150..c4925981b5b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsList.java
index 0efd586d2318..165e42f81a43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/bag/EntityWithBagAsList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.bag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithIndexBasedList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithIndexBasedList.java
index 696ec95696d6..4a1e95369f82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithIndexBasedList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithIndexBasedList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.list;/**
  * @author Steve Ebersole
@@ -63,4 +61,3 @@ public void setName(String name) {
 	//tag::collections-list-indexbase-ex[]
 }
 //end::collections-list-indexbase-ex[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithList.java
index 7641f20e2844..d0093ca80672 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.list;/**
  * @author Steve Ebersole
@@ -59,4 +57,3 @@ public void setName(String name) {
 	//tag::collections-list-ex[]
 }
 //end::collections-list-ex[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithOrderColumnList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithOrderColumnList.java
index 168985c1c1b5..4e4d1b917fdd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithOrderColumnList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/list/EntityWithOrderColumnList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.list;
 
@@ -59,4 +57,4 @@ public void setName(String name) {
 
 //tag::collections-list-ordercolumn-ex[]
 }
-//end::collections-list-ordercolumn-ex[]
\ No newline at end of file
+//end::collections-list-ordercolumn-ex[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithMap.java
index b531e2b071db..12f8644dd71b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithMap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithMap.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.map; /**
  * @author Steve Ebersole
  */
 
 import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.orm.test.mapping.collections.classification.Name;
 import org.hibernate.orm.test.mapping.collections.classification.Status;
@@ -58,4 +55,4 @@ public void setName(String name) {
 
 //tag::collections-map-ex[]
 }
-//end::collections-map-ex[]
\ No newline at end of file
+//end::collections-map-ex[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithNaturallySortedMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithNaturallySortedMap.java
index 671709c55b8e..bcada0ddc5ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithNaturallySortedMap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithNaturallySortedMap.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.map;
 
 import java.util.Map;
-import java.util.SortedSet;
 
 import org.hibernate.annotations.SortNatural;
 import org.hibernate.orm.test.mapping.collections.classification.Name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithSortedMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithSortedMap.java
index fafe4b456007..b9fff91f918a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithSortedMap.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/map/EntityWithSortedMap.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.map; /**
  * @author Steve Ebersole
  */
 
 import java.util.Map;
-import java.util.SortedSet;
 
 import org.hibernate.annotations.SortComparator;
 import org.hibernate.orm.test.mapping.collections.classification.Name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithNaturallySortedSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithNaturallySortedSet.java
index ef42274c0216..f44b1086e81c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithNaturallySortedSet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithNaturallySortedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithOrderedSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithOrderedSet.java
index e4fed5e3719f..d266cda8e7c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithOrderedSet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithOrderedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.set;
 
@@ -50,4 +48,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSet.java
index f7349e180022..dfa1112b2709 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.set; /**
  * @author Steve Ebersole
@@ -56,4 +54,4 @@ public void setName(String name) {
 
 //tag::collections-set-ex[]
 }
-//end::collections-set-ex[]
\ No newline at end of file
+//end::collections-set-ex[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSortedSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSortedSet.java
index dd06010c7e7d..1f02a79c08bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSortedSet.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/classification/set/EntityWithSortedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.classification.set; /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/Email.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/Email.java
index 398a97f5dca4..0e78697db2ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/Email.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/Email.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
@@ -19,7 +17,7 @@
 public class Email {
 	private Long id;
 	private String address;
-	
+
 	Email() {
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/IMyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/IMyList.java
index 023a07884794..b6beebdc05b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/IMyList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/IMyList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyList.java
index b2727daf3f41..c5512c2964a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyList.java
@@ -1,17 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
 import java.util.ArrayList;
 
 /**
- * A custom collection class. We extend a java.util.Collection class, but that is not required. 
+ * A custom collection class. We extend a java.util.Collection class, but that is not required.
  * It could be totally non-java-collection type, but then we would need to implement all the PersistentCollection methods.
- * 
+ *
  * @author max
  */
 public class MyList extends ArrayList implements IMyList {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyListType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyListType.java
index dfc3a358f244..d764ce78941f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyListType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/MyListType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/PersistentMyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/PersistentMyList.java
index d9f691e3366d..644a61813387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/PersistentMyList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/PersistentMyList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
@@ -19,6 +17,6 @@ public PersistentMyList(SharedSessionContractImplementor session, IMyList list)
 		super( session, list );
 	}
 
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/User.java
index 6fd22f9e85af..8517559745da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeAnnotationsVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeAnnotationsVariantTest.java
index 58080a285997..f881e5d5febc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeAnnotationsVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeAnnotationsVariantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeHbmVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeHbmVariantTest.java
index 635025066e1d..d80ae93a81af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeHbmVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeHbmVariantTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
 import org.hibernate.Hibernate;
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java
index ad346608c427..bf048a49986b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java
@@ -1,22 +1,17 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 
-import org.hibernate.Hibernate;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Max Rydahl Andersen
@@ -69,4 +64,3 @@ public void testBasicOperation() {
 	protected abstract void checkEmailAddressInitialization(User user);
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/Email.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/Email.java
index 01250bd0d99d..5c998615f7f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/Email.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/Email.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadList.java
index 277e9829943c..97d545768c45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadListType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadListType.java
index a555e48fe51d..2259e36cc9c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadListType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/HeadListType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/IHeadList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/IHeadList.java
index e3bf26070a34..fdc61c25e700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/IHeadList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/IHeadList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/PersistentHeadList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/PersistentHeadList.java
index 48b4ff43a214..5c4240c7240c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/PersistentHeadList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/PersistentHeadList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/User.java
index 793655a43881..89a6c51500a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java
index bf82e71f56b7..51588f3cc259 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) ${year}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeHbmVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeHbmVariantTest.java
index 5216e450ba67..5be62d2028b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeHbmVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeHbmVariantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeTest.java
index ff5f10900c9f..bc36eea3bfa2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeTest.java
@@ -1,46 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 
-import org.hibernate.Hibernate;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Max Rydahl Andersen
@@ -82,4 +54,3 @@ public void testBasicOperation() {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollection.java
index 9eb4783362c5..04ae94b5c054 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollection.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) ${year}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollectionTest.java
index 4c608fee95ad..25932cf6ad60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollectionTest.java
@@ -1,43 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
 import org.hibernate.AnnotationException;
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableList.java
index 5a111e9b3796..a4cfcefb8ad3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
@@ -15,5 +13,5 @@
  * @author Steve Ebersole
  */
 public interface DefaultableList extends List {
-    public String getDefaultValue();
+	public String getDefaultValue();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListImpl.java
index 228d1786aba4..c3f46da52736 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
@@ -15,7 +13,7 @@
  * @author Steve Ebersole
  */
 public class DefaultableListImpl extends ArrayList implements DefaultableList {
-    private String defaultValue;
+	private String defaultValue;
 
 	public DefaultableListImpl() {
 	}
@@ -25,10 +23,10 @@ public DefaultableListImpl(int anticipatedSize) {
 	}
 
 	public String getDefaultValue() {
-        return defaultValue;
-    }
+		return defaultValue;
+	}
 
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListType.java
index b097e184f4ef..5dacbc978260 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/DefaultableListType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
@@ -26,7 +24,7 @@
  * @author Steve Ebersole
  */
 public class DefaultableListType implements UserCollectionType, ParameterizedType {
-    private String defaultValue;
+	private String defaultValue;
 
 	@Override
 	public CollectionClassification getClassification() {
@@ -88,6 +86,6 @@ public Object replaceElements(
 
 	@Override
 	public void setParameterValues(Properties parameters) {
-        defaultValue = parameters.getProperty( "default" );
+		defaultValue = parameters.getProperty( "default" );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/Entity.java
index 2e9679dc06d3..cbe56e5954e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java
index 92df344bc984..6733c2223760 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java
index 86299e3c819d..bf2d5b7bb673 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java
index 70c45c5ced60..2505ba729817 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
@@ -39,7 +37,7 @@ public void testBasicOperation() {
 		entity = s.get( Entity.class, "tester" );
 		assertTrue( Hibernate.isInitialized( entity.getValues() ) );
 		assertEquals( 1, entity.getValues().size() );
-        assertEquals( "Hello", ( ( DefaultableList ) entity.getValues() ).getDefaultValue() );
+		assertEquals( "Hello", ( ( DefaultableList ) entity.getValues() ).getDefaultValue() );
 		s.remove( entity );
 		t.commit();
 		s.close();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/PersistentDefaultableList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/PersistentDefaultableList.java
index 75a3466d2da9..c3bde16f592d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/PersistentDefaultableList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/PersistentDefaultableList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/CustomTypeRegistrationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/CustomTypeRegistrationTests.java
index 75280c11d1aa..03424d704974 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/CustomTypeRegistrationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/CustomTypeRegistrationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.registration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/Email.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/Email.java
index 87a99522c8e5..31642052a013 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/Email.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/Email.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.registration;
 
@@ -18,7 +16,7 @@
 public class Email {
 	private Long id;
 	private String address;
-	
+
 	Email() {
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/User.java
index cdd8c90439b7..5650eaa17d8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/registration/User.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.custom.registration;
 
 import java.util.List;
 
-import org.hibernate.annotations.CollectionType;
 import org.hibernate.annotations.CollectionTypeRegistration;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.orm.test.mapping.collections.custom.basic.IMyList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Item.java
index 75e40901426c..b8258bff0cef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 6236 2005-03-29 03:20:23Z oneovthafew $
 package org.hibernate.orm.test.mapping.collections.mapcompelem;
 
 
@@ -16,8 +12,8 @@ public class Item {
 
 	private String code;
 	private Product product;
-	
-	
+
+
 	Item() {}
 	public Item(String code, Product p) {
 		this.code = code;
@@ -27,17 +23,17 @@ public Item(String code, Product p) {
 	public String getCode() {
 		return code;
 	}
-	
+
 	public void setCode(String code) {
 		this.code = code;
 	}
-	
+
 	public Product getProduct() {
 		return product;
 	}
-	
+
 	public void setProduct(Product product) {
 		this.product = product;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java
index a8a6eeeeca98..f563322cf318 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.mapcompelem;
 
@@ -105,4 +103,3 @@ public void testQueryMapCompositeElement(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Part.java
index 984e3e28411e..20737ce29ad2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Part.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Part.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.mapping.collections.mapcompelem;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Product.java
index 87b80d291b05..540c5e086c28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Product.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.mapping.collections.mapcompelem;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalBagTest.java
index 6582bf1c9720..8bfbd8f75d2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalBagTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalBagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.nature.elemental;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalListTest.java
index 5ad1b803ab4a..0e6ac26a51ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/ElementalListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.nature.elemental;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/Phone.java
index 7b59a050cc98..9b6dde07ba78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.nature.elemental;
 
@@ -43,4 +41,3 @@ public String getNumber() {
 //tag::ex-collection-elemental-model[]
 }
 //end::ex-collection-elemental-model[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/package-info.java
index 382e54e765e6..a37b37711508 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/nature/elemental/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.mapping.collections.nature.elemental;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.collections.nature.elemental;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/AddressBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/AddressBook.java
index ee6e70632f71..ac0db55a9fee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/AddressBook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/AddressBook.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.ordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/CompliantAddressBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/CompliantAddressBook.java
index ab9cdb312a15..91f0602a7dd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/CompliantAddressBook.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/CompliantAddressBook.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.ordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/Contact.java
index 59b522b805f5..e3d84792a73e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.ordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/OrderByComplianceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/OrderByComplianceTests.java
index c22815adf682..0916295bbc56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/OrderByComplianceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/OrderByComplianceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.ordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/TypesOfThings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/TypesOfThings.java
index 971e071f2184..f29d4c3d307f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/TypesOfThings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ordering/TypesOfThings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.ordering;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/CustomSemanticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/CustomSemanticsTest.java
index 8a93f114e42e..e47d4529a146 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/CustomSemanticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/CustomSemanticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.semantics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueList.java
index ef214a614ad1..ce3f60d66988 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueList.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.semantics;
 
@@ -71,4 +69,3 @@ public void setStrings(List strings) {
 //tag::ex-collections-custom-type-model[]
 }
 //end::ex-collections-custom-type-model[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueListRegistration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueListRegistration.java
index 9e003a90ad31..c5b59586912f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueListRegistration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/TheEntityWithUniqueListRegistration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.semantics;
 
@@ -71,4 +69,3 @@ public void setStrings(List strings) {
 //tag::ex-collections-custom-type-model[]
 }
 //end::ex-collections-custom-type-model[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListType.java
index 9a5b145a3d06..c7e904067543 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.semantics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListWrapper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListWrapper.java
index 7882dbf94853..1a47de57fc24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListWrapper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/semantics/UniqueListWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.semantics;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/PersistentQueue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/PersistentQueue.java
index 679daec0d097..804da6e2530a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/PersistentQueue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/PersistentQueue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.type;
 
@@ -16,43 +14,43 @@
 //tag::collections-custom-collection-mapping-example[]
 public class PersistentQueue extends PersistentBag implements Queue {
 
-    public PersistentQueue(SharedSessionContractImplementor session) {
-        super(session);
-    }
-
-    public PersistentQueue(SharedSessionContractImplementor session, List list) {
-        super(session, list);
-    }
-
-    @Override
-    public boolean offer(Object o) {
-        return add(o);
-    }
-
-    @Override
-    public Object remove() {
-        return poll();
-    }
-
-    @Override
-    public Object poll() {
-        int size = size();
-        if(size > 0) {
-            Object first = get(0);
-            remove(0);
-            return first;
-        }
-        throw new NoSuchElementException();
-    }
-
-    @Override
-    public Object element() {
-        return peek();
-    }
-
-    @Override
-    public Object peek() {
-        return size() > 0 ? get(0) : null;
-    }
+	public PersistentQueue(SharedSessionContractImplementor session) {
+		super(session);
+	}
+
+	public PersistentQueue(SharedSessionContractImplementor session, List list) {
+		super(session, list);
+	}
+
+	@Override
+	public boolean offer(Object o) {
+		return add(o);
+	}
+
+	@Override
+	public Object remove() {
+		return poll();
+	}
+
+	@Override
+	public Object poll() {
+		int size = size();
+		if(size > 0) {
+			Object first = get(0);
+			remove(0);
+			return first;
+		}
+		throw new NoSuchElementException();
+	}
+
+	@Override
+	public Object element() {
+		return peek();
+	}
+
+	@Override
+	public Object peek() {
+		return size() > 0 ? get(0) : null;
+	}
 }
-//end::collections-custom-collection-mapping-example[]
\ No newline at end of file
+//end::collections-custom-collection-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/QueueType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/QueueType.java
index d5981daaa403..f48a24e72073 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/QueueType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/type/QueueType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.collections.type;
 
@@ -21,65 +19,65 @@
 
 //tag::collections-custom-collection-mapping-example[]
 public class QueueType implements UserCollectionType {
-    @Override
-    public CollectionClassification getClassification() {
-        return CollectionClassification.BAG;
-    }
+	@Override
+	public CollectionClassification getClassification() {
+		return CollectionClassification.BAG;
+	}
 
-    @Override
-    public Class getCollectionClass() {
-        return Queue.class;
-    }
+	@Override
+	public Class getCollectionClass() {
+		return Queue.class;
+	}
 
-    @Override
-    public PersistentCollection instantiate(
-            SharedSessionContractImplementor session,
-            CollectionPersister persister) throws HibernateException {
-        return new PersistentQueue(session);
-    }
+	@Override
+	public PersistentCollection instantiate(
+			SharedSessionContractImplementor session,
+			CollectionPersister persister) throws HibernateException {
+		return new PersistentQueue(session);
+	}
 
-    @Override
-    public PersistentCollection wrap(
-            SharedSessionContractImplementor session,
-            Object collection) {
-        return new PersistentQueue(session, (List) collection);
-    }
+	@Override
+	public PersistentCollection wrap(
+			SharedSessionContractImplementor session,
+			Object collection) {
+		return new PersistentQueue(session, (List) collection);
+	}
 
-    @Override
-    public Iterator getElementsIterator(Object collection) {
-        return ((Queue) collection).iterator();
-    }
+	@Override
+	public Iterator getElementsIterator(Object collection) {
+		return ((Queue) collection).iterator();
+	}
 
-    @Override
-    public boolean contains(Object collection, Object entity) {
-        return ((Queue) collection).contains(entity);
-    }
+	@Override
+	public boolean contains(Object collection, Object entity) {
+		return ((Queue) collection).contains(entity);
+	}
 
-    @Override
-    public Object indexOf(Object collection, Object entity) {
-        int i = ((List) collection).indexOf(entity);
-        return (i < 0) ? null : i;
-    }
+	@Override
+	public Object indexOf(Object collection, Object entity) {
+		int i = ((List) collection).indexOf(entity);
+		return (i < 0) ? null : i;
+	}
 
-    @Override
-    public Object replaceElements(
-            Object original,
-            Object target,
-            CollectionPersister persister,
-            Object owner,
-            Map copyCache,
-            SharedSessionContractImplementor session)
-            throws HibernateException {
-        Queue result = (Queue) target;
-        result.clear();
-        result.addAll((Queue) original);
-        return result;
-    }
+	@Override
+	public Object replaceElements(
+			Object original,
+			Object target,
+			CollectionPersister persister,
+			Object owner,
+			Map copyCache,
+			SharedSessionContractImplementor session)
+			throws HibernateException {
+		Queue result = (Queue) target;
+		result.clear();
+		result.addAll((Queue) original);
+		return result;
+	}
 
-    @Override
-    public Object instantiate(int anticipatedSize) {
-        return new LinkedList<>();
-    }
+	@Override
+	public Object instantiate(int anticipatedSize) {
+		return new LinkedList<>();
+	}
 
 }
 //end::collections-custom-collection-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java
index 2c5c860be8ee..fec2bc5d7fc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.contributed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/ContributorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/ContributorImpl.java
index e3aec09d0237..b7870f57301d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/ContributorImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/ContributorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.contributed;
 
@@ -14,7 +12,6 @@
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
 import org.hibernate.boot.jaxb.internal.MappingBinder;
 import org.hibernate.boot.jaxb.spi.Binding;
-import org.hibernate.boot.model.source.internal.hbm.MappingDocument;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.AdditionalMappingContributions;
 import org.hibernate.boot.spi.AdditionalMappingContributor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
index aa52900c1884..956183bea448 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.contributed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/MainEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/MainEntity.java
index c014d2caf8f7..6365ae01a589 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/MainEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/MainEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.contributed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Address.java
index c99acb56b9f9..e0c6df1b3335 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Address.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AgeConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AgeConverter.java
index c0dc5fd5acd5..528bde821d9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AgeConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AgeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java
index 9958f19f1d38..0141f1be2bf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java
index 44d1d7f10499..bc610542d49b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java
index da1027c62362..f686906d62f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import java.net.URI;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterAndNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterAndNullTest.java
index c29008ea712e..47f65cf4e371 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterAndNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterAndNullTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
index dc029fee75fb..bc8203479077 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java
index ead762faa0e2..f2fa3004e299 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -76,7 +74,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testSimpleConvertUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(TheEntity.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(TheEntity.class.getName());
 		final Type theDatePropertyType = ep.getPropertyType( "theDate" );
 		final ConvertedBasicTypeImpl type = assertTyping( ConvertedBasicTypeImpl.class, theDatePropertyType );
 		final JpaAttributeConverter converter = (JpaAttributeConverter) type.getValueConverter();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributeUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributeUsageTests.java
index e1887debf98b..8b3f98c8d38b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributeUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributeUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributesTypecheckTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributesTypecheckTest.java
index f07936204165..7865428b98fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributesTypecheckTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedAttributesTypecheckTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -17,7 +15,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -27,7 +24,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.ParameterExpression;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedEmbeddableCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedEmbeddableCollectionTest.java
index d047480655a6..c3631f0f4e65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedEmbeddableCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedEmbeddableCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedListAttributeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedListAttributeQueryTest.java
index 41669c74de40..56202a039f93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedListAttributeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedListAttributeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedPrimitiveAttributeAsFunctionArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedPrimitiveAttributeAsFunctionArgumentTest.java
index 02ae86d0cc16..1c760a084fae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedPrimitiveAttributeAsFunctionArgumentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConvertedPrimitiveAttributeAsFunctionArgumentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterExceptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterExceptionsTest.java
index afda5168ed20..9b8e99430c41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterExceptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterExceptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java
index eb03974f95d1..3747bf2c5175 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java
index bb7d15ef5773..7faa931f84ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -115,7 +113,7 @@ public void dirtyCheckAgainstNewNumberInstance() {
 
 	@Test
 	public void checkConverterMutabilityPlans() {
-        final EntityPersister persister = sessionFactory().getMappingMetamodel().getEntityDescriptor(SomeEntity.class.getName());
+		final EntityPersister persister = sessionFactory().getMappingMetamodel().getEntityDescriptor(SomeEntity.class.getName());
 		final AttributeMapping numberMapping = persister.findAttributeMapping( "number" );
 		final AttributeMapping nameMapping = persister.findAttributeMapping( "name" );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Employee.java
index 44de2d812a4b..d2e5455b43d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java
index b5ebb1550a6e..a7c40749620b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -81,7 +79,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testSimpleConvertUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
 		final Type theDatePropertyType = ep.getPropertyType( "theDate" );
 		final ConvertedBasicTypeImpl type = assertTyping(
 				ConvertedBasicTypeImpl.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java
index 66d75f36456d..448d9c0f315b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -89,7 +87,7 @@ public Entity1(Integer id, String name, MediaType mediaType) {
 
 	@Test
 	public void testSimpleConvertUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
 		final Type theDatePropertyType = ep.getPropertyType( "mediaType" );
 		final ConvertedBasicTypeImpl type = assertTyping(
 				ConvertedBasicTypeImpl.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java
index c90f66b147cb..94d650e7666d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java
index 4ec695cf2665..112cdff3f268 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Farm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Farm.java
index 5f543c2d5d5d..ff5aad74ee41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Farm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Farm.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java
index 63429de8ad97..0087ee067de4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java
index 3f2a350ad6bb..c4daf6014402 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java
index 1cbe2fd9b327..957f5389ae09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java
index 3348fc18f6d5..7643f02b9126 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Person.java
index 3959945305e1..2c7a21572f7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/Person.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java
index 0dc028735d39..3a9eeae4a126 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
index 86e674c0f85c..e72abf63b7b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -27,7 +25,6 @@
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java
index d1f90ee26b50..f7feff507486 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java
index 01dbd0ceb210..8e034b3d4a39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -40,7 +38,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testSimpleConvertUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
 		final Type websitePropertyType = ep.getPropertyType( "website" );
 		final ConvertedBasicTypeImpl type = assertTyping(
 				ConvertedBasicTypeImpl.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java
index 7fc451b15e83..ae67416f0335 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -41,7 +39,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testSimpleConvertsUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
 		final Type websitePropertyType = ep.getPropertyType( "website" );
 		final ConvertedBasicTypeImpl type = assertTyping(
 				ConvertedBasicTypeImpl.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java
index 3a91a0e59179..22fe1a6cabe4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -47,7 +45,7 @@ protected boolean createSchema() {
 	 */
 	@Test
 	public void testSimpleConvertOverrides() {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Person.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Person.class.getName());
 		final JdbcTypeRegistry jdbcTypeRegistry = sessionFactory().getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		CompositeType homeAddressType = assertTyping( CompositeType.class, ep.getPropertyType( "homeAddress" ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java
index 64f59b123769..6988fbe6f9b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -44,7 +42,7 @@ protected boolean createSchema() {
 	 */
 	@Test
 	public void testSimpleConvertOverrides() {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Sub.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Sub.class.getName());
 		final JdbcTypeRegistry jdbcTypeRegistry = sessionFactory().getTypeConfiguration().getJdbcTypeRegistry();
 
 		BasicType type = (BasicType) ep.getPropertyType( "it" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
index 33a031675b9b..ee96483f325c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java
index a0fb7dcdd4bf..2fdf48e2a0f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -15,7 +13,7 @@
  */
 @Converter( autoApply = true )
 public class StringClobConverter implements AttributeConverter {
-	
+
 	@Override
 	public Clob convertToDatabaseColumn(String attribute) {
 		return null;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToDataBaseColumnThrowRuntimeExceptionConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToDataBaseColumnThrowRuntimeExceptionConverter.java
index 8006bb9c6c3e..acd91b145a20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToDataBaseColumnThrowRuntimeExceptionConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToDataBaseColumnThrowRuntimeExceptionConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToEntityAttributeThrowRuntimeExceptionConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToEntityAttributeThrowRuntimeExceptionConverter.java
index ed60297de1e5..c0a971d79fb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToEntityAttributeThrowRuntimeExceptionConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ToEntityAttributeThrowRuntimeExceptionConverter.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.converted.converter;
 
 import jakarta.persistence.AttributeConverter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java
index 692795e0b3c9..430e2ea7a469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
@@ -98,7 +96,7 @@ private void listen(Object entity) {
 
 	@Test
 	public void testSimpleConvertUsage() throws MalformedURLException {
-        final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
+		final EntityPersister ep = sessionFactory().getMappingMetamodel().getEntityDescriptor(Entity1.class.getName());
 		final Type theDatePropertyType = ep.getPropertyType( "theDate" );
 		final ConvertedBasicTypeImpl type = assertTyping(
 				ConvertedBasicTypeImpl.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/YearMonthConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/YearMonthConverterTest.java
index 3f68a27fc4bd..91fd8b5aeaca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/YearMonthConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/YearMonthConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java
index 1e70dbf869f0..7699f18f64c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java
index 7a5afdb3af89..cdc72a443560 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java
index fd74927348c4..9263e5db89a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalArea.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalArea.java
index f023b11a4fc1..fe14369529a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalArea.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalArea.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java
index e7f1f151962b..b2209636504c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/State.java
index 3bd3763eb6c6..9f06b794f7fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/State.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.caching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
index 02a38e235041..d9f13bc8217d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java
index 1a3fa47f3340..0efbd4960bd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapper.java
index 0711cdd1949b..cdfcc3d5e5f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperConverter.java
index ab8d0f6eaca8..4a24139d7cd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJavaType.java
index d3b2c12e312d..c686ca1e2f02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJdbcType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJdbcType.java
index 61cc5784ea8c..2b41a52089fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJdbcType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/PayloadWrapperJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java
index a87995d71cfd..45a2223cbec7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java
index a2ac26377008..a110458f2ac9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java
index ad0d443c1b05..a170d7c2cb73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java
index b27cee8ed678..7a73187464d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java
index f6a2361107e9..af493943bb51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java
index 67d82e8f0ff8..544e30592637 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.elementCollection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
index 07a144652b94..44b0e9667808 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.generics;
 
@@ -36,13 +34,13 @@
 /**
  * Test the ability to interpret and understand AttributeConverter impls which
  * use parameterized types as one of (typically the "attribute type") its parameter types.
- * 
+ *
  * @author Svein Baardsen
  * @author Steve Ebersole
  */
 @ServiceRegistry
 public class ParameterizedAttributeConverterParameterTypeTest {
-	
+
 	@Test
 	@JiraKey(value = "HHH-8804")
 	public void testGenericTypeParameters() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java
index 2e8ffee309d1..e87253117566 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.inheritence;
 
@@ -22,7 +20,7 @@
  * Test the ability to interpret and understand AttributeConverter impls when the base class does not
  * explicitly implement AttributeConverter but implements it via an interface or superclass. This also
  * involves resolving any TypeVariables to Class or ParameterizedType.
- * 
+ *
  * @author Svein Baardsen
  */
 @JiraKey(value = "HHH-8854")
@@ -145,5 +143,5 @@ public void testParameterizedTypeWithTypeVariableAttributeConverterTypeArguments
 			bootstrapContext.close();
 		}
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java
index db91e25e92c8..1c9999945614 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java
index 732c7763be1f..e2fc4d561e79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.literal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java
index ee4eb211548c..449ecaca042a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java
index 14bbdca44ec9..cf8431be67c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalArea.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalArea.java
index 7c973145be1d..8ae29c16240b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalArea.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalArea.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java
index 8ba19ba54b83..3cda279ae0db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/State.java
index 22bde1abe90e..3594a579fd96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/State.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.lob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorType.java
index 97e6ea0d06d9..60f9aa9f8f5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
@@ -39,4 +37,4 @@ else if ( YELLOW.color.equals( color ) ) {
 			throw new RuntimeException( "Unknown color : " + color );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java
index 6d15fe6a4807..905a13e66c92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementBaseTypeConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementBaseTypeConversionTest.java
index 18f150b7879d..99d8ff2807da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementBaseTypeConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementBaseTypeConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java
index af05051fb919..a1fb5a8d628b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java
index 7859b76822fe..3cc8633b36f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java
index 96e5f66939ea..3578b8af6178 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java
index d2687971920f..b2c71a6fa468 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java
index 981a1cd78aa3..21789aae86e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/AnotherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/AnotherEntity.java
index bdf95b9d1e56..c26aa34c815c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/AnotherEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/AnotherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
@@ -46,4 +44,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/DisablementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/DisablementTests.java
index 3a2f735220ef..4832b520ca5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/DisablementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/DisablementTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
index 01d602c69b9a..f5941eb34aad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
index 4612c89bd1c2..f5a6c403eddd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MatchingDuplicateRegistrationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MatchingDuplicateRegistrationTests.java
index b43d9ff9dc4b..a61eb37727bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MatchingDuplicateRegistrationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MatchingDuplicateRegistrationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
@@ -35,8 +33,8 @@ public void verifyMapping(DomainModelScope domainModelScope) {
 	@ConverterRegistration( converter = Thing1Converter.class )
 	@ConverterRegistration( converter = Thing1Converter.class )
 	public static class DupRegEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 		private String name;
 		private Thing1 thing1;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MismatchDuplicateRegistrationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MismatchDuplicateRegistrationTests.java
index 3a44098d3827..f75d0c6b12af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MismatchDuplicateRegistrationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/MismatchDuplicateRegistrationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
@@ -38,8 +36,8 @@ public void verifyMappingError(ServiceRegistryScope registryScope) {
 	@ConverterRegistration( converter = Thing1Converter.class )
 	@ConverterRegistration( converter = Thing1Converter.class, autoApply = false )
 	public static class TroublesomeEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 		private String name;
 		private Thing1 thing1;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity.java
index 99fe1196773c..2ee19fcb9e72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
@@ -64,4 +62,4 @@ public Thing2 getThing2() {
 	public void setThing2(Thing2 thing2) {
 		this.thing2 = thing2;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity2.java
index 6c7189ee889e..444114b900ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/TheEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
@@ -64,4 +62,4 @@ public Thing2 getThing2() {
 	public void setThing2(Thing2 thing2) {
 		this.thing2 = thing2;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing.java
index 3908be75787d..b23f4e386405 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1.java
index c477071c96a5..53ca6cb0a9b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1Converter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1Converter.java
index 0b2035b2371e..70b52abb2656 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1Converter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing1Converter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2.java
index 4e3a7b8d50d1..173399cdb3bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2Converter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2Converter.java
index ab460cdb1b0e..9f00cc39943d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2Converter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/Thing2Converter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/package-info.java
index a144aa508157..d425924bd3ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/package-info.java
@@ -31,4 +31,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.mapping.converted.converter.registrations;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.converted.converter.registrations;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
index 4a50b7978313..97b681c58bcf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
@@ -12,10 +10,8 @@
 import java.sql.Statement;
 
 import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.orm.test.mapping.enumeratedvalue.EnumeratedValueTests;
 import org.hibernate.type.SqlTypes;
 
-import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java
index 66695976e73b..77125b488021 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java
index 36e56ddec66f..08aeb1ca2d49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Gender.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Gender.java
index 379fcdb77a32..fd7dd881febe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Gender.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Gender.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/HairColor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/HairColor.java
index d367f98b7fef..722d7a922746 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/HairColor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/HairColor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java
index e6f6b81c4ef3..0a298e0d874c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java
index 2ef18da85623..4c567ad2946c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Person.java
index f4d8b4eb36d0..eb073a009442 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
@@ -10,7 +8,7 @@ public class Person {
 	private long id;
 
 	private Gender gender;
-	
+
 	private HairColor hairColor;
 
 	private HairColor originalHairColor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeEntity.java
index ea17eaf90386..0c5311274c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java
index 149417a6eee0..6bbbdb89589a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/VarcharEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/VarcharEnumTypeTest.java
index c332573ce578..3489a9cfa4fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/VarcharEnumTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/VarcharEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converted.enums;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/MoneyConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/MoneyConverterTest.java
index f7baec253034..392602b8b7bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/MoneyConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/MoneyConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringConverter.java
index 6d9ac100c52b..0e87e87ab876 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter;
 
@@ -16,16 +14,16 @@
 //tag::basic-jpa-convert-period-string-converter-example[]
 @Converter
 public class PeriodStringConverter
-        implements AttributeConverter {
+		implements AttributeConverter {
 
-    @Override
-    public String convertToDatabaseColumn(Period attribute) {
-        return attribute.toString();
-    }
+	@Override
+	public String convertToDatabaseColumn(Period attribute) {
+		return attribute.toString();
+	}
 
-    @Override
-    public Period convertToEntityAttribute(String dbData) {
-        return Period.parse(dbData);
-    }
+	@Override
+	public Period convertToEntityAttribute(String dbData) {
+		return Period.parse(dbData);
+	}
 }
 //end::basic-jpa-convert-period-string-converter-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringTest.java
index 08e71a3e3cec..2bae3323ec0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter;
 
@@ -25,73 +23,73 @@
  */
 public class PeriodStringTest extends BaseEntityManagerFunctionalTestCase {
 
-    private Period period = Period.ofYears(1).plusMonths(2).plusDays(3);
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                Event.class
-        };
-    }
-
-    @Test
-    public void testLifecycle() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Event event = new Event(period);
-            entityManager.persist(event);
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
-            assertEquals(period, event.getSpan());
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::basic-jpa-convert-period-string-converter-immutability-plan-example[]
-            Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
-            event.setSpan(Period
-                .ofYears(3)
-                .plusMonths(2)
-                .plusDays(1)
-           );
-            //end::basic-jpa-convert-period-string-converter-immutability-plan-example[]
-        });
-    }
-
-    //tag::basic-jpa-convert-period-string-converter-mapping-example[]
-    @Entity(name = "Event")
-    public static class Event {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @Convert(converter = PeriodStringConverter.class)
-        @Column(columnDefinition = "")
-        private Period span;
-
-        //Getters and setters are omitted for brevity
-
-    //end::basic-jpa-convert-period-string-converter-mapping-example[]
-
-        public Event() {
-        }
-
-        public Event(Period span) {
-            this.span = span;
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public Period getSpan() {
-            return span;
-        }
-
-        public void setSpan(Period span) {
-            this.span = span;
-        }
-
-        //tag::basic-jpa-convert-period-string-converter-mapping-example[]
-    }
-    //end::basic-jpa-convert-period-string-converter-mapping-example[]
+	private Period period = Period.ofYears(1).plusMonths(2).plusDays(3);
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				Event.class
+		};
+	}
+
+	@Test
+	public void testLifecycle() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Event event = new Event(period);
+			entityManager.persist(event);
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
+			assertEquals(period, event.getSpan());
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::basic-jpa-convert-period-string-converter-immutability-plan-example[]
+			Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
+			event.setSpan(Period
+				.ofYears(3)
+				.plusMonths(2)
+				.plusDays(1)
+		);
+			//end::basic-jpa-convert-period-string-converter-immutability-plan-example[]
+		});
+	}
+
+	//tag::basic-jpa-convert-period-string-converter-mapping-example[]
+	@Entity(name = "Event")
+	public static class Event {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Convert(converter = PeriodStringConverter.class)
+		@Column(columnDefinition = "")
+		private Period span;
+
+		//Getters and setters are omitted for brevity
+
+	//end::basic-jpa-convert-period-string-converter-mapping-example[]
+
+		public Event() {
+		}
+
+		public Event(Period span) {
+			this.span = span;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Period getSpan() {
+			return span;
+		}
+
+		public void setSpan(Period span) {
+			this.span = span;
+		}
+
+		//tag::basic-jpa-convert-period-string-converter-mapping-example[]
+	}
+	//end::basic-jpa-convert-period-string-converter-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Account.java
index 5126166fc329..b8b007b25c2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Account.java
@@ -1,45 +1,43 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter.hbm;
 
 //tag::basic-hbm-attribute-converter-mapping-account-example[]
 public class Account {
 
-    private Long id;
+	private Long id;
 
-    private String owner;
+	private String owner;
 
-    private Money balance;
+	private Money balance;
 
-    //Getters and setters are omitted for brevity
-    //end::basic-hbm-attribute-converter-mapping-account-example[]
-    public Long getId() {
-        return id;
-    }
+	//Getters and setters are omitted for brevity
+	//end::basic-hbm-attribute-converter-mapping-account-example[]
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getOwner() {
-        return owner;
-    }
+	public String getOwner() {
+		return owner;
+	}
 
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
+	public void setOwner(String owner) {
+		this.owner = owner;
+	}
 
-    public Money getBalance() {
-        return balance;
-    }
+	public Money getBalance() {
+		return balance;
+	}
 
-    public void setBalance(Money balance) {
-        this.balance = balance;
-    }
+	public void setBalance(Money balance) {
+		this.balance = balance;
+	}
 //tag::basic-hbm-attribute-converter-mapping-account-example[]
 }
 //end::basic-hbm-attribute-converter-mapping-account-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Money.java
index 2ba1c0b4d4ab..77417b4b8415 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Money.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/Money.java
@@ -1,26 +1,24 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter.hbm;
 
 //tag::basic-hbm-attribute-converter-mapping-money-example[]
 public class Money {
 
-    private long cents;
+	private long cents;
 
-    public Money(long cents) {
-        this.cents = cents;
-    }
+	public Money(long cents) {
+		this.cents = cents;
+	}
 
-    public long getCents() {
-        return cents;
-    }
+	public long getCents() {
+		return cents;
+	}
 
-    public void setCents(long cents) {
-        this.cents = cents;
-    }
+	public void setCents(long cents) {
+		this.cents = cents;
+	}
 }
 //end::basic-hbm-attribute-converter-mapping-money-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverter.java
index 119d3c742802..727299c98eca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter.hbm;
 
@@ -10,16 +8,16 @@
 
 //tag::basic-hbm-attribute-converter-mapping-moneyconverter-example[]
 public class MoneyConverter
-        implements AttributeConverter {
+		implements AttributeConverter {
 
-    @Override
-    public Long convertToDatabaseColumn(Money attribute) {
-        return attribute == null ? null : attribute.getCents();
-    }
+	@Override
+	public Long convertToDatabaseColumn(Money attribute) {
+		return attribute == null ? null : attribute.getCents();
+	}
 
-    @Override
-    public Money convertToEntityAttribute(Long dbData) {
-        return dbData == null ? null : new Money(dbData);
-    }
+	@Override
+	public Money convertToEntityAttribute(Long dbData) {
+		return dbData == null ? null : new Money(dbData);
+	}
 }
 //end::basic-hbm-attribute-converter-mapping-moneyconverter-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.java
index 2813b9205cec..b19d849d8e6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.converter.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/Book.java
index a750b9cdf910..bc1d5a4f689d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/DynamicEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/DynamicEntityTest.java
index a2ee359f6664..2916e408c6a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/DynamicEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/dynamic/DynamicEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java
index cf4b2250e426..93e4e6be3a4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -473,4 +471,4 @@ public int hashCode() {
 		result = 31 * result + Arrays.hashCode(theBinary);
 		return result;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/AggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/AggregateTest.java
index 6e1d7ccfa5c9..908dd652dee9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/AggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/AggregateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -21,7 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonAggregate.class)
 public class AggregateTest extends BaseSessionFactoryFunctionalTest {
@@ -149,4 +146,3 @@ public void setAggregate(Aggregate aggregate) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
index f1744c3bf85c..f14a04e3a84d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.sql.Clob;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
@@ -27,7 +24,6 @@
 
 import org.hibernate.Length;
 import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.engine.jdbc.ClobProxy;
 
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.domain.gambit.MutableValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableImplicitOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableImplicitOverrideTest.java
index 1d62c87ec525..7c07669a929d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableImplicitOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableImplicitOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableOverrideTest.java
index d86cbe9adabc..b132bd6e963a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableReusedColumnInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableReusedColumnInheritanceTest.java
index 6df11a90a9b8..be7f092032af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableReusedColumnInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableReusedColumnInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -158,4 +156,4 @@ public void setVolume(double volume) {
 			this.volume = volume;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithArrayAggregate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithArrayAggregate.java
index 8476d614947b..c99d79228910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithArrayAggregate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithArrayAggregate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java
index f01545f3d363..64042ddbcde6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -228,4 +232,4 @@ public void setEntityA(EntityA a) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation2Test.java
index be16b5250b86..a52d17585902 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation3Test.java
index 389ea2f6b5b4..4e54aeab914f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation3Test.java
@@ -1,7 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -14,8 +16,6 @@
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation4Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation4Test.java
index 72b0e0600179..b2d7b573ea4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation4Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociation4Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociationTest.java
index cce7ad6ff858..3ac35bfe6367 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithToOneAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableAndSchemaNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableAndSchemaNameTest.java
index e1feba741a87..2a17a9a86a80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableAndSchemaNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableAndSchemaNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
index d79b69e0ef5c..f419064ec541 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
index b5dc0d26e255..a8fa0bb69198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -47,9 +45,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Tuple;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @JiraKey("HHH-15862")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedAssociationEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedAssociationEmbeddableTest.java
index 4e516491f4ca..6dedb125615e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedAssociationEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedAssociationEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedEmbeddableTest.java
index b52bd66a27e6..3374b21f13f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
index 3d7f6f4dc2b6..695f5dd3f51e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.net.URL;
-import java.sql.Clob;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.Duration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
index 4b06a4884d9e..f5fdbca2fa8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
index 058dbb878ef2..943598c6b6c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/OracleNestedTableSettingProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/OracleNestedTableSettingProvider.java
index 68811510374c..e3a22e3249a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/OracleNestedTableSettingProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/OracleNestedTableSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentCacheTest.java
index a5660322c225..95fefe15fa2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentTest.java
index 66f67132da1d..68f7db3089f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/ParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -118,7 +116,7 @@ public static class City {
 		//Getters and setters omitted for brevity
 
 	//end::embeddable-Parent-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableEquivalentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableEquivalentTest.java
index 701c928c3035..02d101d9c059 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableEquivalentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableEquivalentTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableTest.java
index 89832b7b07c9..c7109c1e836f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/SimpleEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
index cf7d0ca9d312..d2b5d5980760 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
index 25e0ba7d6cdd..044521487fed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
index 2bc5dea99ee0..f737ddf651ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/TargetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/TargetTest.java
index 645eab064fe8..d8512146b702 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/TargetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/TargetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable;
 
@@ -105,7 +103,7 @@ public static class City {
 		//Getters and setters omitted for brevity
 
 	//end::embeddable-Target-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/UpdateEntityWithIdClassAndJsonFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/UpdateEntityWithIdClassAndJsonFieldTest.java
index f40d16c4b8d3..7b01d3154ec0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/UpdateEntityWithIdClassAndJsonFieldTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/UpdateEntityWithIdClassAndJsonFieldTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddableWithToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddableWithToOneAssociationTest.java
index 4e47851e5154..ba36e92a9dfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddableWithToOneAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddableWithToOneAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.elementcollection;
 
 import java.util.Set;
@@ -16,7 +20,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociation2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociation2Test.java
index 20d2582e736a..99c07d1368e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociation2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociation2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.elementcollection;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java
index e9fe663b390f..532ff2a2bbbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.elementcollection;
 
 import java.util.ArrayList;
@@ -204,4 +208,4 @@ public void setIdenticallyNamedAssociation(EntityA a) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Customer.java
index 18bfbfa7e630..08c1f76354d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.initializer;
 
@@ -39,4 +37,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/EmbeddableInitializerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/EmbeddableInitializerTests.java
index 19b1f8fe13cc..a2b370d930df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/EmbeddableInitializerTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/EmbeddableInitializerTests.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.initializer;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Order.java
index 686b8a7570f9..fe2ba73ab46b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.initializer;
 
@@ -58,4 +56,4 @@ public Float getAmount() {
 	public void setAmount(Float amount) {
 		this.amount = amount;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/OrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/OrderId.java
index 4550fbcfbef4..5f73ef5177c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/OrderId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/OrderId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.initializer;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/package-info.java
index 8b40c13a8054..2ff8a850222b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/initializer/package-info.java
@@ -11,4 +11,4 @@
  * {@link org.hibernate.sql.results.graph.embeddable.EmbeddableInitializer}
  * impls
  */
-package org.hibernate.orm.test.mapping.embeddable.initializer;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.embeddable.initializer;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/FromAttributeFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/FromAttributeFactoryTests.java
index 32412ad377fb..a821efaac5f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/FromAttributeFactoryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/FromAttributeFactoryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/InstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/InstantiationTests.java
index 041ac2049e00..8104444b672a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/InstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/InstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
index c8662482bbe3..204ace71f77f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/NameInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/NameInstantiator.java
index c4edc67da8b2..ad990150e109 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/NameInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/NameInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Person.java
index 7ff88895c183..a1b865454496 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embeddable; /**
  * @author Steve Ebersole
@@ -72,4 +70,3 @@ public void addAlias(Name alias) {
 //tag::embeddable-instantiator-class[]
 }
 //end::embeddable-instantiator-class[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/InstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/InstantiationTests.java
index efd4b7ebc584..b6e178763c90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/InstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/InstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
index e6e99cdccbce..4db4bc9f4071 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
 
@@ -34,4 +32,4 @@ public String getLastName() {
 		return last;
 	}
 }
-//end::embeddable-instantiator-embeddable[]
\ No newline at end of file
+//end::embeddable-instantiator-embeddable[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/NameInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/NameInstantiator.java
index b1b05abca754..370d06296708 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/NameInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/NameInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Person.java
index da4fcaf71a7c..a12fae941df9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded; /**
  * @author Steve Ebersole
@@ -78,4 +76,4 @@ public void addAlias(Name alias) {
 
 //tag::embeddable-instantiator-property[]
 }
-//end::embeddable-instantiator-property[]
\ No newline at end of file
+//end::embeddable-instantiator-property[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/package-info.java
index 73ee2a4d75f9..c955a6b68f86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Tests for custom {@link org.hibernate.metamodel.spi.EmbeddableInstantiator} usage
  */
-package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/InstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/InstantiationTests.java
index b2b7e3166cbb..33a0eeb328f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/InstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/InstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Name.java
index f4b20d171999..5ebcc796c781 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameImpl.java
index 572672e048af..d8e6cf40f360 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf;
 
@@ -30,4 +28,4 @@ public String getLastName() {
 		return last;
 	}
 }
-//end::embeddable-instantiator-property[]
\ No newline at end of file
+//end::embeddable-instantiator-property[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameInstantiator.java
index b3c0b806a9b0..1aeda80e9ef8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/NameInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Person.java
index 456ccd343d0e..c5ff15dc6849 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/InstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/InstantiationTests.java
index 97243c75e19f..98f23c2f730b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/InstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/InstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Name.java
index a5e69200c6fb..ff62eef819f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/NameInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/NameInstantiator.java
index ca13085df442..fa5228820b18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/NameInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/NameInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Person.java
index a67e21b4de59..3f6ba6e53d8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/intf2/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.intf2;
 
@@ -78,4 +76,3 @@ public void addAlias(Name alias) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/InstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/InstantiationTests.java
index 4ed14c0e2be0..a69716d7bd60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/InstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/InstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.registered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
index bd150219e99d..08f836f4ccb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.registered;
 
@@ -32,4 +30,4 @@ public String getLastName() {
 		return last;
 	}
 }
-//end::embeddable-instantiator-registration[]
\ No newline at end of file
+//end::embeddable-instantiator-registration[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/NameInstantiator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/NameInstantiator.java
index ad6dc242015a..9ca97d34f486 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/NameInstantiator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/NameInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.registered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Person.java
index cf8b9c67b2a9..009a753891c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.registered; /**
  * @author Steve Ebersole
@@ -77,4 +75,4 @@ public void addAlias(Name alias) {
 
 //tag::embeddable-instantiator-registration[]
 }
-//end::embeddable-instantiator-registration[]
\ No newline at end of file
+//end::embeddable-instantiator-registration[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/CompositeUserTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/CompositeUserTypeTests.java
index 42c36c91c471..2ac8bd573c13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/CompositeUserTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/CompositeUserTypeTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Name.java
index 7c2a408361c0..d6da6d7a5020 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded;
 
@@ -24,4 +22,4 @@ public String lastName() {
 		return last;
 	}
 }
-//end::embeddable-usertype-domain[]
\ No newline at end of file
+//end::embeddable-usertype-domain[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/NameCompositeUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/NameCompositeUserType.java
index 76f399aeee08..86fd762385d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/NameCompositeUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/NameCompositeUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Person.java
index bad616286d4f..40733ce06182 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded;
 
@@ -83,4 +81,4 @@ public void addAlias(Name alias) {
 
 //tag::embeddable-usertype-property[]
 }
-//end::embeddable-usertype-property[]
\ No newline at end of file
+//end::embeddable-usertype-property[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Child.java
index 1539c2bb0284..9cc7ede645fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Child.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge;
 
 import org.hibernate.annotations.CompositeType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java
index a75817b17ca0..62946c8f852c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValue.java
index 4ae3b2ca7432..defeb95efb04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValue.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge;
 
 public class MyCompositeValue {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValueType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValueType.java
index 8f2702881660..3ff9b6aa4fff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValueType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MyCompositeValueType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Parent.java
index 54cb13a2e6a1..24a460df3665 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/Parent.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/CompositeUserTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/CompositeUserTypeTests.java
index eea9c37b4de2..b25a53db0bfb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/CompositeUserTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/CompositeUserTypeTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.registered;
 
 import org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.Name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/Person.java
index 80d86e5f8905..8e2e712d2c26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/registered/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.registered;
 
@@ -84,4 +82,4 @@ public void addAlias(Name alias) {
 
 //tag::embeddable-usertype-registration[]
 }
-//end::embeddable-usertype-registration[]
\ No newline at end of file
+//end::embeddable-usertype-registration[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/BadEnumeratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/BadEnumeratedValueTests.java
index 71aad3f9eaf3..6d91d0e0d417 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/BadEnumeratedValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/BadEnumeratedValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.enumeratedvalue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
index 9a0359483b29..2443d186fdc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.enumeratedvalue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
index 2701c565c454..ea0898d4bad4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.enumeratedvalue;
 
@@ -11,7 +9,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
index 1412e3673fd2..c32c077ba1ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.enumeratedvalue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java
index 02b5857c27c1..8546898f6dd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.batch;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.Hibernate;
 import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.orm.test.mapping.fetch.subselect.SubselectFetchCollectionFromBatchTest;
 import org.hibernate.proxy.HibernateProxy;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java
index e8de9c688d3e..502f92d4a2ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.batch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneBatchTest.java
index 5d10e13e2703..4720ab571b98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneBatchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.fetch.depth;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneTest.java
index 0cfdf2c4f563..26ba2a231239 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/DepthOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.fetch.depth;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java
index 4fa706d7b0c6..68ea3c8cd58c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth;
 
@@ -13,7 +11,6 @@
 
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.tool.schema.Action;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule.java
index a66745faa52e..e0c7bbee309f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth;
 
@@ -20,19 +18,19 @@
 @Entity
 @Table(name = "sys_mod")
 public class SysModule {
-    @Id
-    private Integer id;
+	@Id
+	private Integer id;
 
-    @Column(name = "name")
-    private String name;
+	@Column(name = "name")
+	private String name;
 
 //    @OneToMany( cascade = CascadeType.PERSIST, fetch = FetchType.EAGER )
 //    @JoinColumn( name = "target_mod_fk" )
-    @ManyToMany( targetEntity = SysModule.class, cascade = { CascadeType.PERSIST }, fetch = FetchType.EAGER )
-    @JoinTable(
-            name = "sys_group_mod",
-            joinColumns = @JoinColumn(name = "src_fk", referencedColumnName = "id"),
-            inverseJoinColumns = @JoinColumn(name = "target_fk", referencedColumnName = "id")
-    )
-    private Set targetModules;
+	@ManyToMany( targetEntity = SysModule.class, cascade = { CascadeType.PERSIST }, fetch = FetchType.EAGER )
+	@JoinTable(
+			name = "sys_group_mod",
+			joinColumns = @JoinColumn(name = "src_fk", referencedColumnName = "id"),
+			inverseJoinColumns = @JoinColumn(name = "target_fk", referencedColumnName = "id")
+	)
+	private Set targetModules;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule2.java
index 1153ed9ec07d..8cd3cb728f16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/SysModule2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth;
 
@@ -19,13 +17,13 @@
 @Entity
 @Table(name = "sys_mod")
 public class SysModule2 {
-    @Id
-    private Integer id;
+	@Id
+	private Integer id;
 
-    @Column(name = "name")
-    private String name;
+	@Column(name = "name")
+	private String name;
 
-    @OneToMany( cascade = CascadeType.PERSIST, fetch = FetchType.EAGER )
-    @JoinColumn( name = "target_mod_fk" )
-    private Set targetModules;
+	@OneToMany( cascade = CascadeType.PERSIST, fetch = FetchType.EAGER )
+	@JoinColumn( name = "target_mod_fk" )
+	private Set targetModules;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/AbstractFormFetchDepthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/AbstractFormFetchDepthTest.java
index 1f87338c9767..5602e8f01a30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/AbstractFormFetchDepthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/AbstractFormFetchDepthTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth.form;
 
@@ -25,7 +23,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ForeignKey;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinColumns;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth0Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth0Test.java
index 74f936c8cc4e..6ef2b04e6949 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth0Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth0Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth.form;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth1Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth1Test.java
index 919514e78b65..253d86ec37c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth1Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth1Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth.form;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth2Test.java
index 73c3c1e9febb..db59d53b4d8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/form/FormFetchDepth2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.depth.form;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Child.java
index 1ba508bcbe1d..978213d12621 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Child.java 6095 2005-03-17 05:57:29Z oneovthafew $
 package org.hibernate.orm.test.mapping.fetch.subselect;
 import java.util.List;
 
@@ -24,17 +20,17 @@ public Child(String name) {
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
 	public List getFriends() {
 		return friends;
 	}
-	
+
 	public void setFriends(List friends) {
 		this.friends = friends;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Name.java
index e241060c23e2..28d183293875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
@@ -10,26 +8,26 @@
 import java.util.List;
 
 public class Name implements Serializable {
-   private int id;
-   private String name;
-   private int nameLength;
-   private List values;
+private int id;
+private String name;
+private int nameLength;
+private List values;
 
-   public int getId() { return id; }
-   public String getName() { return name; }
-   public int getNameLength() { return nameLength; }
-   public List getValues() { return values; }
+public int getId() { return id; }
+public String getName() { return name; }
+public int getNameLength() { return nameLength; }
+public List getValues() { return values; }
 
-   public void setId(int id) { this.id = id; }
-   public void setName(String name) { this.name = name; }
-   public void setNameLength(int nameLength) { this.nameLength = nameLength; }
-   public void setValues(List values) { this.values = values; }
+public void setId(int id) { this.id = id; }
+public void setName(String name) { this.name = name; }
+public void setNameLength(int nameLength) { this.nameLength = nameLength; }
+public void setValues(List values) { this.values = values; }
 
-   public boolean equals(Object obj) {
-      if (!(obj instanceof Name )) return false;
-      Name other = (Name) obj;
-      return other.id == this.id;
-   }
+public boolean equals(Object obj) {
+	if (!(obj instanceof Name )) return false;
+	Name other = (Name) obj;
+	return other.id == this.id;
+}
 
-   public int hashCode() { return id; }
+public int hashCode() { return id; }
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Parent.java
index 9bf91d6cc26a..4f892554c3dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Parent.java 6095 2005-03-17 05:57:29Z oneovthafew $
 package org.hibernate.orm.test.mapping.fetch.subselect;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +13,7 @@ public class Parent {
 	private String name;
 	private List children = new ArrayList();
 	private List moreChildren = new ArrayList();
-	
+
 	Parent() {}
 	public Parent(String name) {
 		this.name = name;
@@ -26,7 +22,7 @@ public Parent(String name) {
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -38,14 +34,14 @@ public List getChildren() {
 	public void setChildren(List children) {
 		this.children = children;
 	}
-	
+
 	public List getMoreChildren() {
 		return moreChildren;
 	}
-	
+
 	public void setMoreChildren(List moreChildren) {
 		this.moreChildren = moreChildren;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java
index de75979be736..4dd50d46f119 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java
index a67328a93c27..64b3353df03a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java
index 6a70a880dc73..e7aef49714fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java
index 3e133b89a161..2ec94180e139 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java
index 2cc2f108a38a..2b845d912a4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java
index d101fa7de0af..ab88c125ae58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2006-2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java
index 8a46684f2d52..643b33348a14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
@@ -361,4 +359,3 @@ public void testSubselectFetchCriteria(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTest.java
index 1f29f8877f2a..916c2d0a86f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTransactSqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTransactSqlTest.java
index 8134e7a20974..367242439a89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTransactSqlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchWithFormulaTransactSqlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectOneToManyTest.java
index 72c86bac3516..a9efcd07aa73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Value.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Value.java
index 7a49c46eeac9..4cfa3e42462e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Value.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/Value.java
@@ -1,31 +1,29 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.fetch.subselect;
 
 import java.io.Serializable;
 
 public class Value implements Serializable {
-   private int id;
-   private Name name;
-   private String value;
+private int id;
+private Name name;
+private String value;
 
-   public int getId() { return id; }
-   public Name getName() { return name; }
-   public String getValue() { return value; }
+public int getId() { return id; }
+public Name getName() { return name; }
+public String getValue() { return value; }
 
-   public void setId(int id) { this.id = id; }
-   public void setName(Name name) { this.name = name; }
-   public void setValue(String value) { this.value = value; }
+public void setId(int id) { this.id = id; }
+public void setName(Name name) { this.name = name; }
+public void setValue(String value) { this.value = value; }
 
-   public boolean equals(Object obj) {
-      if (!(obj instanceof Value )) return false;
-      Value other = (Value) obj;
-      return other.id == this.id;
-   }
+public boolean equals(Object obj) {
+	if (!(obj instanceof Value )) return false;
+	Value other = (Value) obj;
+	return other.id == this.id;
+}
 
-   public int hashCode() { return id; }
+public int hashCode() { return id; }
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/EntityOfFormulas.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/EntityOfFormulas.java
index 154336137a44..8e589cfc5e9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/EntityOfFormulas.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/EntityOfFormulas.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java
index fce269df3638..29c92af2fbea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
index 31ba635ef3a3..fe87ce7923de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java
index 65ec60f6b267..e9bb49fb1b8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
@@ -30,7 +28,6 @@
 
 import static org.hibernate.testing.hamcrest.CollectionMatchers.hasSize;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Алексей Макаров
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
index 1319fd2716f2..7734d426c818 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java
index 74a353c80295..2106666a553c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
@@ -68,7 +66,7 @@ void testFormulaWithAlias(SessionFactoryScope scope) {
 	void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction( session -> session.createQuery( "delete from Customer" ).executeUpdate() );
 	}
-	
+
 	@Entity(name = "Customer")
 	public static class Customer implements Serializable{
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java
index c78af26d4fd2..f0dc6ea70410 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java
index 3d31ebeda17c..223b1f8e584d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java
index 5ae111792582..42f22b3d5b1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java
index f7333d46f9d9..2c502097a642 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java
index a5d5cda71720..f11e57c0d876 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComponentOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComponentOwner.java
index e25fb5aa2059..fb241d1eeed5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComponentOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComponentOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CreationTimestampTest.java
index 8b0e1fd54c3f..40e88ee072f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CreationTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CreationTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java
index e672beb0b4f8..4b09234988d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DatabaseValueGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DatabaseValueGenerationTest.java
index 1b1e6ce67014..7e44174ece7c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DatabaseValueGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DatabaseValueGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java
index cbdf7c4bca64..ad1f742e3783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java
index c87d00f4215f..6e5ef18af582 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationBatchTest.java
index 37e0517d02e5..b2abd14780cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationBatchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
index 7542a69072d4..49ab151cb56d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedPropertyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedPropertyEntity.java
index 5bde6cf314d6..6dfdf82dfef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedPropertyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedPropertyEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: GeneratedPropertyEntity.java 7800 2005-08-10 12:13:00Z steveebersole $
 package org.hibernate.orm.test.mapping.generated;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedTest.java
index 3a79d87a6fd1..e428bfc064ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
index 54ec55980fda..6020b8a14d55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
@@ -112,7 +110,7 @@ public EnumSet getEventTypes() {
 			return events;
 		}
 	}
-	
+
 	@Entity(name = "Person")
 	public static class Person {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java
index 111e8229b750..bff3eff95168 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InMemoryValueGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InMemoryValueGenerationTest.java
index 2357d57887be..4aef1bb16b69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InMemoryValueGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InMemoryValueGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java
index 126184c624c4..fd7b16f00592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java
index 26336479d70a..b0de94c6d10f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java
index e52d0eb8e276..f2387c8c2a06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java
index 58e623605781..5b95441d160e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java
index 8c702aad98fb..310d5a6bd582 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java
index f6b73c3f2d13..aa7f6e0288c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticGeneration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticGeneration.java
index eb108db08621..81c5c06ad15f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticGeneration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
index 343efe4e13b8..20ab5369412c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TimestampGeneratedValuesWithCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TimestampGeneratedValuesWithCachingTest.java
index cd6aa4d3007f..8de6182f6583 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TimestampGeneratedValuesWithCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TimestampGeneratedValuesWithCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithCachingTest.java
index 35f6a13b1f53..13522fc46424 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithoutCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithoutCachingTest.java
index 573130579c87..5fcec64e3544 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithoutCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/TriggerGeneratedValuesWithoutCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/UpdateTimestampTest.java
index a4c30a90fba0..6b4b42d9b5ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/UpdateTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/UpdateTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
index 43d05d985acc..40cef4b0e802 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.always;
 
 import jakarta.persistence.Column;
@@ -35,43 +39,43 @@
 @SkipForDialect(dialectClass = AltibaseDialect.class, reason = "generated always is not supported in Altibase")
 public class GeneratedAlwaysTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            BigDecimal unitPrice = new BigDecimal("12.99");
-            OrderLine entity = new OrderLine( unitPrice, 5, 10 );
-            session.persist(entity);
-            session.flush();
-            assertEquals( 5, entity.quantity );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( unitPrice.multiply( new BigDecimal("5") ), entity.total );
-            assertEquals( 58, entity.discounted.intValue() );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			BigDecimal unitPrice = new BigDecimal("12.99");
+			OrderLine entity = new OrderLine( unitPrice, 5, 10 );
+			session.persist(entity);
+			session.flush();
+			assertEquals( 5, entity.quantity );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( unitPrice.multiply( new BigDecimal("5") ), entity.total );
+			assertEquals( 58, entity.discounted.intValue() );
+		} );
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createQuery( "delete WithGeneratedAlways" ).executeUpdate() );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithGeneratedAlways" ).executeUpdate() );
+	}
 
-    @Entity(name="WithGeneratedAlways")
-    public static class OrderLine {
-        @Id
-        private BigDecimal unitPrice;
-        @Id
-        private int quantity;
-        private int discount;
-        @GeneratedColumn(value = "unitPrice*quantity")
-        private BigDecimal total;
-        @Column(name = "discountedTotal")
-        @GeneratedColumn(value = "unitPrice*quantity*(1.0-discount/100.0)")
-        private BigDecimal discounted;
+	@Entity(name="WithGeneratedAlways")
+	public static class OrderLine {
+		@Id
+		private BigDecimal unitPrice;
+		@Id
+		private int quantity;
+		private int discount;
+		@GeneratedColumn(value = "unitPrice*quantity")
+		private BigDecimal total;
+		@Column(name = "discountedTotal")
+		@GeneratedColumn(value = "unitPrice*quantity*(1.0-discount/100.0)")
+		private BigDecimal discounted;
 
-        public OrderLine() {}
-        public OrderLine(BigDecimal unitPrice, int quantity, int discount) {
-            this.unitPrice = unitPrice;
-            this.quantity = quantity;
-            this.discount = discount;
-        }
-    }
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity, int discount) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+			this.discount = discount;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
index e6262357f184..68293f843ea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.delegate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java
index 3933ad3a2c50..0049ce648657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.delegate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateJoinedInheritanceTest.java
index 3e75c4e6a845..5b053d098d26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.delegate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java
index f259d120a6ba..dd0b81597c8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.delegate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateTest.java
index 2738bbe3907d..625c1041d9b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.delegate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
index 4c58576146b1..c8ae79388c19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.sqldefault;
 
 import java.math.BigDecimal;
@@ -24,51 +28,51 @@
 @SessionFactory
 public class DefaultTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        BigDecimal unitPrice = new BigDecimal("12.99");
-        scope.inTransaction( session -> {
-            OrderLine entity = new OrderLine( unitPrice, 5 );
-            session.persist(entity);
-            session.flush();
-            assertEquals( "new", entity.status );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "new", entity.status );
-            entity.status = "old"; //should be ignored when fetch=true
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "new", entity.status );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			session.persist(entity);
+			session.flush();
+			assertEquals( "new", entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "new", entity.status );
+			entity.status = "old"; //should be ignored when fetch=true
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "new", entity.status );
+		} );
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+	}
 
-    @Entity(name="WithDefault")
-    public static class OrderLine {
-        @Id
-        private BigDecimal unitPrice;
-        @Id @ColumnDefault(value = "1")
-        private int quantity;
-        @Generated
-        @ColumnDefault(value = "'new'")
-        private String status;
+	@Entity(name="WithDefault")
+	public static class OrderLine {
+		@Id
+		private BigDecimal unitPrice;
+		@Id @ColumnDefault(value = "1")
+		private int quantity;
+		@Generated
+		@ColumnDefault(value = "'new'")
+		private String status;
 
-        public OrderLine() {}
-        public OrderLine(BigDecimal unitPrice, int quantity) {
-            this.unitPrice = unitPrice;
-            this.quantity = quantity;
-        }
-    }
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
index 7eb8f073f09e..583faa7b9090 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.sqldefault;
 
 import jakarta.persistence.Entity;
@@ -22,78 +26,78 @@
 @SessionFactory
 public class DynamicDefaultTest {
 
-    @Test
-    public void testWithDefault(SessionFactoryScope scope) {
-        BigDecimal unitPrice = new BigDecimal("12.99");
-        scope.inTransaction( session -> {
-            OrderLine entity = new OrderLine( unitPrice, 5 );
-            session.persist(entity);
-            session.flush();
-            assertNull( entity.status );
-            String status = session.createQuery("select status from WithDefault", String.class).getSingleResult();
-            assertEquals( "new", status );
-            session.refresh(entity);
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
+	@Test
+	public void testWithDefault(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			session.persist(entity);
+			session.flush();
+			assertNull( entity.status );
+			String status = session.createQuery("select status from WithDefault", String.class).getSingleResult();
+			assertEquals( "new", status );
+			session.refresh(entity);
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
 //            assertEquals( "new", entity.status ); //TODO: assertion currently fails; apparent bug in refresh()
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "new", entity.status );
-            entity.status = "old";
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "old", entity.status );
-        } );
-    }
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "new", entity.status );
+			entity.status = "old";
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "old", entity.status );
+		} );
+	}
 
-    @Test
-    public void testWithExplicit(SessionFactoryScope scope) {
-        BigDecimal unitPrice = new BigDecimal("12.99");
-        scope.inTransaction( session -> {
-            OrderLine entity = new OrderLine( unitPrice, 5 );
-            entity.status = "New";
-            session.persist(entity);
-            session.flush();
-            String status = session.createQuery("select status from WithDefault", String.class).getSingleResult();
-            assertEquals( "New", status );
-            session.refresh(entity);
-            assertEquals( "New", entity.status );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "New", entity.status );
-        } );
-    }
+	@Test
+	public void testWithExplicit(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			entity.status = "New";
+			session.persist(entity);
+			session.flush();
+			String status = session.createQuery("select status from WithDefault", String.class).getSingleResult();
+			assertEquals( "New", status );
+			session.refresh(entity);
+			assertEquals( "New", entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "New", entity.status );
+		} );
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+	}
 
-    @Entity(name="WithDefault")
-    @DynamicInsert
-    public static class OrderLine {
-        @Id
-        private BigDecimal unitPrice;
-        @Id @ColumnDefault(value = "1")
-        private int quantity;
-        @ColumnDefault(value = "'new'")
-        private String status;
+	@Entity(name="WithDefault")
+	@DynamicInsert
+	public static class OrderLine {
+		@Id
+		private BigDecimal unitPrice;
+		@Id @ColumnDefault(value = "1")
+		private int quantity;
+		@ColumnDefault(value = "'new'")
+		private String status;
 
-        public OrderLine() {}
-        public OrderLine(BigDecimal unitPrice, int quantity) {
-            this.unitPrice = unitPrice;
-            this.quantity = quantity;
-        }
-    }
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
index ada7b5b3465e..8600a90ed865 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.sqldefault;
 
 import java.math.BigDecimal;
@@ -26,58 +30,58 @@
 @SessionFactory
 public class OverriddenDefaultTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        BigDecimal unitPrice = new BigDecimal("12.99");
-        scope.inTransaction( session -> {
-            OrderLine entity = new OrderLine( unitPrice, 5 );
-            session.persist(entity);
-            session.flush();
-            assertEquals( getDefault(scope), entity.status );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( getDefault(scope), entity.status );
-            entity.status = "old"; //should be ignored when fetch=true
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( getDefault(scope), entity.status );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			session.persist(entity);
+			session.flush();
+			assertEquals( getDefault(scope), entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( getDefault(scope), entity.status );
+			entity.status = "old"; //should be ignored when fetch=true
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( getDefault(scope), entity.status );
+		} );
+	}
 
-    String getDefault(SessionFactoryScope scope) {
-        return scope.getMetadataImplementor().getDatabase().getDialect() instanceof H2Dialect ? "NEW" : "new";
-    }
+	String getDefault(SessionFactoryScope scope) {
+		return scope.getMetadataImplementor().getDatabase().getDialect() instanceof H2Dialect ? "NEW" : "new";
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+	}
 
-    @Entity(name="WithDefault")
-    public static class OrderLine {
-        @Id
-        private BigDecimal unitPrice;
-        @Id @ColumnDefault("1")
-        private int quantity;
-        @Generated
-        @ColumnDefault("'new'")
-        @DialectOverride.ColumnDefault(dialect = H2Dialect.class,
-                sameOrAfter = @DialectOverride.Version(major=1, minor=4),
-                override = @ColumnDefault("'NEW'"))
-        private String status;
+	@Entity(name="WithDefault")
+	public static class OrderLine {
+		@Id
+		private BigDecimal unitPrice;
+		@Id @ColumnDefault("1")
+		private int quantity;
+		@Generated
+		@ColumnDefault("'new'")
+		@DialectOverride.ColumnDefault(dialect = H2Dialect.class,
+				sameOrAfter = @DialectOverride.Version(major=1, minor=4),
+				override = @ColumnDefault("'NEW'"))
+		private String status;
 
-        public OrderLine() {}
-        public OrderLine(BigDecimal unitPrice, int quantity) {
-            this.unitPrice = unitPrice;
-            this.quantity = quantity;
-        }
-    }
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
index f2444dd9a717..c007a45af186 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.sqldefault;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
index c01d720d1437..01531054a54c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.generated.sqldefault;
 
 import jakarta.persistence.Entity;
@@ -21,55 +25,55 @@
 @SessionFactory
 public class RefreshTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        BigDecimal unitPrice = new BigDecimal("12.99");
-        scope.inTransaction( session -> {
-            OrderLine entity = new OrderLine( unitPrice, 5 );
-            session.persist(entity);
-            session.flush();
-            assertEquals( null, entity.status );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            session.refresh(entity);
-            assertEquals( "new", entity.status );
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "new", entity.status );
-            entity.status = "old";
-        } );
-        scope.inTransaction( session -> {
-            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
-            assertEquals( unitPrice, entity.unitPrice );
-            assertEquals( 5, entity.quantity );
-            assertEquals( "old", entity.status );
-        } );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			session.persist(entity);
+			session.flush();
+			assertEquals( null, entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			session.refresh(entity);
+			assertEquals( "new", entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "new", entity.status );
+			entity.status = "old";
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "old", entity.status );
+		} );
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+	}
 
-    @Entity(name="WithDefault")
-    @DynamicInsert
-    public static class OrderLine {
-        @Id
-        private BigDecimal unitPrice;
-        @Id @ColumnDefault(value = "1")
-        private int quantity;
-        @ColumnDefault(value = "'new'")
-        private String status;
+	@Entity(name="WithDefault")
+	@DynamicInsert
+	public static class OrderLine {
+		@Id
+		private BigDecimal unitPrice;
+		@Id @ColumnDefault(value = "1")
+		private int quantity;
+		@ColumnDefault(value = "'new'")
+		private String status;
 
-        public OrderLine() {}
-        public OrderLine(BigDecimal unitPrice, int quantity) {
-            this.unitPrice = unitPrice;
-            this.quantity = quantity;
-        }
-    }
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java
index 483e447a9274..c4b07f91b3df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java
index 3b4bba4d91ac..00891275b7c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
@@ -115,17 +113,17 @@ public Object generate(SharedSessionContractImplementor session, Object owner, O
 	@Entity( name = "GeneratedUuidEntity" )
 	@Table( name = "t_gen_uuid" )
 	public static class GeneratedUuidEntity {
-	    @Id
-	    public Integer id;
-	    @Basic
-	    public String name;
+		@Id
+		public Integer id;
+		@Basic
+		public String name;
 
 		//tag::mapping-generated-custom-ex1[]
 		@GeneratedUuidValue( timing = INSERT )
 		public UUID createdUuid;
 
 		@GeneratedUuidValue( timing = {INSERT, UPDATE} )
-	    public UUID updatedUuid;
+		public UUID updatedUuid;
 		//end::mapping-generated-custom-ex1[]
 
 		public GeneratedUuidEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java
index 12c3f59e80f6..221e9a135cf3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
@@ -11,7 +9,6 @@
 import org.hibernate.HibernateError;
 import org.hibernate.annotations.CurrentTimestamp;
 import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.generator.EventType;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGenerated.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGenerated.java
index ddc4ba5a799d..c1e4182dee94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGenerated.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGenerated.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java
index 280fe2b37f22..12eb33b38e75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
index 05311eba6825..83c4f3c9ac4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java
index 59b94cb3e5cd..4ebb577ffec7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14276;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStat.java
index 9b42bb53d2a8..9e2ba59a555e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14276.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStatId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStatId.java
index d9eb0b229790..bb2c044ba7ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStatId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/PlayerStatId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14276.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/Score.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/Score.java
index 81f1ddfbcf21..7a3916886df5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/Score.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/Score.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14276.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/ScoreId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/ScoreId.java
index c21947bca71a..7a67347e76a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/ScoreId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/entity/ScoreId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14276.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java
index 70080c8a616a..96f9fdcf0660 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh14343;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStat.java
index 9df26366b46c..c21cd7e49875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStat.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
@@ -17,53 +21,53 @@
 @IdClass(NestedPlayerStatId.class)
 public class NestedPlayerStat implements Serializable
 {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    @Id
-    @Column(name = "player_id")
-    private Integer playerId;
+	@Id
+	@Column(name = "player_id")
+	private Integer playerId;
 
-    @Basic(optional = false)
-    @Column(name = "jersey_nbr")
-    private Integer jerseyNbr;
+	@Basic(optional = false)
+	@Column(name = "jersey_nbr")
+	private Integer jerseyNbr;
 
-    @Id
-    @ManyToOne(optional = false, fetch = FetchType.EAGER)
-    @JoinColumn(name = "game_id", referencedColumnName = "game_id")
-    @JoinColumn(name = "is_home", referencedColumnName = "is_home")
-    private NestedScore score;
+	@Id
+	@ManyToOne(optional = false, fetch = FetchType.EAGER)
+	@JoinColumn(name = "game_id", referencedColumnName = "game_id")
+	@JoinColumn(name = "is_home", referencedColumnName = "is_home")
+	private NestedScore score;
 
-    public NestedPlayerStat()
-    {
-    }
+	public NestedPlayerStat()
+	{
+	}
 
-    public Integer getPlayerId()
-    {
-        return playerId;
-    }
+	public Integer getPlayerId()
+	{
+		return playerId;
+	}
 
-    public void setPlayerId(Integer playerId)
-    {
-        this.playerId = playerId;
-    }
+	public void setPlayerId(Integer playerId)
+	{
+		this.playerId = playerId;
+	}
 
-    public Integer getJerseyNbr()
-    {
-        return jerseyNbr;
-    }
+	public Integer getJerseyNbr()
+	{
+		return jerseyNbr;
+	}
 
-    public void setJerseyNbr(Integer jerseyNbr)
-    {
-        this.jerseyNbr = jerseyNbr;
-    }
+	public void setJerseyNbr(Integer jerseyNbr)
+	{
+		this.jerseyNbr = jerseyNbr;
+	}
 
-    public NestedScore getScore()
-    {
-        return score;
-    }
+	public NestedScore getScore()
+	{
+		return score;
+	}
 
-    public void setScore(NestedScore score)
-    {
-        this.score = score;
-    }
+	public void setScore(NestedScore score)
+	{
+		this.score = score;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStatId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStatId.java
index ea9dfe1f4b3a..8db45907d583 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStatId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedPlayerStatId.java
@@ -1,36 +1,40 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
 
 public class NestedPlayerStatId implements Serializable
 {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    private Integer playerId;
+	private Integer playerId;
 
-    private NestedScoreId score;
+	private NestedScoreId score;
 
-    public NestedPlayerStatId()
-    {
-    }
+	public NestedPlayerStatId()
+	{
+	}
 
-    public Integer getPlayerId()
-    {
-        return playerId;
-    }
+	public Integer getPlayerId()
+	{
+		return playerId;
+	}
 
-    public void setPlayerId(Integer playerId)
-    {
-        this.playerId = playerId;
-    }
+	public void setPlayerId(Integer playerId)
+	{
+		this.playerId = playerId;
+	}
 
-    public NestedScoreId getScore()
-    {
-        return score;
-    }
+	public NestedScoreId getScore()
+	{
+		return score;
+	}
 
-    public void setScore(NestedScoreId score)
-    {
-        this.score = score;
-    }
+	public void setScore(NestedScoreId score)
+	{
+		this.score = score;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScore.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScore.java
index b8a1627c8d10..8e3f13bdc93b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScore.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScore.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
@@ -14,65 +18,65 @@
 @IdClass(NestedScoreId.class)
 public class NestedScore implements Serializable
 {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @Column(name = "game_id")
-    private Integer gameId;
-
-    @Id
-    @Column(name = "is_home")
-    private Boolean home;
-
-    @Basic(optional = false)
-    @Column(name = "roster_id")
-    private Integer rosterId;
-
-    @Basic
-    @Column(name = "final_score")
-    private Integer finalScore;
-
-    public NestedScore()
-    {
-    }
-
-    public Integer getGameId()
-    {
-        return gameId;
-    }
-
-    public void setGameId(Integer gameId)
-    {
-        this.gameId = gameId;
-    }
-
-    public Boolean getHome()
-    {
-        return home;
-    }
-
-    public void setHome(Boolean home)
-    {
-        this.home = home;
-    }
-
-    public Integer getRosterId()
-    {
-        return rosterId;
-    }
-
-    public void setRosterId(Integer rosterId)
-    {
-        this.rosterId = rosterId;
-    }
-
-    public Integer getFinalScore()
-    {
-        return finalScore;
-    }
-
-    public void setFinalScore(Integer finalScore)
-    {
-        this.finalScore = finalScore;
-    }
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "game_id")
+	private Integer gameId;
+
+	@Id
+	@Column(name = "is_home")
+	private Boolean home;
+
+	@Basic(optional = false)
+	@Column(name = "roster_id")
+	private Integer rosterId;
+
+	@Basic
+	@Column(name = "final_score")
+	private Integer finalScore;
+
+	public NestedScore()
+	{
+	}
+
+	public Integer getGameId()
+	{
+		return gameId;
+	}
+
+	public void setGameId(Integer gameId)
+	{
+		this.gameId = gameId;
+	}
+
+	public Boolean getHome()
+	{
+		return home;
+	}
+
+	public void setHome(Boolean home)
+	{
+		this.home = home;
+	}
+
+	public Integer getRosterId()
+	{
+		return rosterId;
+	}
+
+	public void setRosterId(Integer rosterId)
+	{
+		this.rosterId = rosterId;
+	}
+
+	public Integer getFinalScore()
+	{
+		return finalScore;
+	}
+
+	public void setFinalScore(Integer finalScore)
+	{
+		this.finalScore = finalScore;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScoreId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScoreId.java
index ce89b16cd0b9..d0e4bf5ba0d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScoreId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedScoreId.java
@@ -1,36 +1,40 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
 
 public class NestedScoreId implements Serializable
 {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    private Integer gameId;
+	private Integer gameId;
 
-    private Boolean home;
+	private Boolean home;
 
-    public NestedScoreId()
-    {
-    }
+	public NestedScoreId()
+	{
+	}
 
-    public Integer getGameId()
-    {
-        return gameId;
-    }
+	public Integer getGameId()
+	{
+		return gameId;
+	}
 
-    public void setGameId(Integer gameId)
-    {
-        this.gameId = gameId;
-    }
+	public void setGameId(Integer gameId)
+	{
+		this.gameId = gameId;
+	}
 
-    public Boolean getHome()
-    {
-        return home;
-    }
+	public Boolean getHome()
+	{
+		return home;
+	}
 
-    public void setHome(Boolean home)
-    {
-        this.home = home;
-    }
+	public void setHome(Boolean home)
+	{
+		this.home = home;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStat.java
index b2b6f36a989e..672d3b3cccd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStat.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
@@ -16,40 +20,40 @@
 @IdClass(NestedStatId.class)
 public class NestedStat implements Serializable
 {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @Column
-    private Integer period;
-
-    @Id
-    @ManyToOne(optional = false, fetch = FetchType.EAGER)
-    @JoinColumn(name = "game_id", referencedColumnName = "game_id")
-    @JoinColumn(name = "is_home", referencedColumnName = "is_home")
-    @JoinColumn(name = "player_id", referencedColumnName = "player_id")
-    private NestedPlayerStat playerStat;
-
-    public NestedStat()
-    {
-    }
-
-    public Integer getPeriod()
-    {
-        return period;
-    }
-
-    public void setPeriod(Integer period)
-    {
-        this.period = period;
-    }
-
-    public NestedPlayerStat getPlayerStat()
-    {
-        return playerStat;
-    }
-
-    public void setPlayerStat(NestedPlayerStat playerStat)
-    {
-        this.playerStat = playerStat;
-    }
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column
+	private Integer period;
+
+	@Id
+	@ManyToOne(optional = false, fetch = FetchType.EAGER)
+	@JoinColumn(name = "game_id", referencedColumnName = "game_id")
+	@JoinColumn(name = "is_home", referencedColumnName = "is_home")
+	@JoinColumn(name = "player_id", referencedColumnName = "player_id")
+	private NestedPlayerStat playerStat;
+
+	public NestedStat()
+	{
+	}
+
+	public Integer getPeriod()
+	{
+		return period;
+	}
+
+	public void setPeriod(Integer period)
+	{
+		this.period = period;
+	}
+
+	public NestedPlayerStat getPlayerStat()
+	{
+		return playerStat;
+	}
+
+	public void setPlayerStat(NestedPlayerStat playerStat)
+	{
+		this.playerStat = playerStat;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStatId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStatId.java
index 2d5df54e5d7c..87d1ae86cbe1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStatId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/entity/NestedStatId.java
@@ -1,36 +1,40 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.hhh14343.entity;
 
 import java.io.Serializable;
 
 public class NestedStatId implements Serializable
 {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    private Integer period;
+	private Integer period;
 
-    private NestedPlayerStatId playerStat;
+	private NestedPlayerStatId playerStat;
 
-    public NestedStatId()
-    {
-    }
+	public NestedStatId()
+	{
+	}
 
-    public Integer getPeriod()
-    {
-        return period;
-    }
+	public Integer getPeriod()
+	{
+		return period;
+	}
 
-    public void setPeriod(Integer period)
-    {
-        this.period = period;
-    }
+	public void setPeriod(Integer period)
+	{
+		this.period = period;
+	}
 
-    public NestedPlayerStatId getPlayerStat()
-    {
-        return playerStat;
-    }
+	public NestedPlayerStatId getPlayerStat()
+	{
+		return playerStat;
+	}
 
-    public void setPlayerStat(NestedPlayerStatId playerStat)
-    {
-        this.playerStat = playerStat;
-    }
+	public void setPlayerStat(NestedPlayerStatId playerStat)
+	{
+		this.playerStat = playerStat;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java
index 5b417b27c18f..be3a656a1772 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.hhh15842;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/AssignedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/AssignedIdentifierTest.java
index ea84c740a68e..e9bfe32c7a0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/AssignedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/AssignedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/Book.java
index d4573bed9f4b..b90cdeb85186 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeIdGenerationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeIdGenerationTypeTest.java
index a5e4d4099fb1..21d0f66d36fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeIdGenerationTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeIdGenerationTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeNaturalIdTest.java
index 7f149965d202..7448de87be34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/CompositeNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdGeneratedValueTest.java
index d185d7e80e5f..7717136e0b41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneFetchTest.java
index 3bb1384d9d09..9f21fdaed507 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneFetchTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
-import java.util.List;
 
 import org.hibernate.Hibernate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneTest.java
index c5b4242dd185..8b78445ff13e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdTest.java
index 06f06d77a3e2..56edc7165c39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -19,8 +17,6 @@
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableCatalogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableCatalogTest.java
index 02774b0d946c..4398e6d199c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableCatalogTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableCatalogTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -16,8 +14,6 @@
 import org.hibernate.testing.RequiresDialect;
 import org.junit.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableSchemaTest.java
index 1aaaf5d4cb68..bdc9863202f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/EntityTableSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/GeneratedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/GeneratedIdentifierTest.java
index 9cad5def2073..7bf3bd796150 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/GeneratedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/GeneratedIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassGeneratedValueTest.java
index 41e4d4cdf0e3..39efa6ec46c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassManyToOneTest.java
index 0c670292011f..0a40c89ddcb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassManyToOneTest.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
 import java.io.Serializable;
 import java.util.Objects;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassTest.java
index 50e9203f8fc3..ac61211ec440 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdManyToOneTest.java
index b1f8523a99f0..4f98dc55fe4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/IdManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -11,7 +9,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
 import jakarta.persistence.ManyToOne;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MultipleNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MultipleNaturalIdTest.java
index d2aa07dd5281..fd3384aef27b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MultipleNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MultipleNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -11,7 +9,6 @@
 import java.util.Objects;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
index d280fb86f66f..83796ffdb255 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -16,8 +14,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdsTest.java
index a04835dbf13a..39bd4a968a9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -12,7 +10,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.annotations.NaturalId;
-import org.hibernate.internal.SessionImpl;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.junit.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaiveEqualsHashCodeEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaiveEqualsHashCodeEntityTest.java
index 013f87b953c3..408f8c15778b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaiveEqualsHashCodeEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaiveEqualsHashCodeEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -22,7 +20,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java
index c5ce23e9a9ae..f9425bbffa91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -23,7 +21,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PooledOptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PooledOptimizerTest.java
index 2c80a8dbb3b0..6bc6bf7fc223 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PooledOptimizerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PooledOptimizerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/RowIdTest.java
index 14ff20346b5a..5e725c87e664 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/RowIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/RowIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorAnnotationNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorAnnotationNameTest.java
index ae083203aeb6..2fe67a645620 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorAnnotationNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorAnnotationNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -15,9 +13,7 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.SequenceGenerator;
 
 import static jakarta.persistence.GenerationType.SEQUENCE;
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@@ -82,7 +78,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-sequence-mapping-example[]
 	}
 	//end::identifiers-generators-sequence-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorConfiguredTest.java
index c46d37215545..fa346c57e3ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorConfiguredTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -86,7 +84,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-sequence-mapping-example[]
 	}
 	//end::identifiers-generators-sequence-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorNamedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorNamedTest.java
index 22f53981b4b8..bc093fa6acd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorNamedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorNamedTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.SequenceGenerator;
 
@@ -86,7 +83,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-sequence-mapping-example[]
 	}
 	//end::identifiers-generators-sequence-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorUnnamedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorUnnamedTest.java
index 4c3eea08dfa4..f2e06edddbaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorUnnamedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SequenceGeneratorUnnamedTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
@@ -78,7 +75,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-sequence-mapping-example[]
 	}
 	//end::identifiers-generators-sequence-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTableTest.java
index c811a79db34c..0b01ab6b64da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -14,69 +12,67 @@
 
 import org.junit.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
  */
 public class SimpleEntityTableTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                Book.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				Book.class
+		};
+	}
 
-    @Test
-    public void test() {
+	@Test
+	public void test() {
 
-    }
+	}
 
-    //tag::entity-pojo-table-mapping-example[]
-    @Entity(name = "Book")
-    @Table(
-            catalog = "public",
-            schema = "store",
-            name = "book"
-   )
-    public static class Book {
+	//tag::entity-pojo-table-mapping-example[]
+	@Entity(name = "Book")
+	@Table(
+			catalog = "public",
+			schema = "store",
+			name = "book"
+)
+	public static class Book {
 
-        @Id
-        private Long id;
+		@Id
+		private Long id;
 
-        private String title;
+		private String title;
 
-        private String author;
+		private String author;
 
-        //Getters and setters are omitted for brevity
-        //end::entity-pojo-table-mapping-example[]
+		//Getters and setters are omitted for brevity
+		//end::entity-pojo-table-mapping-example[]
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getTitle() {
-            return title;
-        }
+		public String getTitle() {
+			return title;
+		}
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
+		public void setTitle(String title) {
+			this.title = title;
+		}
 
-        public String getAuthor() {
-            return author;
-        }
+		public String getAuthor() {
+			return author;
+		}
 
-        public void setAuthor(String author) {
-            this.author = author;
-        }
-        //tag::entity-pojo-table-mapping-example[]
-    }
-    //end::entity-pojo-table-mapping-example[]
+		public void setAuthor(String author) {
+			this.author = author;
+		}
+		//tag::entity-pojo-table-mapping-example[]
+	}
+	//end::entity-pojo-table-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTest.java
index 8f42664c3678..649abff784ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
index a513b1e45db7..3d4d580fb482 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimplePartitionKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimplePartitionKeyTest.java
index 293531d1832c..ebe809352ecb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimplePartitionKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimplePartitionKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorConfiguredTest.java
index 74977f632ba0..dad4db4a0034 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorConfiguredTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -84,7 +82,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-table-mapping-example[]
 	}
 	//end::identifiers-generators-table-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorUnnamedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorUnnamedTest.java
index 1483ebdb3185..7050eb08acc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorUnnamedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/TableGeneratorUnnamedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
@@ -76,7 +74,7 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 	//tag::identifiers-generators-table-mapping-example[]
 	}
 	//end::identifiers-generators-table-mapping-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidCustomGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidCustomGeneratedValueTest.java
index a78960ffe5c6..5ea4085ca396 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidCustomGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidCustomGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidGeneratedValueTest.java
index edab3202a274..540bd7c01bbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/UuidGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java
index d5e0a8785a12..7b1a7b0296e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java
index 1b8b3ab35c07..006e9cbd5627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/Event.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/Event.java
index 8b3a5948b56e..69450a810944 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/Event.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/Event.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.composite;
 
@@ -17,42 +15,41 @@
 @Entity
 class Event {
 
-    @Id
-    private EventId id;
+	@Id
+	private EventId id;
 
-    @Column(name = "event_key")
-    private String key;
+	@Column(name = "event_key")
+	private String key;
 
-    @Column(name = "event_value")
-    private String value;
+	@Column(name = "event_value")
+	private String value;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 //end::identifiers-composite-generated-mapping-example[]
 
-    public EventId getId() {
-        return id;
-    }
+	public EventId getId() {
+		return id;
+	}
 
-    public void setId(EventId id) {
-        this.id = id;
-    }
+	public void setId(EventId id) {
+		this.id = id;
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+	public void setKey(String key) {
+		this.key = key;
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    public void setValue(String value) {
-        this.value = value;
-    }
+	public void setValue(String value) {
+		this.value = value;
+	}
 //tag::identifiers-composite-generated-mapping-example[]
 }
 //end::identifiers-composite-generated-mapping-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EventId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EventId.java
index 25cf4163381e..3295c439050c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EventId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EventId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.composite;
 
@@ -61,4 +59,3 @@ public int hashCode() {
 	}
 }
 //end::identifiers-composite-generated-mapping-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/Helper.java
index d73ed5df71a2..5ceec58e1c3d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/Helper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/Book.java
index 64923f2b22e9..f8aaec616198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.custom;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import static org.hibernate.annotations.UuidGenerator.Style.TIME;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidGenerationTests.java
index 8067db926ecb..77b5e36aeb99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidValueCreator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidValueCreator.java
index 630a98459d5c..a19d81c410d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidValueCreator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom/CustomUuidValueCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/Book.java
index 941a798c88cf..331ffc934c97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.custom2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/CustomUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/CustomUuidGenerationTests.java
index 7c82141a3ab9..a81551ad163f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/CustomUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/custom2/CustomUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.custom2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/Book.java
index a19c584816f2..1a1630b13dd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/ImplicitUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/ImplicitUuidGenerationTests.java
index 4f2f6a699441..90ec2a970216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/ImplicitUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit/ImplicitUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.hibernate.testing.orm.junit.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Book.java
index 9d8e4722408e..0bb387710761 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Implicit2UuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Implicit2UuidGenerationTests.java
index e5b8d27d7d14..e948073c7468 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Implicit2UuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit2/Implicit2UuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Book.java
index 3f9900b74e94..9aa33db5596c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Book.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit3;
 
-import java.util.UUID;
 
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Implicit3UuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Implicit3UuidGenerationTests.java
index 51c29bf3c881..082c7d1d9a68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Implicit3UuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/implicit3/Implicit3UuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.implicit3;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.hibernate.testing.orm.junit.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/Book.java
index 5df6d1dd8a50..6aa0d868ef62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/RandomBasedUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/RandomBasedUuidGenerationTests.java
index 48c147335bd7..83e283d28b0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/RandomBasedUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random/RandomBasedUuidGenerationTests.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random;
 
-import org.hibernate.id.uuid.CustomVersionOneStrategy;
 import org.hibernate.id.uuid.StandardRandomStrategy;
 import org.hibernate.orm.test.mapping.identifier.uuid.Helper;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/Book.java
index e03078baf600..a5afbb84c01f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/RandomBasedUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/RandomBasedUuidGenerationTests.java
index f31b70bad4fa..5b74d46607a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/RandomBasedUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random2/RandomBasedUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/Book.java
index a817332c34c3..3512ea5277ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/RandomBasedUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/RandomBasedUuidGenerationTests.java
index 6a49d9a7d2e0..8f4911df3c92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/RandomBasedUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/random3/RandomBasedUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.random3;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/Book.java
index 7a823dca024e..5ea54434486b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.time;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 import static org.hibernate.annotations.UuidGenerator.Style.TIME;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/TimeBasedUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/TimeBasedUuidGenerationTests.java
index 66453b131670..1af9afe040ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/TimeBasedUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time/TimeBasedUuidGenerationTests.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.time;
 
 import org.hibernate.id.uuid.CustomVersionOneStrategy;
-import org.hibernate.id.uuid.StandardRandomStrategy;
 import org.hibernate.orm.test.mapping.identifier.uuid.Helper;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/Book.java
index e77391af4f57..2d4fe304d8fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.time2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/TimeBasedUuidGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/TimeBasedUuidGenerationTests.java
index 1c188a6b3942..1e04ff5a62e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/TimeBasedUuidGenerationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/uuid/time2/TimeBasedUuidGenerationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.identifier.uuid.time2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java
index 2b4846e3c56f..0f3e05de2203 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/InheritedTypeAssociationJoinedFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/InheritedTypeAssociationJoinedFetchTest.java
index 6df57e1d87d2..a85452c2261f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/InheritedTypeAssociationJoinedFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/InheritedTypeAssociationJoinedFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/ManyToOneInheritanceSubTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/ManyToOneInheritanceSubTypeTest.java
index 9511fe28a81d..de2cb25c2745 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/ManyToOneInheritanceSubTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/ManyToOneInheritanceSubTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java
index 1754e1511016..4b36af6db8c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java
index 917128abd218..0b6e883b60e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyMappedByJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyMappedByJoinedInheritanceTest.java
index ad72c12f2352..1a41a0905bcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyMappedByJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyMappedByJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java
index 2ca569e7556a..7e892d0c0520 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java
index 66d1cac230d9..6ecb8cdb1825 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance;
 
@@ -235,4 +233,3 @@ public void setVat(String vat) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AbstractAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AbstractAccount.java
index e552e0187966..1f3db644055a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AbstractAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AbstractAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AccountOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AccountOwner.java
index 341b25871854..875c31379ca0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AccountOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/AccountOwner.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Auction.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java
index 0134883a7c98..da18bdc4b413 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 4373 2004-08-18 09:18:34Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/CreditAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/CreditAccount.java
index cc269acc88cd..c76ee515f53e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/CreditAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/CreditAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java
index 9361775d5102..46ef92aa3288 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 4373 2004-08-18 09:18:34Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DebitAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DebitAccount.java
index 68764ac6774d..d885b9770f51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DebitAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DebitAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 5733 2005-02-14 15:56:06Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorInEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorInEmbeddedIdTest.java
index 9c8892223d40..0780de869992 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorInEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorInEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java
index ecee213237b6..84d75b25d976 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
index 6fac216591fd..541c3ef35db6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java
index 3bd7ac967d45..b34a267153d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 4373 2004-08-18 09:18:34Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/InheritingEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/InheritingEntity.java
index 6de5629842cd..f9a1b3ddb2ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/InheritingEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/InheritingEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java
index 46b706aef40d..f0161c249ab9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceTest.java
index c2da7d5e8859..b1b821498530 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java
index 4ae85580ecc4..e4783e7bd5a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java
index b78bfa2b9719..78c9aeb1a473 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
@@ -92,9 +66,9 @@ public void testIllegalBaseJoin(SessionFactoryScope scope) {
 		}
 		catch (IllegalArgumentException ex) {
 			Assertions.assertTrue( ex.getCause()
-										   .getCause()
-										   .getMessage()
-										   .contains( "Could not resolve attribute 'base' " ) );
+										.getCause()
+										.getMessage()
+										.contains( "Could not resolve attribute 'base' " ) );
 		}
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/ParentEntity.java
index c009e9755d4e..fb4784989c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/ParentEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/ParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
@@ -34,4 +32,3 @@ public Long getId() {
 		return id;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java
index 46146176f5df..5e4f693ab3b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 4373 2004-08-18 09:18:34Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java
index d2475be58c54..e028dcd8d1c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 4373 2004-08-18 09:18:34Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 
@@ -37,7 +33,7 @@ public void setCountry(String string) {
 		this.address.country = string;
 	}
 
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Polygon.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Polygon.java
index 0dd62ac6e80d..31db8ae39877 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Polygon.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Polygon.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Quadrilateral.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Quadrilateral.java
index dcf12a14ec85..68913c2c7f20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Quadrilateral.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Quadrilateral.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java
index c9054f99b862..d79b1d089ffd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ChildEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ChildEntity.java
index 8db98e179b80..2f2f84114f25 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ChildEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java
index 9fda5e52d5f3..eec4c84b88ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java
index 94048b705b28..70c8e4ec5c1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ParentEntity.java
index df419c1aa8af..23d775966659 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ParentEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.discriminator.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java
index aebd757d2b33..c8375802ee71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.dynamic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/package-info.java
index 920382e1bf42..833168ab169c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/package-info.java
@@ -10,4 +10,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.mapping.inheritance.dynamic;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.inheritance.dynamic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Address.java
index 54f292d5b921..2838b0edee96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Customer.java
index 7d6ce12cda70..f3c4f942c759 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Employee.java
index e4f01f0839af..471a4e5664eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.inheritance.joined;
 import java.math.BigDecimal;
 
@@ -60,7 +56,7 @@ public double getPasswordExpiryDays() {
 		return passwordExpiryDays;
 	}
 	/**
-	 * @param passwordExpiryDays The password expiry policy in days. 
+	 * @param passwordExpiryDays The password expiry policy in days.
 	 */
 	public void setPasswordExpiryDays(double passwordExpiryDays) {
 		this.passwordExpiryDays = passwordExpiryDays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceEmbeddedIdTest.java
index 4c250502858c..0cdc4741cb61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceOneToOneSameNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceOneToOneSameNameTest.java
index 093c7dbb2fc7..45c4270d98c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceOneToOneSameNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceOneToOneSameNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceSameAttributeNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceSameAttributeNameTest.java
index 6afd9f44a539..852d20de401b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceSameAttributeNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceSameAttributeNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java
index 5def55636572..a07493a86db4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java
index 5dbd7ef6d1ba..f510600e6b06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
@@ -260,5 +258,3 @@ public void setVat(String vat) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java
index ceaac89e3b0f..3b268be63c5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassDuplicateFieldsWithTreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassDuplicateFieldsWithTreatTest.java
index 5ff6358ae0a1..1300306f62f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassDuplicateFieldsWithTreatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassDuplicateFieldsWithTreatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
@@ -94,4 +92,3 @@ public static class Loan extends Account {
 		public Integer rate;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java
index f3cb08bbfa03..392a00de2edf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
@@ -78,9 +76,9 @@ public void testJoinedSubclass(SessionFactoryScope scope) {
 			assertEquals( s.createQuery( "from Person p where p.class = Customer" ).list().size(), 1 );
 			assertEquals( s.createQuery( "from Person p where p.class = Person" ).list().size(), 1 );
 			assertEquals( s.createQuery( "from Person p where type(p) in :who" )
-								  .setParameter( "who", Customer.class )
-								  .list()
-								  .size(), 1 );
+								.setParameter( "who", Customer.class )
+								.list()
+								.size(), 1 );
 			assertEquals( s.createQuery( "from Person p where type(p) in :who" ).setParameterList(
 					"who",
 					new Class[] {
@@ -250,4 +248,3 @@ public void testCustomColumnReadAndWrite(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java
index 77e1bbfaef36..8d121d3f6a5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Person.java
index c8cb7a5c4b5c..1b375424e14c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 10218 2006-08-04 18:24:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
 
@@ -39,7 +35,7 @@ public void setCountry(String string) {
 		this.address.country = string;
 	}
 
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java
index 74d306862f5b..2373236ff7dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java
index 74509d6fdb85..a9f58459acfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java
index cf8415773315..a336133e44c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceImplicitVersionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceImplicitVersionUpdateTest.java
index 92f3c2c1af5b..7a2b592d16bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceImplicitVersionUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceImplicitVersionUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceVersionedParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceVersionedParentTest.java
index b7b58c0cf996..1b1444501c4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceVersionedParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/InheritanceVersionedParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/TablePerClassAbstractRootTypeVersionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/TablePerClassAbstractRootTypeVersionUpdateTest.java
index 37df4225c9c2..c15e9327d35a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/TablePerClassAbstractRootTypeVersionUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/version/TablePerClassAbstractRootTypeVersionUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.inheritance.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
index 1f4d2918cb98..cfbe3b788c36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.javatime;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeBaselineTests.java
index 6e3b77be9d4a..58524450a373 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.javatime;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
index 819742dc48ab..e337a9350e28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.javatime;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/CharArrayToStringJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/CharArrayToStringJoinColumnTest.java
index 1866a7183142..ec61557aaf71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/CharArrayToStringJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/CharArrayToStringJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn;
 
@@ -152,4 +150,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/StringToCharArrayJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/StringToCharArrayJoinColumnTest.java
index 7f6a58e9c72b..34a4d6dfaeea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/StringToCharArrayJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/StringToCharArrayJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn;
 
@@ -153,4 +151,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnOrFormulaTest.java
index b03bacd61336..f35d7e8078b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnOrFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnOrFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn.embedded;
 
@@ -159,4 +157,3 @@ public void setStringProp2(String stringProp2) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnTest.java
index d649be48ca42..5113f5cfafa4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn.embedded;
 
@@ -186,4 +184,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedMultipleJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedMultipleJoinColumnTest.java
index 837c9153c11c..4ef00b374bb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedMultipleJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/CharArrayToStringInEmbeddedMultipleJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn.embedded;
 
@@ -199,4 +197,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedJoinColumnTest.java
index 8d2ed27cd972..86be33a85a70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn.embedded;
 
@@ -186,4 +184,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedMultipleJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedMultipleJoinColumnTest.java
index 91733df566de..0cf95c0fde8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedMultipleJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joincolumn/embedded/StringToCharArrayInEmbeddedMultipleJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joincolumn.embedded;
 
@@ -199,4 +197,3 @@ public void setInvoices(List invoices) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ChildEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ChildEntity.java
index 616370e37258..df655a39895d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ChildEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joinformula;
 
@@ -13,13 +11,13 @@
 @Entity
 public class ChildEntity {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Column(name = "PARENT_ID")
-    private Long parentId;
+	@Column(name = "PARENT_ID")
+	private Long parentId;
 
-    @Column
-    private String name;
+	@Column
+	private String name;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaTest.java
index 7d33c9fb6cf5..ccaec32e81b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joinformula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ParentEntity.java
index 9b3067785638..a6396568b7f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ParentEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/ParentEntity.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.joinformula;
 
 import org.hibernate.annotations.JoinColumnOrFormula;
-import org.hibernate.annotations.JoinColumnsOrFormulas;
 import org.hibernate.annotations.JoinFormula;
 
 import jakarta.persistence.Entity;
@@ -18,17 +15,17 @@
 @Entity
 public class ParentEntity {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @OneToOne(targetEntity = ChildEntity.class, optional = false)
-    @JoinColumnOrFormula(column = @JoinColumn(name = "ID", referencedColumnName = "PARENT_ID", insertable = false, updatable = false))
-    @JoinColumnOrFormula(formula = @JoinFormula(referencedColumnName = "NAME", value = "'Tom'"))
-    private ChildEntity tom;
+	@OneToOne(targetEntity = ChildEntity.class, optional = false)
+	@JoinColumnOrFormula(column = @JoinColumn(name = "ID", referencedColumnName = "PARENT_ID", insertable = false, updatable = false))
+	@JoinColumnOrFormula(formula = @JoinFormula(referencedColumnName = "NAME", value = "'Tom'"))
+	private ChildEntity tom;
 
-    @OneToOne(targetEntity = ChildEntity.class, optional = false)
-    @JoinColumnOrFormula(column = @JoinColumn(name = "ID", referencedColumnName = "PARENT_ID", insertable = false, updatable = false))
-    @JoinColumnOrFormula(formula = @JoinFormula(referencedColumnName = "NAME", value = "'Ben'"))
-    private ChildEntity ben;
+	@OneToOne(targetEntity = ChildEntity.class, optional = false)
+	@JoinColumnOrFormula(column = @JoinColumn(name = "ID", referencedColumnName = "PARENT_ID", insertable = false, updatable = false))
+	@JoinColumnOrFormula(formula = @JoinFormula(referencedColumnName = "NAME", value = "'Ben'"))
+	private ChildEntity ben;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java
index 061e7a152d05..2fd7deaae7d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java
index fd5bb3176bdb..c67088b6484c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
index eca70b093c95..7593f0faae07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
index 0efabf969ca0..84a80ca1934e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java
index 2c5d0888bff2..b7c9dd532bc8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
@@ -46,7 +44,7 @@
 @DomainModel(
 		annotatedClasses = {
 				JoinFetchedManyToOneAllowProxyTests.Customer.class,
-				 JoinFetchedManyToOneAllowProxyTests.Order.class
+				JoinFetchedManyToOneAllowProxyTests.Order.class
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java
index 1cf4d00184fb..de70ae31d2e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java
index d9e1044a8a94..ddae39c5bce0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java
index 22f00f01f9b9..a9b211e4d846 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java
index 55017223754c..38a8c1170f52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java
index ca3ff1970591..ed71374e675d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java
index b4b9614a7c7f..6de6a48ea12b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java
index 1de72e7585a9..8ef114f26ff5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java
index 57e896f2ba14..e3ca34f20d18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java
index cdb8f98f5a8c..7921a633f6e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java
index c23a6a8f33b7..ffceb2879ec8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java
index ebdebfbe7c3f..455b9a8d7539 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.mappedby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java
index d62885237e4f..aff14c0ca5fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.mappedby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java
index 79a966b05ebc..5b96fa6345e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.mappedby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java
index 7f8f4fc66773..8d1bada85c9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java
index 22a6e20ad225..dbffd3570692 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java
index 70fb732e8656..a07b2a094f12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java
index 2ef7ed2f587a..2127fccc8795 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java
index 174591da3a02..956b7f03f00c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java
index 6b45d083d021..8625cfd7aada 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java
index 372222a038cc..4bf768de8686 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.lazytoone.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java
index c5d8de4e083e..1007af596128 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyCustomSqlMutationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyCustomSqlMutationsTest.java
index a0e421746e20..fa6076f4d698 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyCustomSqlMutationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyCustomSqlMutationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java
index c476d95f5c25..cf0b73dca57d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
@@ -59,7 +57,7 @@ public void setUp(SessionFactoryScope scope) {
 					person1.setNickName( "JD" );
 					person1.setAddress( "Earth" );
 					person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-																  .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 					person1.getAddresses().put( AddressType.HOME, "Home address" );
 					person1.getAddresses().put( AddressType.OFFICE, "Office address" );
 					session.persist( person1 );
@@ -67,7 +65,7 @@ public void setUp(SessionFactoryScope scope) {
 					Person person2 = new Person( "Mrs. John Doe" );
 					person2.setAddress( "Earth" );
 					person2.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 2, 12, 0, 0 )
-																  .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 					session.persist( person2 );
 
 					Person person3 = new Person( "Dr_ John Doe" );
@@ -77,19 +75,19 @@ public void setUp(SessionFactoryScope scope) {
 					phone1.setId( 1L );
 					person1.addPhone( phone1 );
 					phone1.getRepairTimestamps().add( Timestamp.from( LocalDateTime.of( 2005, 1, 1, 12, 0, 0 )
-																			  .toInstant( ZoneOffset.UTC ) ) );
+																			.toInstant( ZoneOffset.UTC ) ) );
 					phone1.getRepairTimestamps().add( Timestamp.from( LocalDateTime.of( 2006, 1, 1, 12, 0, 0 )
-																			  .toInstant( ZoneOffset.UTC ) ) );
+																			.toInstant( ZoneOffset.UTC ) ) );
 
 					Call call11 = new Call();
 					call11.setDuration( 12 );
 					call11.setTimestamp( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-																 .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 
 					Call call12 = new Call();
 					call12.setDuration( 33 );
 					call12.setTimestamp( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 1, 0, 0 )
-																 .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 
 					phone1.addCall( call11 );
 					phone1.addCall( call12 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java
index 5d5749d42d1e..1e1cbb6709a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyListBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyNonAggregatedIdJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyNonAggregatedIdJoinColumnTest.java
index 670c7014ae79..2adb422bc04e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyNonAggregatedIdJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyNonAggregatedIdJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyOrderByJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyOrderByJoinedInheritanceTest.java
index abf2337d0fea..b6e62a6c3e3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyOrderByJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyOrderByJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManySQLJoinTableRestrictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManySQLJoinTableRestrictionTest.java
index bbb68e889ac1..8f6fa2de8ee5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManySQLJoinTableRestrictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManySQLJoinTableRestrictionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java
index 09c4391b605f..5c1e5e8cf59f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java
index 7b777a1fb142..502b0f560521 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalEagerTest.java
index 98461de22bc3..dddbe41588ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalEagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalEagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java
index c371b9d3c154..4d3c2b84a316 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneEmbeddedIdSelfReferenceJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneEmbeddedIdSelfReferenceJoinFetchTest.java
index cd2604cf2c72..92a9693536dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneEmbeddedIdSelfReferenceJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneEmbeddedIdSelfReferenceJoinFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java
index cb1cea662d27..66df0da27cc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java
index 035a892c93f7..9fb6fe36d055 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
index dbc43056bee9..37ba82e1f8bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
index d89c2b6cb7aa..4267279383ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone.jointable;
 
@@ -116,9 +114,9 @@ private void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "Book" )
 	@Table( name = "books" )
 	public static class Book {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@ManyToOne
 		@JoinTable(name = "book_authors",
@@ -152,9 +150,9 @@ public void setName(String name) {
 	@Entity( name = "Author" )
 	@Table( name = "authors" )
 	public static class Author {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "author")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneJoinTableTest.java
index 245276dbe0e4..252d26ff6ea0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.manytoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/IsNullAndMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/IsNullAndMappedByTest.java
index fa1a8fa54be7..4ebbf7794cc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/IsNullAndMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/IsNullAndMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mappedBy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/ManyToManyMappedByTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/ManyToManyMappedByTypeTest.java
index e6395d83513c..86e20d34eca2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/ManyToManyMappedByTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/ManyToManyMappedByTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mappedBy;
 
@@ -11,7 +9,6 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByCompositeNonAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByCompositeNonAssociationTest.java
index 4cc0bda1e683..360d2102b310 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByCompositeNonAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByCompositeNonAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.mappedBy;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByNonAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByNonAssociationTest.java
index bf20ce073280..6344d212b8c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByNonAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/MappedByNonAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.mappedBy;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMapEntityKeyMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMapEntityKeyMappedByTest.java
index a12c2fddfbeb..113835b2879c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMapEntityKeyMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMapEntityKeyMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mappedBy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMappedByTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMappedByTypeTest.java
index 1334795ecb08..d11cc1d87471 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMappedByTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToManyMappedByTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mappedBy;
 
@@ -11,7 +9,6 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToOneMappedByTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToOneMappedByTypeTest.java
index 17b6e39ee42e..3b91d99189bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToOneMappedByTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mappedBy/OneToOneMappedByTypeTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mappedBy;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/MutabilityBaselineEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/MutabilityBaselineEntity.java
index b12e947413f3..6413ebd97311 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/MutabilityBaselineEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/MutabilityBaselineEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability;
 
@@ -95,4 +93,3 @@ private Date now() {
 //tag::mutability-base-entity-example[]
 }
 //end::mutability-base-entity-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/AttributeImmutabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/AttributeImmutabilityTest.java
index 3fcdf445d003..df8c4bdc6f8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/AttributeImmutabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/AttributeImmutabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java
index e4b118f77d6d..54fd7191d5d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
@@ -227,10 +225,10 @@ void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "TheEntity" )
 	@Table( name = "TheEntity" )
 	public static class TheEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 
-	    @Basic
+		@Basic
 		private String name;
 
 		//tag::attribute-immutable-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/EntityAttributeMutabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/EntityAttributeMutabilityTest.java
index 634c17d306f3..b57902596ea5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/EntityAttributeMutabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/EntityAttributeMutabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
@@ -66,9 +64,9 @@ public void verifyMetamodel(DomainModelScope domainModelScope, SessionFactorySco
 	@Entity( name = "Employee" )
 	@Table( name = "Employee" )
 	public static class Employee {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@ManyToOne
 		@JoinColumn( name = "manager_fk" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java
index be2417ef8d83..f02e6578a61f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java
index 61ec7bb3ee53..3194f1db6bb0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java
index c03187ee8ef2..7d2c02a554c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/PluralAttributeMutabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/PluralAttributeMutabilityTest.java
index 84b260fa128a..8f8b59864654 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/PluralAttributeMutabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/PluralAttributeMutabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.attribute;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/DateConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/DateConverter.java
index 806a9c8366be..aa90578cea6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/DateConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/DateConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityConverterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityConverterTests.java
index 754b7a98793b..2bf79d0ae3b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityConverterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityConverterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
@@ -54,9 +52,9 @@ void verifyMetamodel(DomainModelScope scope) {
 	@Entity( name = "TestEntity" )
 	@Table( name = "TestEntity" )
 	public static class TestEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Convert( converter = ImmutabilityDateConverter.class )
 		private Date theDate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityDateConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityDateConverter.java
index 4b67f4da43da..975d8e80fef4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityDateConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityDateConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityMapConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityMapConverter.java
index a44fa232dfe2..7fd3ac359fe8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityMapConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutabilityMapConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java
index 5c92c3ec895e..45b6ece42df1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
@@ -197,10 +195,10 @@ void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "TheEntity" )
 	@Table( name = "TheEntity" )
 	public static class TheEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 
-	    @Basic
+		@Basic
 		private String name;
 
 		@Immutable
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConverterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConverterTests.java
index 9f1014524aea..9afe40078372 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConverterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConverterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
@@ -68,9 +66,9 @@ void verifyMetamodel(DomainModelScope scope) {
 	@Entity( name = "TestEntity" )
 	@Table( name = "TestEntity" )
 	public static class TestEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Convert( converter = ImmutableDateConverter.class )
 		private Date immutableDate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableDateConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableDateConverter.java
index fdb364215d62..cf6bc216b298 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableDateConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableDateConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableMapConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableMapConverter.java
index b6a4401a6a26..c4c8b6e1b708 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableMapConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableMapConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java
index a01dffb89de1..d46eeb08a3dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.converted;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityImmutabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityImmutabilityTest.java
index a7cd47409cc5..5170bf1cfff3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityImmutabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityImmutabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityMutabilityPlanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityMutabilityPlanTest.java
index 837645ab1583..80673195e160 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityMutabilityPlanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/entity/EntityMutabilityPlanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.mutability.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java
index 84e691bc7ff1..f067e813e016 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.naturalid;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java
index 1c403c439161..e1f09ac144c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
index 5875ad7f860d..3523659018c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.naturalid;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java
index ab0d8704afbd..748f078a4664 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ValidationTests.java
index 54cea3fdbb95..d6ef6dbaf7c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ValidationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java
index 35e32bc21b20..c0a14903dd39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.cid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java
index 7cae3af85d2a..183dc26d115c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.cid;
 
@@ -19,24 +17,24 @@
 @Entity
 @Table( name = "t_acct" )
 public class Account {
-    @EmbeddedId
-    private AccountId accountId;
+	@EmbeddedId
+	private AccountId accountId;
 
-    @Basic( optional = false )
-    @NaturalId
-    private String shortCode;
-    
-    protected Account() {
-    }
-    
-    public Account(AccountId accountId, String shortCode) {
-        this.accountId = accountId;
-        this.shortCode = shortCode;
-    }
-    public String getShortCode() {
-        return shortCode;
-    }
-    public AccountId getAccountId() {
-        return accountId;
-    }
+	@Basic( optional = false )
+	@NaturalId
+	private String shortCode;
+
+	protected Account() {
+	}
+
+	public Account(AccountId accountId, String shortCode) {
+		this.accountId = accountId;
+		this.shortCode = shortCode;
+	}
+	public String getShortCode() {
+		return shortCode;
+	}
+	public AccountId getAccountId() {
+		return accountId;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java
index b9a18fda2197..8a774283f85e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.cid;
 
@@ -13,34 +11,33 @@
  */
 @Embeddable
 public class AccountId implements java.io.Serializable {
-    private final int id;
+	private final int id;
 
-    protected AccountId() {
-        this.id = 0;
-    }
-    
-    public AccountId(int id) {
-        this.id = id;
-    }
-    public int intValue() {
-        return id;
-    }
-    @Override
-    public int hashCode() {
-        return id;
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AccountId other = (AccountId) obj;
-        if (other != null && id != other.id)
-            return false;
-        return true;
-    }
-}
+	protected AccountId() {
+		this.id = 0;
+	}
 
+	public AccountId(int id) {
+		this.id = id;
+	}
+	public int intValue() {
+		return id;
+	}
+	@Override
+	public int hashCode() {
+		return id;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AccountId other = (AccountId) obj;
+		if (other != null && id != other.id)
+			return false;
+		return true;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java
index b51e438910db..b40932e3aa77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.cid;
 
@@ -19,11 +17,11 @@
  * @author Donnchadh O Donnabhain
  */
 @ServiceRegistry(
-        settings = {
-                @Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = USE_QUERY_CACHE, value = "false" ),
-                @Setting( name = GENERATE_STATISTICS, value = "false" )
-        }
+		settings = {
+				@Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = USE_QUERY_CACHE, value = "false" ),
+				@Setting( name = GENERATE_STATISTICS, value = "false" )
+		}
 )
 @DomainModel( annotatedClasses = { Account.class, AccountId.class } )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java
index 75752c4a76fe..3f8d96d49691 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.cid;
 
@@ -19,11 +17,11 @@
  * @author Donnchadh O Donnabhain
  */
 @ServiceRegistry(
-        settings = {
-                @Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
-                @Setting( name = USE_QUERY_CACHE, value = "false" ),
-                @Setting( name = GENERATE_STATISTICS, value = "false" )
-        }
+		settings = {
+				@Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
+				@Setting( name = USE_QUERY_CACHE, value = "false" ),
+				@Setting( name = GENERATE_STATISTICS, value = "false" )
+		}
 )
 @DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/naturalid/cid/Account.hbm.xml" )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java
index e9977226f9cc..2ee675d96518 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java
index 2663a5b3601f..477832820738 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java
index af916ac62cf0..0c7a87b58cf4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java
index 50651d10fe4a..b56ccf86a721 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java
index 8d8488f0a4b4..de0cea8ee35b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.compound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java
index d6af2b03280e..56d084ea1396 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.compound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java
index 103534e59646..5796cc1e2021 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.compound;
 
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.engine.spi.NaturalIdResolutions;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
-import org.hibernate.query.criteria.JpaRoot;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java
index 8fae34626bed..f4deb650198c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.naturalid.compound;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java
index 8c61f88a2f30..b783fab7cf9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.compound;
 
-import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java
index ea48d9b7deab..9c55f703106a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java
index 6e8b4c5b599a..e6fddc44cdb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java
index ec12b126be48..ee1463b03252 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
@@ -31,9 +29,9 @@
 @SessionFactory
 public class ImmutableManyToOneNaturalIdAnnotationTest {
 
-    @Test
-    @JiraKey( value = "HHH-10360")
-    public void testNaturalIdNullability(SessionFactoryScope scope) {
+	@Test
+	@JiraKey( value = "HHH-10360")
+	public void testNaturalIdNullability(SessionFactoryScope scope) {
 		// nullability is not specified for either properties making up
 		// the natural ID, so they should be nullable by annotation-specific default
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
index f5de25cc6185..08f8bedd2a19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
@@ -70,9 +68,9 @@ public void dropTestData(SessionFactoryScope scope) {
 		);
 	}
 
-    @Test
-    @JiraKey( value = "HHH-10360")
-    public void checkingMapping(SessionFactoryScope scope) {
+	@Test
+	@JiraKey( value = "HHH-10360")
+	public void checkingMapping(SessionFactoryScope scope) {
 
 		final RuntimeMetamodels runtimeMetamodels = scope.getSessionFactory().getRuntimeMetamodels();
 		final EntityMappingType childMapping = runtimeMetamodels.getEntityMappingType( Child.class.getName() );
@@ -130,11 +128,11 @@ public void testNaturalIdCheck(SessionFactoryScope scope) {
 					}
 				}
 		);
-    }
+	}
 
 	@Test
 	@SuppressWarnings( {"unchecked"})
-    public void testSaveParentWithDetachedChildren(SessionFactoryScope scope) {
+	public void testSaveParentWithDetachedChildren(SessionFactoryScope scope) {
 		final Parent p = scope.fromTransaction(
 				(session) -> session.createQuery( "from Parent p join fetch p.children where p.name = 'alex'", Parent.class )
 						.setCacheable( true )
@@ -148,10 +146,10 @@ public void testSaveParentWithDetachedChildren(SessionFactoryScope scope) {
 
 		// todo (6.0) : ^^ this test has nothing to do with (im)mutability...
 
-        Child c2 = new Child( 2, "joey", p );
-        p.getChildren().add( c2 );
+		Child c2 = new Child( 2, "joey", p );
+		p.getChildren().add( c2 );
 
-        scope.inTransaction( (session) -> session.merge( p ) );
-    }
+		scope.inTransaction( (session) -> session.merge( p ) );
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
index 8d6c6c2b01f5..e55bd356ea1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
 import jakarta.persistence.PersistenceException;
 
-import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.AttributeMapping;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java
index ba8f2f1f777e..c957825de955 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/User.java
index 15031a38b5cd..d214457bca0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java
index fa6e86410cf8..410185c22148 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.mapping.naturalid.immutableentity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -25,9 +21,9 @@ public class Building {
 	@Id
 	@GeneratedValue
 	private Integer id;
-	
+
 	private String name;
-	
+
 	@NaturalId
 	private String address;
 	@NaturalId
@@ -121,5 +117,5 @@ public String toString() {
 		return "Building [id=" + id + ", name=" + name + ", address=" + address + ", city=" + city + ", state=" + state
 				+ "]";
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
index a9091e72f321..ced7f24ff68d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.immutableentity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java
index b0f1f952f856..8ce8781680a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java
index 1325205f4be2..7cf75479037e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance;
 
@@ -15,13 +13,11 @@
 import org.hibernate.persister.entity.EntityPersister;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 @DomainModel( annotatedClasses = { MappedSuperclassOverrideTest.MyMappedSuperclass.class, MappedSuperclassOverrideTest.MyEntity.class } )
 @SessionFactory( exportSchema = false )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java
index f6b3f1d510ae..f4009f0cbe9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java
index af76f07396ae..89fc45f6f6d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.naturalid.inheritance;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java
index cca1e574a6a4..cdc52f028b92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java
index f5aa2464e9ed..674ad68f3d20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java
index e23ba0d54a45..aba612bdd112 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java
index 17a2fdbb6c21..e8835c4d7669 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java
index e543fb8fa823..54cecf0a2cc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java
index ca8f7ccf10c1..d4336d477325 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.spread;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java
index a0990f5852ac..70f18055ce53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.spread;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java
index a386662c7381..f980b312da88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.inheritance.spread;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java
index 9c0554dcb676..602871b3e95c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java
index 467a61b5390d..c53db7fb437e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
index d6a2074e39dd..1287ad5e8f2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable;
 
@@ -130,8 +128,8 @@ public void testReattachmentNaturalIdCheck(SessionFactoryScope scope) throws Thr
 				}
 		);
 	}
-	
-	
+
+
 	@Test
 	public void testReattachmentUnmodifiedNaturalIdCheck(SessionFactoryScope scope) throws Throwable {
 		final User created = scope.fromTransaction(
@@ -170,7 +168,7 @@ public void testReattachmentUnmodifiedNaturalIdCheck(SessionFactoryScope scope)
 						}
 					}
 				} );
-	}	
+	}
 
 	@Test
 	public void testNonexistentNaturalIdCache(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java
index 6a34228feb75..13cc7ff6f05e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 6900 2005-05-25 01:24:22Z oneovthafew $
 package org.hibernate.orm.test.mapping.naturalid.mutable;
 
 
@@ -17,7 +13,7 @@ public class User {
 	private String name;
 	private String org;
 	private String password;
-	
+
 	User() {}
 
 	public User(String name, String org, String password) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java
index 0473b18e31af..fe5e89ae08fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java
index 7346444aafa5..84037a3157ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java
index 1e7bfcd48623..e02f1f215ca9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java
index a1d0ee9a5543..61cdcd774399 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdNonStrictReadWriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdNonStrictReadWriteTest.java
index bda84e4e89f6..1c58ffb0d17a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdNonStrictReadWriteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdNonStrictReadWriteTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java
index baa05297d42f..7b5cf04c2619 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
@@ -51,7 +49,7 @@ public void testToMapConversion(SessionFactoryScope scope) {
 		final NaturalIdStatistics naturalIdStatistics = statistics.getNaturalIdStatistics( AllCached.class.getName() );
 		assertEquals( 1, naturalIdStatistics.getCachePutCount() );
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7278" )
 	public void testInsertedNaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) {
@@ -70,7 +68,7 @@ public void testInsertedNaturalIdCachedAfterTransactionSuccess(SessionFactorySco
 		);
 		assertEquals( 1, statistics.getNaturalIdCacheHitCount() );
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7278" )
 	public void testInsertedNaturalIdNotCachedAfterTransactionFailure(SessionFactoryScope scope) {
@@ -97,7 +95,7 @@ public void testInsertedNaturalIdNotCachedAfterTransactionFailure(SessionFactory
 				}
 		);
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7278" )
 	public void testChangedNaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) {
@@ -128,7 +126,7 @@ public void testChangedNaturalIdCachedAfterTransactionSuccess(SessionFactoryScop
 
 		assertEquals( 1, statistics.getNaturalIdCacheHitCount() );
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7278" )
 	public void testChangedNaturalIdNotCachedAfterTransactionFailure(SessionFactoryScope scope) {
@@ -164,7 +162,7 @@ public void testChangedNaturalIdNotCachedAfterTransactionFailure(SessionFactoryS
 
 		assertEquals(0, statistics.getNaturalIdCacheHitCount());
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7309" )
 	public void testInsertUpdateEntity_NaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java
index fb9d3afb5894..45e83056e525 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
@@ -22,7 +20,7 @@
 
 /**
  * Tests of mutable natural ids stored in second level cache
- * 
+ *
  * @author Guenther Demetz
  * @author Steve Ebersole
  */
@@ -128,11 +126,11 @@ public void testNaturalIdReCachingWhenNeeded(SessionFactoryScope scope) {
 					assertEquals( 0, statistics.getNaturalIdCacheHitCount() );
 				}
 		);
-		
+
 		// finally there should be only 2 NaturalIdCache puts : 1. insertion, 2. when updating natural-id from 'it' to 'it2'
 		assertEquals( 2, statistics.getNaturalIdCachePutCount() );
 	}
-	
+
 	@Test
 	@JiraKey( "HHH-7245" )
 	public void testNaturalIdChangeAfterResolveEntityFrom2LCache(SessionFactoryScope scope) {
@@ -178,7 +176,7 @@ public void testBySimpleNaturalIdResolveEntityFrom2LCacheSubClass(SessionFactory
 				}
 		);
 	}
-	
+
 	@Test
 	@JiraKey( "HHH-16557" )
 	public void testCreateDeleteRecreate(SessionFactoryScope scope) {
@@ -275,7 +273,7 @@ public void testCacheVerifyHits(SessionFactoryScope scope) {
 			assertEquals(4, sfi.getStatistics().getNaturalIdCacheHitCount()); // thus hits should not increment
 		});
 	}
-	
+
 	@Test
 	public void testReattachUnmodifiedInstance(SessionFactoryScope scope) {
 		final B created = scope.fromTransaction(
@@ -311,4 +309,3 @@ public void testReattachUnmodifiedInstance(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java
index 1497a6daeb83..7acc1c1bc763 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.mutable.cached;
 
@@ -17,7 +15,7 @@ public class SubClass extends AllCached {
 	public SubClass() {
 		super();
 	}
-	
+
 	public SubClass(String name) {
 		super(name);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java
index 7d3f6f13b739..9ed4c9e9e2a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java
index 94db3d7c9c35..b8cdfbe61df1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
-import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java
index 85eed6619910..2739fb9eb53d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java
index 57ae6d9c7282..effd9ea1af01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
index 8413bc143182..4078f8b3a80c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/User.java
index 2451ac811c3a..f89a4769131a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 6900 2005-05-25 01:24:22Z oneovthafew $
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManyFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManyFetchTest.java
index c381e0357afd..dfc61796abc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManyFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManyFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManySetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManySetFetchTest.java
index 7ab6eb1d7cba..e8d850bedb39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManySetFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/NestedOneToManySetFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java
index 6194df1ef5f7..e3105d826e5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
@@ -109,8 +107,8 @@ public void testFetchingSameAssociationTwice(SessionFactoryScope scope) {
 
 					/*
 						select l1_0."order_id", l1_0.id
-    					from Item as l1_0
-   	 					where l1_0."order_id" = ?
+						from Item as l1_0
+							where l1_0."order_id" = ?
 					 */
 
 					sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -178,10 +176,10 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 			List results = session.createQuery( "select i from Item i", Item.class ).list();
 			/*
 				1) select i1_0.id, i1_0."order_id"
-    				from Item as i1_0
-    			2) 	select o1_0.id, o1_0.name
-    				from "Order" as o1_0
-    				where o1_0.id = ?
+					from Item as i1_0
+				2) 	select o1_0.id, o1_0.name
+					from "Order" as o1_0
+					where o1_0.id = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -198,8 +196,8 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -221,11 +219,11 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 			List results = session.createQuery( "select i from Item i join i.order", Item.class ).list();
 			/*
 				1)	select i1_0.id, i1_0."order_id"
-    				from Item as i1_0
-    				inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
-    			2) select o1_0.id, o1_0.name
-    				from "Order" as o1_0
-   					 where o1_0.id = ?
+					from Item as i1_0
+					inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
+				2) select o1_0.id, o1_0.name
+					from "Order" as o1_0
+						where o1_0.id = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, SqlAstJoinType.INNER, 1 );
@@ -241,8 +239,8 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -265,8 +263,8 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				select i1_0.id, o1_0.id, o1_0.name
-    			from Item as i1_0
-    			inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
+				from Item as i1_0
+				inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, SqlAstJoinType.INNER, 1 );
@@ -282,8 +280,8 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -311,10 +309,10 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				1)	select i1_0.id, i1_0."order_id"
-    				from Item as i1_0
-    				inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
-   					inner join Item as l1_0  on l1_0."order_id" = o1_0.id
-   				2)	select o1_0.id, o1_0.name
+					from Item as i1_0
+					inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
+					inner join Item as l1_0  on l1_0."order_id" = o1_0.id
+				2)	select o1_0.id, o1_0.name
 					from "Order" as o1_0
 					where o1_0.id = ?
 			 */
@@ -333,8 +331,8 @@ public void testRetrievingItem(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -358,9 +356,9 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 			Order order = session.find( Order.class, 3L );
 
 			/*
-				 select o1_0.id, o1_0.name
-    			from "Order" as o1_0
-    			where o1_0.id = ?
+				select o1_0.id, o1_0.name
+				from "Order" as o1_0
+				where o1_0.id = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -374,8 +372,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -399,7 +397,7 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select o1_0.id, o1_0.name
-    			from "Order" as o1_0
+				from "Order" as o1_0
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -415,8 +413,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -439,8 +437,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select o1_0.id, o1_0.name
-    			from "Order" as o1_0
-    			inner join Item as l1_0 on l1_0."order_id" = o1_0.id
+				from "Order" as o1_0
+				inner join Item as l1_0 on l1_0."order_id" = o1_0.id
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, SqlAstJoinType.INNER, 1 );
@@ -456,8 +454,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -481,8 +479,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select o1_0.id, l1_0."order_id", l1_0.id, o1_0.name
-    			from "Order" as o1_0
-    			inner join Item as l1_0 on l1_0."order_id" = o1_0.id
+				from "Order" as o1_0
+				inner join Item as l1_0 on l1_0."order_id" = o1_0.id
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, SqlAstJoinType.INNER, 1 );
@@ -512,10 +510,10 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 			).list();
 
 			/*
-			    select o1_0.id, l1_0."order_id", l1_0.id, o1_0.name, o2_0.id, o2_0.name
-    			from "Order" as o1_0
-    			inner join Item as l1_0 on l1_0."order_id" = o1_0.id
-    			inner join "Order" as o2_0 on l1_0."order_id" = o2_0.id
+				select o1_0.id, l1_0."order_id", l1_0.id, o1_0.name, o2_0.id, o2_0.name
+				from "Order" as o1_0
+				inner join Item as l1_0 on l1_0."order_id" = o1_0.id
+				inner join "Order" as o2_0 on l1_0."order_id" = o2_0.id
 			 */
 
 			// todo (6.0): this was originally intended to produce only a single SQL join,
@@ -532,8 +530,8 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 
 			/*
 				select l1_0."order_id", l1_0.id
-    			from Item as l1_0
-    			where l1_0."order_id" = ?
+				from Item as l1_0
+				where l1_0."order_id" = ?
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, 0 );
@@ -557,10 +555,10 @@ public void testRetrievingOrder(SessionFactoryScope scope) {
 			).list();
 
 			/*
-			    select o1_0.id, l1_0."order_id", l1_0.id, o1_0.name, o2_0.id, o2_0.name
-    			from "Order" as o1_0
-    			inner join Item as l1_0 on l1_0."order_id" = o1_0.id
-    			inner join "Order" as o2_0 on l1_0."order_id" = o2_0.id
+				select o1_0.id, l1_0."order_id", l1_0.id, o1_0.name, o2_0.id, o2_0.name
+				from "Order" as o1_0
+				inner join Item as l1_0 on l1_0."order_id" = o1_0.id
+				inner join "Order" as o2_0 on l1_0."order_id" = o2_0.id
 			 */
 
 			// todo (6.0): this was originally intended to produce only a single SQL join,
@@ -597,9 +595,9 @@ public void testItemFetchJoin(SessionFactoryScope scope) {
 
 			/*
 				select i1_0.id, o1_0.id, l1_0."order_id", l1_0.id, o1_0.name
-    			from Item as i1_0
-    			inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
-    			inner join Item as l1_0 on l1_0."order_id" = o1_0.id
+				from Item as i1_0
+				inner join "Order" as o1_0 on i1_0."order_id" = o1_0.id
+				inner join Item as l1_0 on l1_0."order_id" = o1_0.id
 			 */
 
 			sqlStatementInterceptor.assertNumberOfJoins( 0, SqlAstJoinType.INNER, 2 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyCustomSqlMutationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyCustomSqlMutationsTest.java
index f5f80b0a923f..20a0b58790a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyCustomSqlMutationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyCustomSqlMutationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java
index 51fc04eab474..af82dddfb49d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java
index acd7cf1fdac8..f4634349ac0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
@@ -62,7 +60,7 @@ public void setUp(SessionFactoryScope scope) {
 					person1.setNickName( "JD" );
 					person1.setAddress( "Earth" );
 					person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-																  .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 					person1.getAddresses().put( AddressType.HOME, "Home address" );
 					person1.getAddresses().put( AddressType.OFFICE, "Office address" );
 					session.persist( person1 );
@@ -70,7 +68,7 @@ public void setUp(SessionFactoryScope scope) {
 					Person person2 = new Person( "Mrs. John Doe" );
 					person2.setAddress( "Earth" );
 					person2.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 2, 12, 0, 0 )
-																  .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 					session.persist( person2 );
 
 					Person person3 = new Person( "Dr_ John Doe" );
@@ -80,19 +78,19 @@ public void setUp(SessionFactoryScope scope) {
 					phone1.setId( 1L );
 					person1.addPhone( phone1 );
 					phone1.getRepairTimestamps().add( Timestamp.from( LocalDateTime.of( 2005, 1, 1, 12, 0, 0 )
-																			  .toInstant( ZoneOffset.UTC ) ) );
+																			.toInstant( ZoneOffset.UTC ) ) );
 					phone1.getRepairTimestamps().add( Timestamp.from( LocalDateTime.of( 2006, 1, 1, 12, 0, 0 )
-																			  .toInstant( ZoneOffset.UTC ) ) );
+																			.toInstant( ZoneOffset.UTC ) ) );
 
 					Call call11 = new Call();
 					call11.setDuration( 12 );
 					call11.setTimestamp( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-																 .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 
 					Call call12 = new Call();
 					call12.setDuration( 33 );
 					call12.setTimestamp( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 1, 0, 0 )
-																 .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 
 					phone1.addCall( call11 );
 					phone1.addCall( call12 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java
index bad8a952c40a..be51c5b51a84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java
index b5af62cd9258..5d9406206db1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java
index 49f454431994..776a73249119 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java
index 91e2af97d038..78a666351943 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneJoinTableTest.java
index 952bfbcd087f..fa4dcd998a33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
index 1256371c5b23..6a67b24c49ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java
index 7a1bde9433b4..f7016b4cedb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java
index 22e87e187e36..9d9a9df823f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.mapping.onetoone;
 
 import org.hibernate.AnnotationException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneInverseInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneInverseInEmbeddableTest.java
index f6a93369c4f7..96069826d09b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneInverseInEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneInverseInEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneIsNullQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneIsNullQueryTest.java
index 00edf775ead5..8ed947b26c43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneIsNullQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneIsNullQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java
index 8af9715b2a81..dcf466ad989b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java
index ac1004be22e3..c629fe615267 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableSelfReferenceTest.java
index 542a56382967..a62a84b8aa13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
@@ -13,7 +11,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java
index d6d8f1276f43..711526390b76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.mapping.onetoone;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java
index e7316998c97f..4629675a8c83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java
index 2e25905e7964..84a7e8672e77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java
index aa02c87292cc..a48ad2e21809 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneUniqueJoinColumnsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneUniqueJoinColumnsTest.java
index 0b3a1aee7d89..e8942b5c635b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneUniqueJoinColumnsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneUniqueJoinColumnsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java
index 1330861e7b37..9d10137221be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java
index db601fd2a85b..b254bb0c67c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.hhh9798;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java
index 464b0cd72097..bf25b4aaddfe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.hhh9798;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java
index 88d29ada6aed..ad82a262ba1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.hhh9798;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/ShipmentState.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/ShipmentState.java
index ad0d02fd90d7..414d43ff6cf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/ShipmentState.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/ShipmentState.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.hhh9798;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOneJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOneJoinColumnTest.java
index a295cbda342b..827a5eca107e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOneJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOneJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.pkjoincolumn;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
-import jakarta.persistence.PrimaryKeyJoinColumn;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnNoMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnNoMapsIdTest.java
index 3c6fc90a02ef..01e7a042a7f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnNoMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnNoMapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.pkjoincolumn;
 
@@ -11,7 +9,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnTest.java
index fa66a2400c53..13735b16b14a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/pkjoincolumn/OneToOnePkJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.onetoone.pkjoincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java
index b926d52f4899..2578e0bcea67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.orm.test.mapping.onetoone.primarykey;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
index 83114029776b..333a0815d280 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.orm.test.mapping.onetoone.primarykey;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java
index 42308e3049dc..9f4d7df700c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.orm.test.mapping.onetoone.primarykey;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java
index e70efccc6373..0a93c8a2d8a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.quote;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java
index a72ad6946416..f87e8c3dc6ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AbstractReadWriteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.readwrite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AnnotationReadWriteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AnnotationReadWriteTests.java
index fd141ad07a23..78909ce36994 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AnnotationReadWriteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/AnnotationReadWriteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.readwrite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/HbmReadWriteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/HbmReadWriteTests.java
index 430f18158705..b53535583c40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/HbmReadWriteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/HbmReadWriteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.readwrite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java
index 2fb19229f25f..db26edd223c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.readwrite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/Post.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/Post.java
index 79cf5197307b..df58897728a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/Post.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/Post.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.contribution.array; /**
  * @author Steve Ebersole
@@ -57,4 +55,4 @@ public String[] getTags() {
 	public void setTags(String[] tags) {
 		this.tags = tags;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java
index ac3c924a460d..3886c0ed25a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.contribution.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayFunctionContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayFunctionContributor.java
index 39a3d4532db2..bb20b95728fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayFunctionContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayFunctionContributor.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.orm.test.mapping.type.contribution.array;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJavaType.java
index d85f7f5282d8..5ec589fbfc89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.contribution.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
index 8d82053fbe50..6bbb8b6fe797 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.contribution.array;
 
@@ -15,7 +13,6 @@
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 import org.hibernate.type.descriptor.jdbc.BasicExtractor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayTypeContributor.java
index bac3217e6cdc..41a383879ab8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.contribution.array;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/AbstractDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/AbstractDescriptorTest.java
index a7082b7554db..acde9a353049 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/AbstractDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/AbstractDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 import java.io.Serializable;
@@ -27,7 +25,6 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BasicCollectionJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BasicCollectionJavaTypeDescriptorTest.java
index db57d8c77385..4987c26b9d64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BasicCollectionJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BasicCollectionJavaTypeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -26,23 +24,23 @@
  */
 public class BasicCollectionJavaTypeDescriptorTest {
 
-    private static final BasicCollectionJavaType, String> stringSetJavaType = createJavaType();
+	private static final BasicCollectionJavaType, String> stringSetJavaType = createJavaType();
 
-    @Test
-    @JiraKey( "HHH-18073" )
-    public void wrapShouldRetainOrderOfSet() {
-        assertTrue("BasicCollectionJavaType.wrap() should retain order of Set",
-                stringSetJavaType.wrap(Set.of( "foo", "bar" ), null) instanceof LinkedHashSet);
-    }
+	@Test
+	@JiraKey( "HHH-18073" )
+	public void wrapShouldRetainOrderOfSet() {
+		assertTrue("BasicCollectionJavaType.wrap() should retain order of Set",
+				stringSetJavaType.wrap(Set.of( "foo", "bar" ), null) instanceof LinkedHashSet);
+	}
 
-    @Test
-    public void deepCopyShouldRetainOrderOfSet() {
-        assertTrue("BasicCollectionJavaType.getMutabilityPlan().deepCopy() should retain order of Set",
-                stringSetJavaType.getMutabilityPlan().deepCopy(Set.of( "foo", "bar" )) instanceof LinkedHashSet);
-    }
+	@Test
+	public void deepCopyShouldRetainOrderOfSet() {
+		assertTrue("BasicCollectionJavaType.getMutabilityPlan().deepCopy() should retain order of Set",
+				stringSetJavaType.getMutabilityPlan().deepCopy(Set.of( "foo", "bar" )) instanceof LinkedHashSet);
+	}
 
-    @SuppressWarnings("unchecked")
-    private static BasicCollectionJavaType, String> createJavaType() {
+	@SuppressWarnings("unchecked")
+	private static BasicCollectionJavaType, String> createJavaType() {
 		ParameterizedType type;
 		try {
 			type = (ParameterizedType) TestEntity.class.getDeclaredField("tags").getGenericType();
@@ -50,19 +48,19 @@ private static BasicCollectionJavaType, String> createJavaType() {
 			throw new RuntimeException(e);
 		}
 		return new BasicCollectionJavaType<>(
-                type,
-                StringJavaType.INSTANCE,
-                (StandardSetSemantics) StandardSetSemantics.INSTANCE
-        );
-    }
+				type,
+				StringJavaType.INSTANCE,
+				(StandardSetSemantics) StandardSetSemantics.INSTANCE
+		);
+	}
 
-    @Entity
-    static class TestEntity {
+	@Entity
+	static class TestEntity {
 
-        @Id
-        @GeneratedValue
-        Long id;
+		@Id
+		@GeneratedValue
+		Long id;
 
-        Set tags;
-    }
+		Set tags;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigDecimalDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigDecimalDescriptorTest.java
index de70e9a8ec26..f266b3c6a57b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigDecimalDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigDecimalDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigIntegerDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigIntegerDescriptorTest.java
index 5a01a36cdb3d..0b2b470e20ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigIntegerDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BigIntegerDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 import java.math.BigInteger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java
index 11015e517186..a060fb06b312 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -24,7 +22,6 @@
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.junit.Test;
 
-import org.assertj.core.api.Assertions;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanDescriptorTest.java
index 075686f135c2..276db3e18118 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
index 227807a498a0..645cf396be10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -24,199 +22,199 @@
 import static org.junit.Assert.*;
 
 public class BooleanJavaTypeDescriptorTest {
-    private BooleanJavaType underTest = new BooleanJavaType();
-
-    @Test
-    @JiraKey( "HHH-17275" )
-    public void testCheckConditionShouldReturnCorrectStatementWhenNullXStringGiven() {
-        // given
-        // when
-        String checkCondition = underTest.getCheckCondition("is_active", VarcharJdbcType.INSTANCE, new BooleanXConverter(), new AnyDialect());
-        // then
-        assertEquals("is_active in ('X') or is_active is null", checkCondition);
-    }
-
-    @Test
-    public void testCheckConditionShouldReturnCorrectStatementWhenTFStringGiven() {
-        // given
-        // when
-        String checkCondition = underTest.getCheckCondition("is_active", VarcharJdbcType.INSTANCE, new TrueFalseConverter(), new AnyDialect());
-        // then
-        assertEquals("is_active in ('F','T')", checkCondition);
-    }
-
-    @Test
-    public void testCheckConditionShouldReturnCorrectStatementWhen1AndNullIntegerGiven() {
-        // given
-        // when
-        String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new OneNullBooleanConverter(), new AnyDialect());
-        // then
-        assertEquals("is_active in (1) or is_active is null", checkCondition);
-    }
-
-    @Test
-    public void testCheckConditionShouldReturnCorrectStatementWhen1And0IntegerGiven() {
-        // given
-        // when
-        String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new NumericBooleanConverter(), new AnyDialect());
-        // then
-        assertEquals("is_active in (0,1)", checkCondition);
-    }
-
-    @Test
-    public void testCheckConditionShouldReturnCorrectStatementWhen1And0AndNullIntegerGiven() {
-        // given
-        // when
-        String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new TriStateBooleanConverter(), new AnyDialect());
-        // then
-        assertEquals("is_active in (0,1,-1)", checkCondition);
-    }
-
-    @Test
-    public void testWrapShouldReturnTrueWhenYStringGiven() {
-        // given
-        // when
-        Boolean result = underTest.wrap("Y", null);
-        // then
-        assertTrue(result);
-    }
-
-    @Test
-    public void testWrapShouldReturnFalseWhenFStringGiven() {
-        // given
-        // when
-        Boolean result = underTest.wrap("N", null);
-        // then
-        assertFalse(result);
-    }
-
-    @Test
-    public void testWrapShouldReturnFalseWhenRandomStringGiven() {
-        // given
-        // when
-        Boolean result = underTest.wrap("k", null);
-        // then
-        assertFalse(result);
-    }
-
-    @Test
-    public void testWrapShouldReturnNullWhenNullStringGiven() {
-        // given
-        // when
-        Boolean result = underTest.wrap(null, null);
-        // then
-        assertNull(result);
-    }
-
-    @Test
-    public void testWrapShouldReturnFalseWhenEmptyStringGiven() {
-        // given
-        // when
-        Boolean result = underTest.wrap("", null);
-        // then
-        assertFalse(result);
-    }
-
-    private static class AnyDialect extends Dialect {
-
-    }
-
-    private static class BooleanXConverter implements AttributeConverter, BasicValueConverter {
-
-        @Override
-        public String convertToDatabaseColumn(Boolean value) {
-            return value != null && value ? "X" : null;
-        }
-
-        @Override
-        public Boolean convertToEntityAttribute(String value) {
-            return value != null;
-        }
-
-        @Override
-        public @Nullable Boolean toDomainValue(@Nullable String relationalForm) {
-            return convertToEntityAttribute(relationalForm);
-        }
-
-        @Override
-        public @Nullable String toRelationalValue(@Nullable Boolean domainForm) {
-            return convertToDatabaseColumn(domainForm);
-        }
-
-        @Override
-        public JavaType getDomainJavaType() {
-            return BooleanJavaType.INSTANCE;
-        }
-
-        @Override
-        public JavaType getRelationalJavaType() {
-            return StringJavaType.INSTANCE;
-        }
-    }
-
-    private static class OneNullBooleanConverter implements AttributeConverter, BasicValueConverter {
-        @Override
-        public Integer convertToDatabaseColumn(Boolean attribute) {
-            return attribute != null && attribute ? 1 : null;
-        }
-
-        @Override
-        public Boolean convertToEntityAttribute(Integer dbData) {
-            return dbData != null && dbData == 1;
-        }
-
-        @Override
-        public @Nullable Boolean toDomainValue(@Nullable Integer relationalForm) {
-            return convertToEntityAttribute(relationalForm);
-        }
-
-        @Override
-        public @Nullable Integer toRelationalValue(@Nullable Boolean domainForm) {
-            return convertToDatabaseColumn(domainForm);
-        }
-
-        @Override
-        public JavaType getDomainJavaType() {
-            return BooleanJavaType.INSTANCE;
-        }
-
-        @Override
-        public JavaType getRelationalJavaType() {
-            return IntegerJavaType.INSTANCE;
-        }
-    }
-
-    private static class TriStateBooleanConverter implements AttributeConverter, BasicValueConverter {
-        @Override
-        public Integer convertToDatabaseColumn(Boolean attribute) {
-            if (attribute == null) return -1;
-            return  attribute ? 1 : 0;
-        }
-
-        @Override
-        public Boolean convertToEntityAttribute(Integer dbData) {
-            if (dbData == null || dbData == -1) return null;
-            return dbData == 1;
-        }
-
-        @Override
-        public @Nullable Boolean toDomainValue(@Nullable Integer relationalForm) {
-            return convertToEntityAttribute(relationalForm);
-        }
-
-        @Override
-        public @Nullable Integer toRelationalValue(@Nullable Boolean domainForm) {
-            return convertToDatabaseColumn(domainForm);
-        }
-
-        @Override
-        public JavaType getDomainJavaType() {
-            return BooleanJavaType.INSTANCE;
-        }
-
-        @Override
-        public JavaType getRelationalJavaType() {
-            return IntegerJavaType.INSTANCE;
-        }
-    }
-}
\ No newline at end of file
+	private BooleanJavaType underTest = new BooleanJavaType();
+
+	@Test
+	@JiraKey( "HHH-17275" )
+	public void testCheckConditionShouldReturnCorrectStatementWhenNullXStringGiven() {
+		// given
+		// when
+		String checkCondition = underTest.getCheckCondition("is_active", VarcharJdbcType.INSTANCE, new BooleanXConverter(), new AnyDialect());
+		// then
+		assertEquals("is_active in ('X') or is_active is null", checkCondition);
+	}
+
+	@Test
+	public void testCheckConditionShouldReturnCorrectStatementWhenTFStringGiven() {
+		// given
+		// when
+		String checkCondition = underTest.getCheckCondition("is_active", VarcharJdbcType.INSTANCE, new TrueFalseConverter(), new AnyDialect());
+		// then
+		assertEquals("is_active in ('F','T')", checkCondition);
+	}
+
+	@Test
+	public void testCheckConditionShouldReturnCorrectStatementWhen1AndNullIntegerGiven() {
+		// given
+		// when
+		String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new OneNullBooleanConverter(), new AnyDialect());
+		// then
+		assertEquals("is_active in (1) or is_active is null", checkCondition);
+	}
+
+	@Test
+	public void testCheckConditionShouldReturnCorrectStatementWhen1And0IntegerGiven() {
+		// given
+		// when
+		String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new NumericBooleanConverter(), new AnyDialect());
+		// then
+		assertEquals("is_active in (0,1)", checkCondition);
+	}
+
+	@Test
+	public void testCheckConditionShouldReturnCorrectStatementWhen1And0AndNullIntegerGiven() {
+		// given
+		// when
+		String checkCondition = underTest.getCheckCondition("is_active", IntegerJdbcType.INSTANCE, new TriStateBooleanConverter(), new AnyDialect());
+		// then
+		assertEquals("is_active in (0,1,-1)", checkCondition);
+	}
+
+	@Test
+	public void testWrapShouldReturnTrueWhenYStringGiven() {
+		// given
+		// when
+		Boolean result = underTest.wrap("Y", null);
+		// then
+		assertTrue(result);
+	}
+
+	@Test
+	public void testWrapShouldReturnFalseWhenFStringGiven() {
+		// given
+		// when
+		Boolean result = underTest.wrap("N", null);
+		// then
+		assertFalse(result);
+	}
+
+	@Test
+	public void testWrapShouldReturnFalseWhenRandomStringGiven() {
+		// given
+		// when
+		Boolean result = underTest.wrap("k", null);
+		// then
+		assertFalse(result);
+	}
+
+	@Test
+	public void testWrapShouldReturnNullWhenNullStringGiven() {
+		// given
+		// when
+		Boolean result = underTest.wrap(null, null);
+		// then
+		assertNull(result);
+	}
+
+	@Test
+	public void testWrapShouldReturnFalseWhenEmptyStringGiven() {
+		// given
+		// when
+		Boolean result = underTest.wrap("", null);
+		// then
+		assertFalse(result);
+	}
+
+	private static class AnyDialect extends Dialect {
+
+	}
+
+	private static class BooleanXConverter implements AttributeConverter, BasicValueConverter {
+
+		@Override
+		public String convertToDatabaseColumn(Boolean value) {
+			return value != null && value ? "X" : null;
+		}
+
+		@Override
+		public Boolean convertToEntityAttribute(String value) {
+			return value != null;
+		}
+
+		@Override
+		public @Nullable Boolean toDomainValue(@Nullable String relationalForm) {
+			return convertToEntityAttribute(relationalForm);
+		}
+
+		@Override
+		public @Nullable String toRelationalValue(@Nullable Boolean domainForm) {
+			return convertToDatabaseColumn(domainForm);
+		}
+
+		@Override
+		public JavaType getDomainJavaType() {
+			return BooleanJavaType.INSTANCE;
+		}
+
+		@Override
+		public JavaType getRelationalJavaType() {
+			return StringJavaType.INSTANCE;
+		}
+	}
+
+	private static class OneNullBooleanConverter implements AttributeConverter, BasicValueConverter {
+		@Override
+		public Integer convertToDatabaseColumn(Boolean attribute) {
+			return attribute != null && attribute ? 1 : null;
+		}
+
+		@Override
+		public Boolean convertToEntityAttribute(Integer dbData) {
+			return dbData != null && dbData == 1;
+		}
+
+		@Override
+		public @Nullable Boolean toDomainValue(@Nullable Integer relationalForm) {
+			return convertToEntityAttribute(relationalForm);
+		}
+
+		@Override
+		public @Nullable Integer toRelationalValue(@Nullable Boolean domainForm) {
+			return convertToDatabaseColumn(domainForm);
+		}
+
+		@Override
+		public JavaType getDomainJavaType() {
+			return BooleanJavaType.INSTANCE;
+		}
+
+		@Override
+		public JavaType getRelationalJavaType() {
+			return IntegerJavaType.INSTANCE;
+		}
+	}
+
+	private static class TriStateBooleanConverter implements AttributeConverter, BasicValueConverter {
+		@Override
+		public Integer convertToDatabaseColumn(Boolean attribute) {
+			if (attribute == null) return -1;
+			return  attribute ? 1 : 0;
+		}
+
+		@Override
+		public Boolean convertToEntityAttribute(Integer dbData) {
+			if (dbData == null || dbData == -1) return null;
+			return dbData == 1;
+		}
+
+		@Override
+		public @Nullable Boolean toDomainValue(@Nullable Integer relationalForm) {
+			return convertToEntityAttribute(relationalForm);
+		}
+
+		@Override
+		public @Nullable Integer toRelationalValue(@Nullable Boolean domainForm) {
+			return convertToDatabaseColumn(domainForm);
+		}
+
+		@Override
+		public JavaType getDomainJavaType() {
+			return BooleanJavaType.INSTANCE;
+		}
+
+		@Override
+		public JavaType getRelationalJavaType() {
+			return IntegerJavaType.INSTANCE;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
index 20d71a25fa94..b7414c7c492c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/DurationDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/DurationDescriptorTest.java
index c6fffb1242db..cbfe0f35e687 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/DurationDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/DurationDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -30,5 +28,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/InstantDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/InstantDescriptorTest.java
index dac500ebf46b..16a098bc69e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/InstantDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/InstantDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -30,5 +28,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JavaTypeRegistryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JavaTypeRegistryTest.java
index 03cb1030ff9b..dcb228bdfa1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JavaTypeRegistryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JavaTypeRegistryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
index c381a1bf2ebe..0d8e326b917a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
index af5e6169e0ee..6b56bc70ff55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateDescriptorTest.java
index 32b6ea38c62a..b56726a25104 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -30,5 +28,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateTimeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateTimeDescriptorTest.java
index 4692ef9ed326..a360c1ffee96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateTimeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalDateTimeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -30,5 +28,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalTimeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalTimeDescriptorTest.java
index 7acca79f9307..b198bc5e9566 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalTimeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocalTimeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -30,5 +28,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleJavaTypeDescriptorTest.java
index 04f2ffe770be..984899b6a841 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleJavaTypeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java
index b671470af580..9ce3510b2511 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -15,8 +13,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.NationalizationSupport;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetDateTimeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetDateTimeDescriptorTest.java
index 45c73bf8946e..075e024dd2fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetDateTimeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetDateTimeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -32,5 +30,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetTimeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetTimeDescriptorTest.java
index 109a973cb922..8d482971019b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetTimeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/OffsetTimeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -32,5 +30,5 @@ protected Data getTestData() {
 	protected boolean shouldBeMutable() {
 		return false;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/PrimitiveByteArrayDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/PrimitiveByteArrayDescriptorTest.java
index 65da9ee4c236..366bbdca434c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/PrimitiveByteArrayDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/PrimitiveByteArrayDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -43,4 +41,4 @@ public void testExtractLoggableRepresentation() {
 		assertEquals( "[]", PrimitiveByteArrayJavaType.INSTANCE.extractLoggableRepresentation( new byte[] {} ));
 		assertEquals( "[1, 2, 3]", PrimitiveByteArrayJavaType.INSTANCE.extractLoggableRepresentation( original));
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/StringDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/StringDescriptorTest.java
index 1a4ab351060f..f5301d504322 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/StringDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/StringDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/YearMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/YearMappingTests.java
index 0b86555c1567..9da0ca850e41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/YearMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/YearMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
@@ -18,7 +16,6 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.YearJavaType;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java
index 94860eca83b7..41da732468d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZonedDateTimeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZonedDateTimeDescriptorTest.java
index 4940767554cc..093cef4735cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZonedDateTimeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZonedDateTimeDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/jdbc/JdbcTypeJavaClassMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/jdbc/JdbcTypeJavaClassMappingsTest.java
index d9fe20119672..4178eaf7cd37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/jdbc/JdbcTypeJavaClassMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/jdbc/JdbcTypeJavaClassMappingsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserType.java
index 335539023190..9bf88aaef0a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.typedef;
 
@@ -12,7 +10,7 @@
 
 /**
  * A simple user type where we force enums to be saved by name, not ordinal
- * 
+ *
  * @author gtoison
  */
 public class NamedEnumUserType> extends EnumType {
@@ -24,4 +22,4 @@ public void setParameterValues(Properties parameters) {
 
 		super.setParameterValues(parameters);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java
index cd7e9f52a717..b4c9cb11b1f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java
@@ -1,12 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/**
- * 
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.type.typedef;
 
@@ -14,7 +8,6 @@
 import org.hibernate.orm.test.mapping.converted.enums.HairColor;
 import org.hibernate.orm.test.mapping.converted.enums.Person;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/package-info.java
index 3a1b886d5b76..3a65b4486fd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/package-info.java
@@ -10,4 +10,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.mapping.type.typedef;
\ No newline at end of file
+package org.hibernate.orm.test.mapping.type.typedef;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Address.java
index 44b188e23d90..cf65cfdd58cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 6979 2005-06-01 03:51:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.typedmanytoone;
 import java.io.Serializable;
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Address implements Serializable {
-	
+
 	private AddressId addressId;
 	private String street;
 	private String city;
@@ -27,7 +23,7 @@ public Customer getCustomer() {
 	public void setCustomer(Customer customer) {
 		this.customer = customer;
 	}
-	
+
 	public String getCity() {
 		return city;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/AddressId.java
index ff6fd21e1581..9ce01f8ca6d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/AddressId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/AddressId.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AddressId.java 6979 2005-06-01 03:51:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.typedmanytoone;
 import java.io.Serializable;
 
@@ -15,14 +11,14 @@
 public class AddressId implements Serializable {
 	private String type;
 	private String addressId;
-	
+
 	public AddressId(String type, String customerId) {
 		this.addressId = customerId;
 		this.type = type;
 	}
-	
+
 	public AddressId() {}
-	
+
 	public String getType() {
 		return type;
 	}
@@ -43,7 +39,7 @@ public boolean equals(Object other) {
 	public int hashCode() {
 		return addressId.hashCode() + type.hashCode();
 	}
-	
+
 	public String toString() {
 		return type + '#' + addressId;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Customer.java
index 662151eaae2a..cdea4a2b1568 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 6979 2005-06-01 03:51:32Z oneovthafew $
 package org.hibernate.orm.test.mapping.typedmanytoone;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java
index b466cb237fbd..4e08f0bc5dc1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.typedmanytoone;
 
@@ -31,7 +29,7 @@ public void testCreateQuery(SessionFactoryScope scope) {
 		final Customer cust = new Customer();
 		cust.setCustomerId("abc123");
 		cust.setName("Matt");
-		
+
 		Address ship = new Address();
 		ship.setStreet("peachtree rd");
 		ship.setState("GA");
@@ -39,7 +37,7 @@ public void testCreateQuery(SessionFactoryScope scope) {
 		ship.setZip("30326");
 		ship.setAddressId( new AddressId("SHIPPING", "xyz123") );
 		ship.setCustomer(cust);
-		
+
 		Address bill = new Address();
 		bill.setStreet("peachtree rd");
 		bill.setState("GA");
@@ -47,7 +45,7 @@ public void testCreateQuery(SessionFactoryScope scope) {
 		bill.setZip("30326");
 		bill.setAddressId( new AddressId("BILLING", "xyz123") );
 		bill.setCustomer(cust);
-		
+
 		cust.setBillingAddress(bill);
 		cust.setShippingAddress(ship);
 
@@ -99,4 +97,3 @@ public void testCreateQueryNull(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/EnumUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/EnumUserType.java
index 77f7480d2ef1..51c3e89588cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/EnumUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/EnumUserType.java
@@ -1,127 +1,124 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.mapping.usertypes;
-
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Properties;
-
-import org.hibernate.HibernateException;
-import org.hibernate.MappingException;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.usertype.ParameterizedType;
-import org.hibernate.usertype.UserType;
-
-public class EnumUserType> implements UserType, ParameterizedType {
-
-	private Class clazz = null;
-
-	public static > EnumUserType createInstance(Class clazz) {
-		if ( !clazz.isEnum() ) {
-			throw new IllegalArgumentException( "Parameter has to be an enum-class" );
-		}
-		EnumUserType that = new EnumUserType<>();
-		Properties p = new Properties();
-		p.setProperty( "enumClassName", clazz.getName() );
-		that.setParameterValues( p );
-		return that;
-	}
-
-	public void setParameterValues(Properties params) {
-		String enumClassName = params.getProperty( "enumClassName" );
-		if ( enumClassName == null ) {
-			throw new MappingException( "enumClassName parameter not specified" );
-		}
-
-		try {
-			//noinspection unchecked
-			this.clazz = (Class) Class.forName( enumClassName );
-		}
-		catch (ClassNotFoundException e) {
-			throw new MappingException( "enumClass " + enumClassName + " not found", e );
-		}
-		if ( !this.clazz.isEnum() ) {
-			throw new MappingException( "enumClass " + enumClassName + " doesn't refer to an Enum" );
-		}
-	}
-
-	@Override
-	public int getSqlType() {
-		return Types.CHAR;
-	}
-
-	public Class returnedClass() {
-		return clazz;
-	}
-
-	@Override
-	public T nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
-			throws SQLException {
-		final String name = rs.getString( position );
-		if ( rs.wasNull() ) {
-			return null;
-		}
-		return Enum.valueOf( clazz, name.trim() );
-	}
-
-	public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index)
-			throws HibernateException, SQLException {
-	}
-
-	@Override
-	public void nullSafeSet(
-			PreparedStatement preparedStatement,
-			T value,
-			int index,
-			SharedSessionContractImplementor session) throws SQLException {
-		if ( null == value ) {
-			preparedStatement.setNull( index, Types.VARCHAR );
-		}
-		else {
-			preparedStatement.setString( index, value.name() );
-		}
-	}
-
-	public T deepCopy(T value) throws HibernateException {
-		return value;
-	}
-
-	public boolean isMutable() {
-		return false;
-	}
-
-	public T assemble(Serializable cached, Object owner) throws HibernateException {
-		//noinspection unchecked
-		return (T) cached;
-	}
-
-	public Serializable disassemble(T value) throws HibernateException {
-		return value;
-	}
-
-	public T replace(T original, T target, Object owner) throws HibernateException {
-		return original;
-	}
-
-	public int hashCode(T x) throws HibernateException {
-		return x.hashCode();
-	}
-
-	public boolean equals(T x, T y) throws HibernateException {
-		if ( x == y ) {
-			return true;
-		}
-		if ( null == x || null == y ) {
-			return false;
-		}
-		return x.equals( y );
-	}
-}
-
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.usertypes;
+
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.usertype.UserType;
+
+public class EnumUserType> implements UserType, ParameterizedType {
+
+	private Class clazz = null;
+
+	public static > EnumUserType createInstance(Class clazz) {
+		if ( !clazz.isEnum() ) {
+			throw new IllegalArgumentException( "Parameter has to be an enum-class" );
+		}
+		EnumUserType that = new EnumUserType<>();
+		Properties p = new Properties();
+		p.setProperty( "enumClassName", clazz.getName() );
+		that.setParameterValues( p );
+		return that;
+	}
+
+	public void setParameterValues(Properties params) {
+		String enumClassName = params.getProperty( "enumClassName" );
+		if ( enumClassName == null ) {
+			throw new MappingException( "enumClassName parameter not specified" );
+		}
+
+		try {
+			//noinspection unchecked
+			this.clazz = (Class) Class.forName( enumClassName );
+		}
+		catch (ClassNotFoundException e) {
+			throw new MappingException( "enumClass " + enumClassName + " not found", e );
+		}
+		if ( !this.clazz.isEnum() ) {
+			throw new MappingException( "enumClass " + enumClassName + " doesn't refer to an Enum" );
+		}
+	}
+
+	@Override
+	public int getSqlType() {
+		return Types.CHAR;
+	}
+
+	public Class returnedClass() {
+		return clazz;
+	}
+
+	@Override
+	public T nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
+			throws SQLException {
+		final String name = rs.getString( position );
+		if ( rs.wasNull() ) {
+			return null;
+		}
+		return Enum.valueOf( clazz, name.trim() );
+	}
+
+	public void nullSafeSet(PreparedStatement preparedStatement, Object value, int index)
+			throws HibernateException, SQLException {
+	}
+
+	@Override
+	public void nullSafeSet(
+			PreparedStatement preparedStatement,
+			T value,
+			int index,
+			SharedSessionContractImplementor session) throws SQLException {
+		if ( null == value ) {
+			preparedStatement.setNull( index, Types.VARCHAR );
+		}
+		else {
+			preparedStatement.setString( index, value.name() );
+		}
+	}
+
+	public T deepCopy(T value) throws HibernateException {
+		return value;
+	}
+
+	public boolean isMutable() {
+		return false;
+	}
+
+	public T assemble(Serializable cached, Object owner) throws HibernateException {
+		//noinspection unchecked
+		return (T) cached;
+	}
+
+	public Serializable disassemble(T value) throws HibernateException {
+		return value;
+	}
+
+	public T replace(T original, T target, Object owner) throws HibernateException {
+		return original;
+	}
+
+	public int hashCode(T x) throws HibernateException {
+		return x.hashCode();
+	}
+
+	public boolean equals(T x, T y) throws HibernateException {
+		if ( x == y ) {
+			return true;
+		}
+		if ( null == x || null == y ) {
+			return false;
+		}
+		return x.equals( y );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEntity.java
index c771b07ca443..45db08b54126 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEntity.java
@@ -1,25 +1,23 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.mapping.usertypes;
-
-public class TestEntity {
-	private int id;
-	private TestEnum testEnum;
-	
-	public void setId(int id) {
-		this.id = id;
-	}
-	public int getId() {
-		return id;
-	}
-	public void setTestEnum(TestEnum testEnum) {
-		this.testEnum = testEnum;
-	}
-	public TestEnum getTestEnum() {
-		return testEnum;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.usertypes;
+
+public class TestEntity {
+	private int id;
+	private TestEnum testEnum;
+
+	public void setId(int id) {
+		this.id = id;
+	}
+	public int getId() {
+		return id;
+	}
+	public void setTestEnum(TestEnum testEnum) {
+		this.testEnum = testEnum;
+	}
+	public TestEnum getTestEnum() {
+		return testEnum;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEnum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEnum.java
index 9ad08133b05c..300da893a36e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEnum.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/TestEnum.java
@@ -1,12 +1,10 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.mapping.usertypes;
-
-public enum TestEnum {
-	FOO,
-	BAR;
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.usertypes;
+
+public enum TestEnum {
+	FOO,
+	BAR;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeFunctionsTest.java
index e07dd61761fe..336f4f507567 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeFunctionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.usertypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java
index c211ce7ab145..4beb6c38b361 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.usertypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/Account.java
index d4a6cdd3c445..d55b2f0a7a3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/Account.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 import org.hibernate.annotations.Type;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java
index 8e9836bc15ac..e571b4d26387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 public class AccountCurrencyUnit implements CurrencyUnit {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnit.java
index 01e8a2cadd88..94cd06d4fcd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnit.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnit.java
@@ -1,7 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 public interface CurrencyUnit{
 	String getCurrencyCode();
 
 	int getNumericCode();
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java
index a7e232b850d1..ad96599f6efe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -53,4 +57,4 @@ public  CurrencyUnit wrap(X currencyCode, WrapperOptions options) {
 		}
 		throw unknownWrap( currencyCode.getClass() );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitUserType.java
index 02c34aacac99..41f110c9c77d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitUserType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 import java.util.function.BiConsumer;
@@ -13,4 +17,4 @@ public class CurrencyUnitUserType extends BaseUserTypeSupport {
 	protected void resolve(BiConsumer, JdbcType> resolutionConsumer) {
 		resolutionConsumer.accept( CurrencyUnitTypeDescriptor.INSTANCE, VarcharJdbcType.INSTANCE );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java
index 2f7ba17a77b5..9581b7337b8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.usertypes.xmlmapping;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/DiscriminatorWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/DiscriminatorWhereTest.java
index c9bf397ad85a..c2ef05d7af5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/DiscriminatorWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/DiscriminatorWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/OneToManySQLRestrictionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/OneToManySQLRestrictionTests.java
index a37aec43ba9c..f91131051916 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/OneToManySQLRestrictionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/OneToManySQLRestrictionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/User.java
index b3a20eb3abb3..db6308fd85b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
@@ -19,9 +17,7 @@
 import jakarta.persistence.Table;
 
 import static jakarta.persistence.FetchType.LAZY;
-import static java.text.MessageFormat.format;
 import static java.util.Objects.hash;
-import static java.util.stream.Collectors.joining;
 
 @NamedEntityGraph(
 		name = "user-entity-graph",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserDetail.java
index dfdc6f1e14cc..b7462824f0d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserDetail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserDetail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserSkill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserSkill.java
index 29121942fc1f..bbf1c284dad7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserSkill.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/UserSkill.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java
index d5fdaf015bdf..e01e6a0bb3b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.mapping.where;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java
index 2c64338ef80a..8b9ca363b23b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.where;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/InvalidMapping.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/InvalidMapping.java
index a0f1cb4799bd..774d6265c6a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/InvalidMapping.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/InvalidMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mappingexception;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/MappingExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/MappingExceptionTest.java
index 5d26979d64dd..4798fd8cba9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/MappingExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/MappingExceptionTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: SQLExceptionConversionTest.java 6847 2005-05-21 15:46:41Z oneovthafew $
 package org.hibernate.orm.test.mappingexception;
 
 import java.io.ByteArrayInputStream;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java
index 578228cfc9e0..d1233425c5f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java
@@ -1,24 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: User.java 4746 2004-11-11 20:57:28Z steveebersole $
 package org.hibernate.orm.test.mappingexception;
 
 
 
 /**
- * 
+ *
  *
  * @author Max Rydahl Andersen
  */
 public class User {
 	private Long id;
 	private String username;
-	
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMerge2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMerge2Test.java
index 9a2edbc5131c..9a1dab90306d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMerge2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMerge2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.merge;
 
 import java.util.ArrayList;
@@ -11,8 +15,6 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java
index a8e31f4972b2..ac5b57cdd0e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.merge;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithAssociatedCollectionAndCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithAssociatedCollectionAndCascadeTest.java
index 3620555d30f2..85ea20262206 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithAssociatedCollectionAndCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithAssociatedCollectionAndCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.merge;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java
index 4bd786a6607a..12010728171f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.merge;
 
 import org.hibernate.annotations.Fetch;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/SimpleMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/SimpleMergeTest.java
index cc0b3213236f..0af20bc6acac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/SimpleMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/SimpleMergeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.merge;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -58,5 +62,3 @@ public String getName() {
 	}
 
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java
index 4d796cba0778..7874244908a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java
index 2009acbd7574..decf8b588b06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/EmbeddableMetaModelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/EmbeddableMetaModelTest.java
index 7ae21c5c877a..8d53b74cdde9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/EmbeddableMetaModelTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/EmbeddableMetaModelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Height.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Height.java
index ad41f901fda2..0c015f671298 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Height.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Height.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ILocalizable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ILocalizable.java
index a351bbb98da4..37817e6c22b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ILocalizable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ILocalizable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java
index 63ef53470d14..19994c4e4447 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Measurement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Measurement.java
index c84421fb17a3..e9732ef9dddd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Measurement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Measurement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java
index da0727d2607b..fb093f0f54ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java
index 771b51b308ca..bda5187246c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java
index 24e7d74a12a3..2f30796d9b50 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java
index b062467b33b9..d5a57cadddde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/TestEntity.java
index 4eb3056f207a..0a8b44eb4eab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java
index 4b35653e82de..d3cc772949fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/AbstractValueObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/AbstractValueObject.java
index 3b9e40980920..93ecd63134d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/AbstractValueObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/AbstractValueObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/CreationDate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/CreationDate.java
index 21700a1cb159..5124f99ea9f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/CreationDate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/CreationDate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/GenericEmbeddableSuperclassMetamodelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/GenericEmbeddableSuperclassMetamodelTest.java
index 474085add4cd..2ab5894080b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/GenericEmbeddableSuperclassMetamodelTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/GenericEmbeddableSuperclassMetamodelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/Parent.java
index 17898c5b48a4..91db432e0e22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeNumber.java
index 3f618556ed33..8a9521b3f08b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeNumber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeString.java
index 825a743d3801..59ae8d62acc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeString.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddable/SomeString.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.metamodel.generics.embeddable;
 
 import jakarta.persistence.Embeddable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java
index 0aa7ec0537ec..6c03bc36f50b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.wildcardmodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java
index 36b985d8aadd..3a43a5cb5af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.wildcardmodel;
 
@@ -25,7 +23,7 @@ public abstract class AbstractOwner {
 	@GeneratedValue
 	private Long id;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner", targetEntity = AbstractEntity.class)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "owner", targetEntity = AbstractEntity.class)
 	private List entities = new ArrayList<>();
 
 	public Long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java
index 2c47c656bf63..ae5775b7ccd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.wildcardmodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java
index 5e2f57f3ecda..0cb6d5b83040 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.metamodel.wildcardmodel;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Document.java
index 2a8179d7e7cf..10e6a1fd4098 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Document.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Document.java 8670 2005-11-25 17:36:29Z epbernard $
-
 package org.hibernate.orm.test.mixed;
 import java.sql.Blob;
 import java.util.Calendar;
@@ -85,4 +80,3 @@ public void setContent(Blob content) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/DocumentInterceptor.java
index 3a88c7016ab6..ad6d02eaae54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/DocumentInterceptor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/DocumentInterceptor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DocumentInterceptor.java 8670 2005-11-25 17:36:29Z epbernard $
 package org.hibernate.orm.test.mixed;
 
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Folder.java
index 37966d835271..b6d565b6a616 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Folder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Folder.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Folder.java 8670 2005-11-25 17:36:29Z epbernard $
-
 package org.hibernate.orm.test.mixed;
 
 
@@ -18,4 +13,3 @@
 public class Folder extends Item {
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Item.java
index f07aa4845b9e..420d4364e602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/Item.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 8670 2005-11-25 17:36:29Z epbernard $
-
 package org.hibernate.orm.test.mixed;
 
 
@@ -84,4 +79,3 @@ public void setName(String name) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java
index 2b2efaf24c2f..32168ce96e39 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mixed;
 
@@ -66,7 +64,7 @@ public void testMixedInheritance(SessionFactoryScope scope) {
 		Long did = doc.getId();
 		Long d2id = doc2.getId();
 
-        if ( !scope.getSessionFactory().getJdbcServices().getDialect().supportsExpectedLobUsagePattern() ) {
+		if ( !scope.getSessionFactory().getJdbcServices().getDialect().supportsExpectedLobUsagePattern() ) {
 			SkipLog.reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" );
 			return;
 		}
@@ -128,4 +126,3 @@ public void testMixedInheritance(SessionFactoryScope scope) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/SecureDocument.java
index 2c681ae9af27..5abceb739717 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/SecureDocument.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/SecureDocument.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: SecureDocument.java 8670 2005-11-25 17:36:29Z epbernard $
-
 package org.hibernate.orm.test.mixed;
 
 
@@ -62,4 +57,3 @@ public void setPermissionBits(byte permissionBits) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/AbstractMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/AbstractMultiTenancyTest.java
index 25d32fdc022d..11fcadb38243 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/AbstractMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/AbstractMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
@@ -54,263 +52,263 @@
  */
 public abstract class AbstractMultiTenancyTest extends BaseUnitTestCase {
 
-    protected static final String FRONT_END_TENANT = "front_end";
-    protected static final String BACK_END_TENANT = "back_end";
+	protected static final String FRONT_END_TENANT = "front_end";
+	protected static final String BACK_END_TENANT = "back_end";
 
-    private Map connectionProviderMap = new HashMap<>();
+	private Map connectionProviderMap = new HashMap<>();
 
-    private SessionFactory sessionFactory;
+	private SessionFactory sessionFactory;
 
-    public AbstractMultiTenancyTest() {
-        init();
-    }
+	public AbstractMultiTenancyTest() {
+		init();
+	}
 
-    //tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
-    private void init() {
-        registerConnectionProvider(FRONT_END_TENANT);
-        registerConnectionProvider(BACK_END_TENANT);
+	//tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
+	private void init() {
+		registerConnectionProvider(FRONT_END_TENANT);
+		registerConnectionProvider(BACK_END_TENANT);
 
-        Map settings = new HashMap<>();
+		Map settings = new HashMap<>();
 
-        settings.put(AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
-            new ConfigurableMultiTenantConnectionProvider(connectionProviderMap));
+		settings.put(AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
+			new ConfigurableMultiTenantConnectionProvider(connectionProviderMap));
 
-        sessionFactory = sessionFactory(settings);
-    }
-    //end::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
+		sessionFactory = sessionFactory(settings);
+	}
+	//end::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
 
-    @AfterClassOnce
-    public void destroy() {
-        sessionFactory.close();
-        for (ConnectionProvider connectionProvider : connectionProviderMap.values()) {
-            if (connectionProvider instanceof Stoppable) {
-                ((Stoppable) connectionProvider).stop();
-            }
-        }
-    }
+	@AfterClassOnce
+	public void destroy() {
+		sessionFactory.close();
+		for (ConnectionProvider connectionProvider : connectionProviderMap.values()) {
+			if (connectionProvider instanceof Stoppable) {
+				((Stoppable) connectionProvider).stop();
+			}
+		}
+	}
 
-    @After
-    public void cleanup() {
-        doInSession(FRONT_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
-        doInSession(BACK_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
-    }
+	@After
+	public void cleanup() {
+		doInSession(FRONT_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
+		doInSession(BACK_END_TENANT, session -> session.createMutationQuery( "delete from Person" ).executeUpdate() );
+	}
 
-    //tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
+	//tag::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
 
-    protected void registerConnectionProvider(String tenantIdentifier) {
-        Properties properties = properties();
-        properties.put(Environment.URL,
-            tenantUrl(properties.getProperty(Environment.URL), tenantIdentifier));
+	protected void registerConnectionProvider(String tenantIdentifier) {
+		Properties properties = properties();
+		properties.put(Environment.URL,
+			tenantUrl(properties.getProperty(Environment.URL), tenantIdentifier));
 
-        DriverManagerConnectionProviderImpl connectionProvider =
-            new DriverManagerConnectionProviderImpl();
-        connectionProvider.configure( PropertiesHelper.map(properties) );
-        connectionProviderMap.put(tenantIdentifier, connectionProvider);
-    }
-    //end::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
+		DriverManagerConnectionProviderImpl connectionProvider =
+			new DriverManagerConnectionProviderImpl();
+		connectionProvider.configure( PropertiesHelper.map(properties) );
+		connectionProviderMap.put(tenantIdentifier, connectionProvider);
+	}
+	//end::multitenacy-hibernate-MultiTenantConnectionProvider-example[]
 
-    @Test
-    public void testBasicExpectedBehavior() {
+	@Test
+	public void testBasicExpectedBehavior() {
 
 		//tag::multitenacy-multitenacy-hibernate-same-entity-example[]
-        doInSession(FRONT_END_TENANT, session -> {
-            Person person = new Person();
-            person.setId(1L);
-            person.setName("John Doe");
-            session.persist(person);
-        });
-
-        doInSession(BACK_END_TENANT, session -> {
-            Person person = new Person();
-            person.setId(1L);
-            person.setName("John Doe");
-            session.persist(person);
-        });
+		doInSession(FRONT_END_TENANT, session -> {
+			Person person = new Person();
+			person.setId(1L);
+			person.setName("John Doe");
+			session.persist(person);
+		});
+
+		doInSession(BACK_END_TENANT, session -> {
+			Person person = new Person();
+			person.setId(1L);
+			person.setName("John Doe");
+			session.persist(person);
+		});
 		//end::multitenacy-multitenacy-hibernate-same-entity-example[]
-    }
-
-    @Test
-    @JiraKey( value = "HHH-17972")
-    public void testChangeTenantWithoutConnectionReuse() {
-        Person person = new Person();
-        person.setId( 1L );
-        person.setName( "John Doe" );
-        Person person2 = new Person();
-        person2.setId( 2L );
-        person2.setName( "Jane Doe" );
-
-        Transaction t;
-        Session session = null;
-        Session newSession = null;
-        try {
-            session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession();
-            t = session.beginTransaction();
-            session.persist( person );
-            t.commit();
-
-            Query sessionQuery = session.createQuery( "from Person", Person.class );
-            assertEquals( 1, sessionQuery.getResultList().size() );
-            assertEquals( "John Doe", sessionQuery.getResultList().get( 0 ).getName() );
-
-            newSession = session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).openSession();
-            t = newSession.beginTransaction();
-            newSession.persist( person2 );
-            t.commit();
-
-            Query newSessionQuery = newSession.createQuery( "from Person", Person.class );
-            assertEquals( 1, newSessionQuery.getResultList().size() );
-            assertEquals( "Jane Doe", newSessionQuery.getResultList().get( 0 ).getName() );
-        }
-        finally {
-            if (session != null) {
-                session.close();
-            }
-            if (newSession != null) {
-                newSession.close();
-            }
-        }
-    }
-
-    @Test
-    @JiraKey( value = "HHH-17972")
-    public void testChangeTenantWithConnectionReuse() {
-        try (Session session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession()) {
-            Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
-                                 SessionException.class,
-                                 () -> session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).connection().openSession()
-            );
-            Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
-                                 SessionException.class,
-                                 () -> session.sessionWithOptions().connection().tenantIdentifier( BACK_END_TENANT ).openSession()
-            );
-        }
-    }
-
-    protected Properties properties() {
-        Properties properties = new Properties();
-        URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate.properties");
-        try(FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
-            properties.load(inputStream);
-        }
-        catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-        return properties;
-    }
-
-    protected abstract String tenantUrl(String originalUrl, String tenantIdentifier);
-
-    protected SessionFactory sessionFactory(Map settings) {
-
-        ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) ServiceRegistryUtil.serviceRegistryBuilder()
-            .applySettings(settings)
-            .build();
-
-        MetadataSources metadataSources = new MetadataSources(serviceRegistry);
-        for(Class annotatedClasses : getAnnotatedClasses()) {
-            metadataSources.addAnnotatedClass(annotatedClasses);
-        }
-
-        Metadata metadata = metadataSources.buildMetadata();
-
-        HibernateSchemaManagementTool tool = new HibernateSchemaManagementTool();
-        tool.injectServices(serviceRegistry);
-
-        new SchemaDropperImpl( serviceRegistry ).doDrop(
-                metadata,
-                serviceRegistry,
-                settings,
-                true,
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( FRONT_END_TENANT )
-                        )
-                ),
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( BACK_END_TENANT )
-                        )
-                )
-        );
-
-        new SchemaCreatorImpl( serviceRegistry ).doCreation(
-                metadata,
-                serviceRegistry,
-                settings,
-                true,
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( FRONT_END_TENANT )
-                        )
-                ),
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( BACK_END_TENANT )
-                        )
-                )
-        );
-
-        final SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
-        return sessionFactoryBuilder.build();
-    }
-
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Person.class
-        };
-    }
+	}
+
+	@Test
+	@JiraKey( value = "HHH-17972")
+	public void testChangeTenantWithoutConnectionReuse() {
+		Person person = new Person();
+		person.setId( 1L );
+		person.setName( "John Doe" );
+		Person person2 = new Person();
+		person2.setId( 2L );
+		person2.setName( "Jane Doe" );
+
+		Transaction t;
+		Session session = null;
+		Session newSession = null;
+		try {
+			session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession();
+			t = session.beginTransaction();
+			session.persist( person );
+			t.commit();
+
+			Query sessionQuery = session.createQuery( "from Person", Person.class );
+			assertEquals( 1, sessionQuery.getResultList().size() );
+			assertEquals( "John Doe", sessionQuery.getResultList().get( 0 ).getName() );
+
+			newSession = session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).openSession();
+			t = newSession.beginTransaction();
+			newSession.persist( person2 );
+			t.commit();
+
+			Query newSessionQuery = newSession.createQuery( "from Person", Person.class );
+			assertEquals( 1, newSessionQuery.getResultList().size() );
+			assertEquals( "Jane Doe", newSessionQuery.getResultList().get( 0 ).getName() );
+		}
+		finally {
+			if (session != null) {
+				session.close();
+			}
+			if (newSession != null) {
+				newSession.close();
+			}
+		}
+	}
+
+	@Test
+	@JiraKey( value = "HHH-17972")
+	public void testChangeTenantWithConnectionReuse() {
+		try (Session session = sessionFactory.withOptions().tenantIdentifier( FRONT_END_TENANT ).openSession()) {
+			Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
+								SessionException.class,
+								() -> session.sessionWithOptions().tenantIdentifier( BACK_END_TENANT ).connection().openSession()
+			);
+			Assert.assertThrows( "Cannot redefine the tenant identifier on a child session if the connection is reused",
+								SessionException.class,
+								() -> session.sessionWithOptions().connection().tenantIdentifier( BACK_END_TENANT ).openSession()
+			);
+		}
+	}
+
+	protected Properties properties() {
+		Properties properties = new Properties();
+		URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate.properties");
+		try(FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
+			properties.load(inputStream);
+		}
+		catch (IOException e) {
+			throw new IllegalArgumentException(e);
+		}
+		return properties;
+	}
+
+	protected abstract String tenantUrl(String originalUrl, String tenantIdentifier);
+
+	protected SessionFactory sessionFactory(Map settings) {
+
+		ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) ServiceRegistryUtil.serviceRegistryBuilder()
+			.applySettings(settings)
+			.build();
+
+		MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+		for(Class annotatedClasses : getAnnotatedClasses()) {
+			metadataSources.addAnnotatedClass(annotatedClasses);
+		}
+
+		Metadata metadata = metadataSources.buildMetadata();
+
+		HibernateSchemaManagementTool tool = new HibernateSchemaManagementTool();
+		tool.injectServices(serviceRegistry);
+
+		new SchemaDropperImpl( serviceRegistry ).doDrop(
+				metadata,
+				serviceRegistry,
+				settings,
+				true,
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( FRONT_END_TENANT )
+						)
+				),
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( BACK_END_TENANT )
+						)
+				)
+		);
+
+		new SchemaCreatorImpl( serviceRegistry ).doCreation(
+				metadata,
+				serviceRegistry,
+				settings,
+				true,
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( FRONT_END_TENANT )
+						)
+				),
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( BACK_END_TENANT )
+						)
+				)
+		);
+
+		final SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
+		return sessionFactoryBuilder.build();
+	}
+
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Person.class
+		};
+	}
 
 	//tag::multitenacy-hibernate-session-example[]
-    private void doInSession(String tenant, Consumer function) {
-        Session session = null;
-        Transaction txn = null;
-        try {
-            session = sessionFactory
-                .withOptions()
-                .tenantIdentifier(tenant)
-                .openSession();
-            txn = session.getTransaction();
-            txn.begin();
-            function.accept(session);
-            txn.commit();
-        } catch (Throwable e) {
-            if (txn != null) txn.rollback();
-            throw e;
-        } finally {
-            if (session != null) {
-                session.close();
-            }
-        }
-    }
+	private void doInSession(String tenant, Consumer function) {
+		Session session = null;
+		Transaction txn = null;
+		try {
+			session = sessionFactory
+				.withOptions()
+				.tenantIdentifier(tenant)
+				.openSession();
+			txn = session.getTransaction();
+			txn.begin();
+			function.accept(session);
+			txn.commit();
+		} catch (Throwable e) {
+			if (txn != null) txn.rollback();
+			throw e;
+		} finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+	}
 	//end::multitenacy-hibernate-session-example[]
 
-    @Entity(name = "Person")
-    public static class Person {
+	@Entity(name = "Person")
+	public static class Person {
 
-        @Id
-        private Long id;
+		@Id
+		private Long id;
 
-        private String name;
+		private String name;
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurableMultiTenantConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurableMultiTenantConnectionProvider.java
index 282898ac75ae..7c6e9c6225f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurableMultiTenantConnectionProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurableMultiTenantConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
@@ -17,24 +15,24 @@
  */
 //tag::multitenacy-hibernate-ConfigurableMultiTenantConnectionProvider-example[]
 public class ConfigurableMultiTenantConnectionProvider
-        extends AbstractMultiTenantConnectionProvider {
+		extends AbstractMultiTenantConnectionProvider {
 
-    private final Map connectionProviderMap =
-        new HashMap<>();
+	private final Map connectionProviderMap =
+		new HashMap<>();
 
-    public ConfigurableMultiTenantConnectionProvider(
-            Map connectionProviderMap) {
-        this.connectionProviderMap.putAll(connectionProviderMap);
-    }
+	public ConfigurableMultiTenantConnectionProvider(
+			Map connectionProviderMap) {
+		this.connectionProviderMap.putAll(connectionProviderMap);
+	}
 
-    @Override
-    protected ConnectionProvider getAnyConnectionProvider() {
-        return connectionProviderMap.values().iterator().next();
-    }
+	@Override
+	protected ConnectionProvider getAnyConnectionProvider() {
+		return connectionProviderMap.values().iterator().next();
+	}
 
-    @Override
-    protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) {
-        return connectionProviderMap.get(tenantIdentifier);
-    }
+	@Override
+	protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) {
+		return connectionProviderMap.get(tenantIdentifier);
+	}
 }
 //end::multitenacy-hibernate-ConfigurableMultiTenantConnectionProvider-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java
index b6dba21f2672..828bb5669cc2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseMultiTenancyTest.java
index 52ed1da3011d..ee1e29bf9864 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseTimeZoneMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseTimeZoneMultiTenancyTest.java
index 82ab9fba8372..4070ed22e3d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseTimeZoneMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/DatabaseTimeZoneMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
@@ -28,7 +26,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.H2Dialect;
@@ -58,300 +55,300 @@
 @RequiresDialect(H2Dialect.class)
 public class DatabaseTimeZoneMultiTenancyTest extends BaseUnitTestCase {
 
-    protected static final String FRONT_END_TENANT = "front_end";
-    protected static final String BACK_END_TENANT = "back_end";
-
-    //tag::multitenacy-hibernate-timezone-configuration-context-example[]
-    private Map connectionProviderMap = new HashMap<>();
-
-    private Map timeZoneTenantMap = new HashMap<>();
-    //end::multitenacy-hibernate-timezone-configuration-context-example[]
-
-    private SessionFactory sessionFactory;
-
-    public DatabaseTimeZoneMultiTenancyTest() {
-        init();
-    }
-
-    private void init() {
-        //tag::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-call-example[]
-        registerConnectionProvider(FRONT_END_TENANT, TimeZone.getTimeZone("UTC"));
-        registerConnectionProvider(BACK_END_TENANT, TimeZone.getTimeZone("CST"));
-        //end::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-call-example[]
-
-        Map settings = new HashMap<>();
-
-        settings.put(
-                AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
-                new ConfigurableMultiTenantConnectionProvider(connectionProviderMap)
-       );
-
-        sessionFactory = sessionFactory(settings);
-    }
-
-    @AfterClassOnce
-    public void destroy() {
-        sessionFactory.close();
-        for (ConnectionProvider connectionProvider : connectionProviderMap.values()) {
-            if (connectionProvider instanceof Stoppable) {
-                ((Stoppable) connectionProvider).stop();
-            }
-        }
-    }
-
-    //tag::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-example[]
-    protected void registerConnectionProvider(String tenantIdentifier, TimeZone timeZone) {
-        Properties properties = properties();
-        properties.put(
-            Environment.URL,
-            tenantUrl( properties.getProperty(Environment.URL), tenantIdentifier )
-       );
-
-        DriverManagerConnectionProviderImpl connectionProvider =
-                new DriverManagerConnectionProviderImpl();
-        connectionProvider.configure( PropertiesHelper.map(properties) );
-
-        connectionProviderMap.put(tenantIdentifier, connectionProvider);
-
-        timeZoneTenantMap.put(tenantIdentifier, timeZone);
-    }
-    //end::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-example[]
-
-    @Test
-    public void testBasicExpectedBehavior() {
-
-        //tag::multitenacy-hibernate-applying-timezone-configuration-example[]
-        doInSession(FRONT_END_TENANT, session -> {
-            Person person = new Person();
-            person.setId(1L);
-            person.setName("John Doe");
-            person.setCreatedOn(LocalDateTime.of(2018, 11, 23, 12, 0, 0));
-
-            session.persist(person);
-        }, true);
-
-        doInSession(BACK_END_TENANT, session -> {
-            Person person = new Person();
-            person.setId(1L);
-            person.setName("John Doe");
-            person.setCreatedOn(LocalDateTime.of(2018, 11, 23, 12, 0, 0));
-
-            session.persist(person);
-        }, true);
-
-        doInSession(FRONT_END_TENANT, session -> {
-            Timestamp personCreationTimestamp = (Timestamp) session
-            .createNativeQuery(
-                "select p.created_on " +
-                "from Person p " +
-                "where p.id = :personId", Timestamp.class)
-            .setParameter("personId", 1L)
-            .getSingleResult();
-
-            assertEquals(
-                Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)),
-                personCreationTimestamp
-           );
-        }, true);
-
-        doInSession(BACK_END_TENANT, session -> {
-            Timestamp personCreationTimestamp = (Timestamp) session
-            .createNativeQuery(
-                "select p.created_on " +
-                "from Person p " +
-                "where p.id = :personId", Timestamp.class)
-            .setParameter("personId", 1L)
-            .getSingleResult();
-
-            assertEquals(
-                Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)),
-                personCreationTimestamp
-           );
-        }, true);
-        //end::multitenacy-hibernate-applying-timezone-configuration-example[]
-
-        //tag::multitenacy-hibernate-not-applying-timezone-configuration-example[]
-        doInSession(FRONT_END_TENANT, session -> {
-            Timestamp personCreationTimestamp = (Timestamp) session
-            .createNativeQuery(
-                "select p.created_on " +
-                "from Person p " +
-                "where p.id = :personId", Timestamp.class)
-            .setParameter("personId", 1L)
-            .getSingleResult();
-
-            log.infof(
-                "The created_on timestamp value is: [%s]",
-                personCreationTimestamp
-           );
-
-            long timeZoneOffsetMillis =
-                    Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)).getTime() -
-                    personCreationTimestamp.getTime();
-
-            assertEquals(
-                TimeZone.getTimeZone(ZoneId.systemDefault()).getRawOffset(),
-                timeZoneOffsetMillis
-           );
-
-            log.infof(
-                "For the current time zone: [%s], the UTC time zone offset is: [%d]",
-                TimeZone.getDefault().getDisplayName(), timeZoneOffsetMillis
-           );
-        }, false);
-        //end::multitenacy-hibernate-not-applying-timezone-configuration-example[]
-    }
-
-    protected Properties properties() {
-        Properties properties = new Properties();
-        URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate.properties");
-        try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
-            properties.load(inputStream);
-        }
-        catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        }
-        return properties;
-    }
-
-    protected String tenantUrl(String originalUrl, String tenantIdentifier) {
-        return originalUrl.replace("db1", tenantIdentifier);
-    }
-
-    protected SessionFactory sessionFactory(Map settings) {
-
-        ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) ServiceRegistryUtil.serviceRegistryBuilder()
-                .applySettings(settings)
-                .build();
-
-        MetadataSources metadataSources = new MetadataSources(serviceRegistry);
-        for (Class annotatedClasses : getAnnotatedClasses()) {
-            metadataSources.addAnnotatedClass(annotatedClasses);
-        }
-
-        Metadata metadata = metadataSources.buildMetadata();
-
-        HibernateSchemaManagementTool tool = new HibernateSchemaManagementTool();
-        tool.injectServices(serviceRegistry);
-
-        new SchemaDropperImpl( serviceRegistry ).doDrop(
-                metadata,
-                serviceRegistry,
-                settings,
-                true,
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( FRONT_END_TENANT )
-                        )
-                ),
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( BACK_END_TENANT )
-                        )
-                )
-        );
-
-        new SchemaCreatorImpl( serviceRegistry ).doCreation(
-                metadata,
-                serviceRegistry,
-                settings,
-                true,
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( FRONT_END_TENANT )
-                        )
-                ),
-                new GenerationTargetToDatabase(
-                        new DdlTransactionIsolatorTestingImpl(
-                                serviceRegistry,
-                                connectionProviderMap.get( BACK_END_TENANT )
-                        )
-                )
-        );
-
-        final SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
-        return sessionFactoryBuilder.build();
-    }
-
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                Person.class
-        };
-    }
-
-    //tag::multitenacy-hibernate-timezone-configuration-session-example[]
-    private void doInSession(String tenant, Consumer function, boolean useTenantTimeZone) {
-        Session session = null;
-        Transaction txn = null;
-
-        try {
-            SessionBuilder sessionBuilder = sessionFactory
-                    .withOptions()
-                    .tenantIdentifier(tenant);
-
-            if (useTenantTimeZone) {
-                sessionBuilder.jdbcTimeZone(timeZoneTenantMap.get(tenant));
-            }
-
-            session = sessionBuilder.openSession();
-
-            txn = session.getTransaction();
-            txn.begin();
-
-            function.accept(session);
-
-            txn.commit();
-        }
-        catch (Throwable e) {
-            if (txn != null) {
-                txn.rollback();
-            }
-            throw e;
-        }
-        finally {
-            if (session != null) {
-                session.close();
-            }
-        }
-    }
-    //end::multitenacy-hibernate-timezone-configuration-session-example[]
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        private Long id;
-
-        private String name;
-
-        @Column(name = "created_on")
-        private LocalDateTime createdOn;
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public LocalDateTime getCreatedOn() {
-            return createdOn;
-        }
-
-        public void setCreatedOn(LocalDateTime createdOn) {
-            this.createdOn = createdOn;
-        }
-    }
+	protected static final String FRONT_END_TENANT = "front_end";
+	protected static final String BACK_END_TENANT = "back_end";
+
+	//tag::multitenacy-hibernate-timezone-configuration-context-example[]
+	private Map connectionProviderMap = new HashMap<>();
+
+	private Map timeZoneTenantMap = new HashMap<>();
+	//end::multitenacy-hibernate-timezone-configuration-context-example[]
+
+	private SessionFactory sessionFactory;
+
+	public DatabaseTimeZoneMultiTenancyTest() {
+		init();
+	}
+
+	private void init() {
+		//tag::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-call-example[]
+		registerConnectionProvider(FRONT_END_TENANT, TimeZone.getTimeZone("UTC"));
+		registerConnectionProvider(BACK_END_TENANT, TimeZone.getTimeZone("CST"));
+		//end::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-call-example[]
+
+		Map settings = new HashMap<>();
+
+		settings.put(
+				AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER,
+				new ConfigurableMultiTenantConnectionProvider(connectionProviderMap)
+	);
+
+		sessionFactory = sessionFactory(settings);
+	}
+
+	@AfterClassOnce
+	public void destroy() {
+		sessionFactory.close();
+		for (ConnectionProvider connectionProvider : connectionProviderMap.values()) {
+			if (connectionProvider instanceof Stoppable) {
+				((Stoppable) connectionProvider).stop();
+			}
+		}
+	}
+
+	//tag::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-example[]
+	protected void registerConnectionProvider(String tenantIdentifier, TimeZone timeZone) {
+		Properties properties = properties();
+		properties.put(
+			Environment.URL,
+			tenantUrl( properties.getProperty(Environment.URL), tenantIdentifier )
+	);
+
+		DriverManagerConnectionProviderImpl connectionProvider =
+				new DriverManagerConnectionProviderImpl();
+		connectionProvider.configure( PropertiesHelper.map(properties) );
+
+		connectionProviderMap.put(tenantIdentifier, connectionProvider);
+
+		timeZoneTenantMap.put(tenantIdentifier, timeZone);
+	}
+	//end::multitenacy-hibernate-timezone-configuration-registerConnectionProvider-example[]
+
+	@Test
+	public void testBasicExpectedBehavior() {
+
+		//tag::multitenacy-hibernate-applying-timezone-configuration-example[]
+		doInSession(FRONT_END_TENANT, session -> {
+			Person person = new Person();
+			person.setId(1L);
+			person.setName("John Doe");
+			person.setCreatedOn(LocalDateTime.of(2018, 11, 23, 12, 0, 0));
+
+			session.persist(person);
+		}, true);
+
+		doInSession(BACK_END_TENANT, session -> {
+			Person person = new Person();
+			person.setId(1L);
+			person.setName("John Doe");
+			person.setCreatedOn(LocalDateTime.of(2018, 11, 23, 12, 0, 0));
+
+			session.persist(person);
+		}, true);
+
+		doInSession(FRONT_END_TENANT, session -> {
+			Timestamp personCreationTimestamp = (Timestamp) session
+			.createNativeQuery(
+				"select p.created_on " +
+				"from Person p " +
+				"where p.id = :personId", Timestamp.class)
+			.setParameter("personId", 1L)
+			.getSingleResult();
+
+			assertEquals(
+				Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)),
+				personCreationTimestamp
+		);
+		}, true);
+
+		doInSession(BACK_END_TENANT, session -> {
+			Timestamp personCreationTimestamp = (Timestamp) session
+			.createNativeQuery(
+				"select p.created_on " +
+				"from Person p " +
+				"where p.id = :personId", Timestamp.class)
+			.setParameter("personId", 1L)
+			.getSingleResult();
+
+			assertEquals(
+				Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)),
+				personCreationTimestamp
+		);
+		}, true);
+		//end::multitenacy-hibernate-applying-timezone-configuration-example[]
+
+		//tag::multitenacy-hibernate-not-applying-timezone-configuration-example[]
+		doInSession(FRONT_END_TENANT, session -> {
+			Timestamp personCreationTimestamp = (Timestamp) session
+			.createNativeQuery(
+				"select p.created_on " +
+				"from Person p " +
+				"where p.id = :personId", Timestamp.class)
+			.setParameter("personId", 1L)
+			.getSingleResult();
+
+			log.infof(
+				"The created_on timestamp value is: [%s]",
+				personCreationTimestamp
+		);
+
+			long timeZoneOffsetMillis =
+					Timestamp.valueOf(LocalDateTime.of(2018, 11, 23, 12, 0, 0)).getTime() -
+					personCreationTimestamp.getTime();
+
+			assertEquals(
+				TimeZone.getTimeZone(ZoneId.systemDefault()).getRawOffset(),
+				timeZoneOffsetMillis
+		);
+
+			log.infof(
+				"For the current time zone: [%s], the UTC time zone offset is: [%d]",
+				TimeZone.getDefault().getDisplayName(), timeZoneOffsetMillis
+		);
+		}, false);
+		//end::multitenacy-hibernate-not-applying-timezone-configuration-example[]
+	}
+
+	protected Properties properties() {
+		Properties properties = new Properties();
+		URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate.properties");
+		try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
+			properties.load(inputStream);
+		}
+		catch (IOException e) {
+			throw new IllegalArgumentException(e);
+		}
+		return properties;
+	}
+
+	protected String tenantUrl(String originalUrl, String tenantIdentifier) {
+		return originalUrl.replace("db1", tenantIdentifier);
+	}
+
+	protected SessionFactory sessionFactory(Map settings) {
+
+		ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) ServiceRegistryUtil.serviceRegistryBuilder()
+				.applySettings(settings)
+				.build();
+
+		MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+		for (Class annotatedClasses : getAnnotatedClasses()) {
+			metadataSources.addAnnotatedClass(annotatedClasses);
+		}
+
+		Metadata metadata = metadataSources.buildMetadata();
+
+		HibernateSchemaManagementTool tool = new HibernateSchemaManagementTool();
+		tool.injectServices(serviceRegistry);
+
+		new SchemaDropperImpl( serviceRegistry ).doDrop(
+				metadata,
+				serviceRegistry,
+				settings,
+				true,
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( FRONT_END_TENANT )
+						)
+				),
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( BACK_END_TENANT )
+						)
+				)
+		);
+
+		new SchemaCreatorImpl( serviceRegistry ).doCreation(
+				metadata,
+				serviceRegistry,
+				settings,
+				true,
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( FRONT_END_TENANT )
+						)
+				),
+				new GenerationTargetToDatabase(
+						new DdlTransactionIsolatorTestingImpl(
+								serviceRegistry,
+								connectionProviderMap.get( BACK_END_TENANT )
+						)
+				)
+		);
+
+		final SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder();
+		return sessionFactoryBuilder.build();
+	}
+
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				Person.class
+		};
+	}
+
+	//tag::multitenacy-hibernate-timezone-configuration-session-example[]
+	private void doInSession(String tenant, Consumer function, boolean useTenantTimeZone) {
+		Session session = null;
+		Transaction txn = null;
+
+		try {
+			SessionBuilder sessionBuilder = sessionFactory
+					.withOptions()
+					.tenantIdentifier(tenant);
+
+			if (useTenantTimeZone) {
+				sessionBuilder.jdbcTimeZone(timeZoneTenantMap.get(tenant));
+			}
+
+			session = sessionBuilder.openSession();
+
+			txn = session.getTransaction();
+			txn.begin();
+
+			function.accept(session);
+
+			txn.commit();
+		}
+		catch (Throwable e) {
+			if (txn != null) {
+				txn.rollback();
+			}
+			throw e;
+		}
+		finally {
+			if (session != null) {
+				session.close();
+			}
+		}
+	}
+	//end::multitenacy-hibernate-timezone-configuration-session-example[]
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		private Long id;
+
+		private String name;
+
+		@Column(name = "created_on")
+		private LocalDateTime createdOn;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public LocalDateTime getCreatedOn() {
+			return createdOn;
+		}
+
+		public void setCreatedOn(LocalDateTime createdOn) {
+			this.createdOn = createdOn;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaMultiTenancyTest.java
index eb552ae32830..44131174ced1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java
index 57f5a6db1313..311ddd19d4c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java
index 42bddfffe421..c265e3c2f50f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.multitenancy.discriminator;
 
 import java.util.HashMap;
@@ -212,4 +209,4 @@ public void doInHibernate(String tenant, Consumer function) {
 		// to verify that the CurrentTenantIdentifierResolver is being applied!
 		TransactionUtil.doInHibernate( this::sessionFactory, function);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java
index 235bfb0870fa..6922b18c0425 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/CurrentTenantResolverMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/CurrentTenantResolverMultiTenancyTest.java
index 886958b5dd8d..294c250ad80c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/CurrentTenantResolverMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/CurrentTenantResolverMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Customer.java
index 790d1a1a5a2c..18ab7ae5dd23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Invoice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Invoice.java
index 9b898b69b208..b75068c2b8e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Invoice.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/Invoice.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedDataSourceMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedDataSourceMultiTenancyTest.java
index 52c860768a08..2d22882119cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedDataSourceMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedDataSourceMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
index 765fd0903e51..8d73f4c18309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java
index 86e31050ee6e..d970745bae9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.multitenancy.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategy.java
index b411a27b13ae..a97df36022ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.naming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategyTest.java
index 0d0290f3c126..27b3c7c85ff5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/AcmeCorpPhysicalNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.naming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/QualifiedNameParserTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/QualifiedNameParserTests.java
index 164118448d5d..a9e7436e18bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/naming/QualifiedNameParserTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/naming/QualifiedNameParserTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.naming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Category.java
index 09182ec41716..08d2f75a2c5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Customers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Customers.java
index 3f740e3d87cb..135c96bc4abc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Customers.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Customers.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java
index d0cbf45dd5ff..a1ab584c27f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
@@ -94,7 +92,7 @@ public void testManyToManyForeignKeys() {
 
 		boolean ownerFKFound = false;
 		boolean inverseFKFound = false;
-        for (Iterator it = ownerCollectionMapping.getCollectionTable().getForeignKeys().values().iterator(); it.hasNext(); ) {
+		for (Iterator it = ownerCollectionMapping.getCollectionTable().getForeignKeys().values().iterator(); it.hasNext(); ) {
 			final String fkColumnName = ( (ForeignKey) it.next() ).getColumn( 0 ).getName();
 			if ( expectedOwnerFK.equals( fkColumnName ) ) {
 				ownerFKFound = true;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Item.java
index 8b829f8ed040..9b4305d56a19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
@@ -21,73 +19,73 @@
 @Table(name = "ITEMS")
 @SecondaryTable(name="ITEMS_SEC")
 public class Item implements Serializable {
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    @Column(name = "price")
-    private Double price;
-
-    @Column(name = "price", table = "ITEMS_SEC")
-    private Double specialPrice;
-
-    public Item() {
-    }
-
-    public Item(Double price, Double specialPrice) {
-        this.price = price;
-        this.specialPrice = specialPrice;
-    }
-
-    public Item(Long id, Double price, Double specialPrice) {
-        this.id = id;
-        this.price = price;
-        this.specialPrice = specialPrice;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Item item = (Item) o;
-
-        if (id != null ? !id.equals(item.id) : item.id != null) return false;
-        if (price != null ? !price.equals(item.price) : item.price != null) return false;
-        if (specialPrice != null ? !specialPrice.equals(item.specialPrice) : item.specialPrice != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = id != null ? id.hashCode() : 0;
-        result = 31 * result + (price != null ? price.hashCode() : 0);
-        result = 31 * result + (specialPrice != null ? specialPrice.hashCode() : 0);
-        return result;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Double getSpecialPrice() {
-        return specialPrice;
-    }
-
-    public void setSpecialPrice(Double specialPrice) {
-        this.specialPrice = specialPrice;
-    }
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@Column(name = "price")
+	private Double price;
+
+	@Column(name = "price", table = "ITEMS_SEC")
+	private Double specialPrice;
+
+	public Item() {
+	}
+
+	public Item(Double price, Double specialPrice) {
+		this.price = price;
+		this.specialPrice = specialPrice;
+	}
+
+	public Item(Long id, Double price, Double specialPrice) {
+		this.id = id;
+		this.price = price;
+		this.specialPrice = specialPrice;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Item item = (Item) o;
+
+		if (id != null ? !id.equals(item.id) : item.id != null) return false;
+		if (price != null ? !price.equals(item.price) : item.price != null) return false;
+		if (specialPrice != null ? !specialPrice.equals(item.specialPrice) : item.specialPrice != null) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = id != null ? id.hashCode() : 0;
+		result = 31 * result + (price != null ? price.hashCode() : 0);
+		result = 31 * result + (specialPrice != null ? specialPrice.hashCode() : 0);
+		return result;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getSpecialPrice() {
+		return specialPrice;
+	}
+
+	public void setSpecialPrice(Double specialPrice) {
+		this.specialPrice = specialPrice;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/LocalizedEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/LocalizedEmbeddable.java
index 9c90aac915df..0ca242d31191 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/LocalizedEmbeddable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/LocalizedEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java
index 87bb28b74601..bb85c45aa83c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/TestNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/TestNamingStrategy.java
index 42dce45f183c..a14897b2b4f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/TestNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/TestNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Workflow.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Workflow.java
index 5318900316ca..4eae0ecf02d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Workflow.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/Workflow.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java
index 100a63759860..e34c11f10a5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.collectionJoinTableNaming;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Address.java
index 5162051a5932..d15087e234c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseAnnotationBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseAnnotationBindingTests.java
index 97711721a8dc..09ac20292c40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseAnnotationBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseAnnotationBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseHbmBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseHbmBindingTests.java
index c86c9613f595..1bc322743cd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseHbmBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseHbmBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java
index 620e58764394..f6185f9434d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/BaseNamingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Customer.java
index 981e40457651..e12f42e10d23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Industry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Industry.java
index 450a7eca7774..881a699840fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Industry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Industry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java
index 28c42d83e70e..18cdef789884 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java
index 96df2f7a28e3..31a3e5c33b83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Order.java
index 8a588d049051..9ed2c8618e81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/State.java
index 39cc22a15d90..a6c6ba49d594 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/State.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/ZipCode.java
index d04586867355..e529029a2d2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/ZipCode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/ZipCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java
index 318a8a165154..05e725125e26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.components;
 
@@ -216,5 +214,3 @@ public void setName(String name) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java
index 35762aba67a8..8b1266d7cf5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Container.java
index a795d2349872..fb113f617566 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Container.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Item.java
index 086ab2476751..219144b75234 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.components;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Language.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Language.java
index 596347a1af2b..2247b5aa2e52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Language.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Language.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.ejb3joincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/PhysicalNamingStrategyImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/PhysicalNamingStrategyImpl.java
index 578407491d29..fcd70fe594d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/PhysicalNamingStrategyImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/PhysicalNamingStrategyImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.ejb3joincolumn;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java
index 6fc14c1161ae..233c768351cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.ejb3joincolumn;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/DynamicEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/DynamicEntity.java
index a2ca71aa350e..50919ed72c0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/DynamicEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/DynamicEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.synchronizedTables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/SynchronizeTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/SynchronizeTableNamingTest.java
index 79ebb2bb8284..a699520c6d66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/SynchronizeTableNamingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/synchronizedTables/SynchronizeTableNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.namingstrategy.synchronizedTables;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java
index 761b456af707..a45894682591 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nationalized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java
index f0f6f3120170..ae4766befd74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nationalized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java
index bc47be18faf2..6347cb756b78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nationalized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java
index c63e91f8c769..269fb8a57312 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nationalized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java
index c2885073947b..0fa545a08a04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nationalized;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationHbmTest.java
index 5ab3632afeec..b6ad1acf10ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nonpkassociation;
 
@@ -145,4 +143,3 @@ public void setParent(Parent parent) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java
index a36924f50f40..52ae75911067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.nonpkassociation;
 
@@ -155,4 +153,3 @@ public void setParent(Parent parent) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java
index 36305ffe1555..ac2b9f01baa7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
@@ -157,7 +155,7 @@ public void testProxyInSessionEagerNonExistingLazyAssociation(SessionFactoryScop
 						employeeLazy.getId();
 						employeeLazy.getName();
 						fail( "ObjectNotFoundException should have been thrown because Task.employeeLazy.location is not found " +
-									  "and is not mapped with @NotFound(IGNORE)" );
+									"and is not mapped with @NotFound(IGNORE)" );
 					}
 					catch (ObjectNotFoundException expected) {
 					}
@@ -190,7 +188,7 @@ public void testExistingProxyWithNonExistingAssociation(SessionFactoryScope scop
 						session.createQuery( "from Task", Task.class ).getSingleResult();
 					} );
 			fail( "EntityNotFoundException should have been thrown because Task.employee.location is not found " +
-						  "and is not mapped with @NotFound(IGNORE)" );
+						"and is not mapped with @NotFound(IGNORE)" );
 		}
 		catch (EntityNotFoundException expected) {
 		}
@@ -212,7 +210,7 @@ public void testGetEmployeeWithNotExistingAssociation(SessionFactoryScope scope)
 		try {
 			scope.inTransaction( session -> session.get( Employee.class, 1 ) );
 			fail( "EntityNotFoundException should have been thrown because Employee.location is not found " +
-						  "and is not mapped with @NotFound(IGNORE)" );
+						"and is not mapped with @NotFound(IGNORE)" );
 		}
 		catch (EntityNotFoundException expected) {
 		}
@@ -224,7 +222,7 @@ public void testGetEmployeeWithNotExistingAssociation(SessionFactoryScope scope)
 					Employee.class
 			).getSingleResult() );
 			fail( "EntityNotFoundException should have been thrown because Employee.location is not found " +
-						  "and is not mapped with @NotFound(IGNORE)" );
+						"and is not mapped with @NotFound(IGNORE)" );
 		}
 		catch (EntityNotFoundException expected) {
 		}
@@ -288,7 +286,7 @@ public void testEnityWithNotExistingAssociation(SessionFactoryScope scope) {
 						session.createQuery( "from Employee", Employee.class ).getSingleResult();
 					} );
 			fail( "EntityNotFoundException should have been thrown because Task.employee.location is not found " +
-						  "and is not mapped with @NotFound(IGNORE)" );
+						"and is not mapped with @NotFound(IGNORE)" );
 		}
 		catch (EntityNotFoundException expected) {
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java
index 3cd02b655bed..d06a9891bafb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
@@ -11,7 +9,6 @@
 
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
-import org.hibernate.query.SyntaxException;
 import org.hibernate.query.sqm.UnknownPathException;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java
index 07347b5b9b34..238a31e3cad9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import org.hibernate.annotations.NotFound;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/IsNullAndNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/IsNullAndNotFoundTest.java
index baf994f6fe23..641875cf4576 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/IsNullAndNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/IsNullAndNotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java
index 3d9d40430ec0..6c0e8a1a9791 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import org.hibernate.annotations.NotFound;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java
index 207d20654936..dba40a2dddfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java
index ebbf4b817a98..0af07ce73199 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java
index ad3f9fe15ac9..c829cc649f28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java
index e774ee836ad6..652bc5b0b06f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java
index 94e963bb9e62..aa0b81cb6a9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound;
 
@@ -30,8 +28,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * @author Andrea Boriero
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java
index 376eb03f162c..c66bfe27e126 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java
index 9e0d9169db33..0a94ac8227a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java
index e5e5ee4a573b..419e4f884023 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java
index 891e02ff79cd..1b5cf5d0805f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java
index 072d4f7a80b8..8c16bcd1661d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java
index 4bc5cac4f912..8f9514c1f4e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java
index 9746b0bf4627..861b19b2d74c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound.exception;
 
 import java.io.Serializable;
 import java.util.List;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToOne;
@@ -22,7 +19,6 @@
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java
index b1800d3317fd..506868a48ab4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound.exception;
 
@@ -21,7 +19,6 @@
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java
index 1422f404b014..13a5d5213d85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.notfound.exception;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java
index 692bce92cc1a..91c320c61bec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound.ignore;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java
index 98bf25ad0580..b69effbb3a5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound.ignore;
 
@@ -12,7 +10,6 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToOne;
-import jakarta.persistence.Tuple;
 
 import org.hibernate.Hibernate;
 import org.hibernate.ObjectNotFoundException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundManyToOneCountTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundManyToOneCountTest.java
index 4dd2ec56f008..37d1d109b596 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundManyToOneCountTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundManyToOneCountTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.notfound.ignore;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java
index 5924076ea34b..6467f23a071e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 7119 2005-06-12 22:03:30Z oneovthafew $
 package org.hibernate.orm.test.ondelete;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java
index ae0471f54b18..2d577086e46e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 7119 2005-06-12 22:03:30Z oneovthafew $
 package org.hibernate.orm.test.ondelete;
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java
index 68c64ee90f23..d6c79883cb63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondelete;
 
@@ -100,4 +98,3 @@ public void testJoinedSubclass(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java
index bdd493a1c262..90938ae8b1f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 7119 2005-06-12 22:03:30Z oneovthafew $
 package org.hibernate.orm.test.ondelete;
 
 
@@ -38,7 +34,7 @@ public void setCountry(String string) {
 		this.address.country = string;
 	}
 
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java
index d287e7580b58..e83d10d81744 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Salesperson.java 7119 2005-06-12 22:03:30Z oneovthafew $
 package org.hibernate.orm.test.ondelete;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
index 20f04186777d..b0bcb144f776 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.ondelete.toone;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java
index 0c7d6224b86a..2b50a36e7308 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.ondelete.toone;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Child.java
index 4c45879048c0..d6fb8b497f53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondelete.toone.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/GrandChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/GrandChild.java
index 32555f467434..804cd70d8a93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/GrandChild.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/GrandChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondelete.toone.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Parent.java
index 4f722f069a2f..e14dd1b7d951 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondelete.toone.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java
index ea09c0fd0c74..2a096b309725 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondelete.toone.hbm;
 
@@ -81,4 +79,4 @@ public void testManyToOne(SessionFactoryScope scope) {
 		);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java
index c6fbc6084e09..444efca85853 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondemandload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java
index 8d7534d561cf..f07324478830 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.ondemandload;
 
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java
index 5ce3b6112c1a..a7955a7b5a1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondemandload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java
index 90b48a5d75a1..e7693070caca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondemandload;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java
index a423dfb5548b..d446cf515161 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ondemandload.cache;
 
@@ -162,7 +160,7 @@ private boolean isCached(Serializable id, Class entityClass, String attr, Ses
 		Object value = scope.fromSession(
 				session -> {
 					final SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
-                    CollectionPersister persister = sessionFactory.getMappingMetamodel().getCollectionDescriptor( entityClass.getName() + "." + attr);
+					CollectionPersister persister = sessionFactory.getMappingMetamodel().getCollectionDescriptor( entityClass.getName() + "." + attr);
 					CollectionDataAccess cache = persister.getCacheAccessStrategy();
 					Object key = cache.generateCacheKey( id, persister, sessionFactory, session.getTenantIdentifier() );
 					Object cachedValue = cache.get( session, key );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java
index 7fb26303f19e..07abefc15b34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java
index fe434c1024d3..e12fae16d1d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Child.java
index a59b20fe019b..d8451a3b0b66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Child.java 4378 2004-08-19 10:12:11Z oneovthafew $
 package org.hibernate.orm.test.onetomany;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Node.java
index e14a7cdacf12..228ed62b97fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Node.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 import java.io.Serializable;
@@ -25,7 +23,7 @@ public Node(int id, String description) {
 		setDescription( description );
 	}
 
-    public Integer getId() {
+	public Integer getId() {
 		return id;
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java
index aaf035b73ade..1d14f41623a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicatesTest.java
index 537035de41d5..8597ee97e519 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicatesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicatesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java
index 8873e4d7a6f2..9e9acb2c579a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Parent.java
index 07a42a7e0260..47d84435399f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Parent.java 4378 2004-08-19 10:12:11Z oneovthafew $
 package org.hibernate.orm.test.onetomany;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java
index e50bc2e48a73..514305aecbf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java
index 4d48fd805145..839a570229c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
@@ -16,7 +14,7 @@ public class RecursiveBidirectionalOneToManyNoCacheTest extends AbstractRecursiv
 	public String getCacheConcurrencyStrategy() {
 			return null;
 	}
-	
+
 	protected CacheMode getSessionCacheMode() {
 			return CacheMode.IGNORE;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java
index c58aaf326a1c..568b4432d765 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java
index a3b2800aae6c..546f49dd5e02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
index 62679c4e2c28..8db0e1bffffd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetomany;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java
index 6cd0a3142d46..4454d665a04f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetomany;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java
index 8cdb27c9dc88..7c4761872516 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.joined;
 
@@ -15,14 +13,14 @@
 public class Book extends Product {
 
 	private String isbn;
-	
+
 	@ManyToOne
 	private Library library;
-	
+
 	public Book() {
 		super();
 	}
-	
+
 	public Book(String inventoryCode, String isbn) {
 		super(inventoryCode);
 		this.isbn = isbn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java
index 8d5ecd2a7f07..c30ffed3d748 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java
index ee3e41320fd5..926b47d6a3d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java
index e67619d661ab..f082c5e2b487 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.joined;
 
@@ -25,11 +23,11 @@ public abstract class Product {
 
 	@Column(name="INVCODE")
 	private String inventoryCode;
-	
+
 	public Product() {
-		
+
 	}
-	
+
 	public Product(String inventoryCode) {
 		this.inventoryCode = inventoryCode;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java
index c4eb30492b07..51793e24c313 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.perclass;
 
@@ -15,23 +13,23 @@
 public class Book extends Product {
 
 	private String isbn;
-	
+
 	@ManyToOne(targetEntity=Library.class)
 	private Library library;
-	
+
 	public Book() {
 		super();
 	}
-	
+
 	public Book(String inventoryCode, String isbn) {
 		super(inventoryCode);
 		this.isbn = isbn;
 	}
-	
+
 	public String getIsbn() {
 		return isbn;
 	}
-	
+
 	public Library getLibrary() {
 		return library;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java
index d47d495bdf19..4494c2a0f9da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.perclass;
 
@@ -31,11 +29,11 @@ public class Library {
 	@OneToMany(mappedBy="library", cascade = CascadeType.ALL)
 	@MapKey(name="isbn")
 	private Map booksOnIsbn = new HashMap<>();
-	
+
 	public int getEntid() {
 		return entid;
 	}
-	
+
 	public Map getBooksOnInventory() {
 		return booksOnInventory;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java
index 422befdffce3..142b6900657a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.perclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java
index f536db0d32f9..3fb6d90a39e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.perclass;
 
@@ -25,11 +23,11 @@ public abstract class Product {
 
 	@Column(name="INVCODE")
 	private String inventoryCode;
-	
+
 	public Product() {
-		
+
 	}
-	
+
 	public Product(String inventoryCode) {
 		this.inventoryCode = inventoryCode;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java
index 86cfbe226bbc..83eba7a26783 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.single;
 
@@ -14,23 +12,23 @@
 public class Book extends Product {
 
 	private String isbn;
-	
+
 	@ManyToOne
 	private Library library;
-	
+
 	public Book() {
 		super();
 	}
-	
+
 	public Book(String inventoryCode, String isbn) {
 		super(inventoryCode);
 		this.isbn = isbn;
 	}
-	
+
 	public String getIsbn() {
 		return isbn;
 	}
-	
+
 	public Library getLibrary() {
 		return library;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java
index 4118cb9d6353..1c280e3c8a11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.single;
 
@@ -36,7 +34,7 @@ public class Library {
 	public int getEntid() {
 		return entid;
 	}
-	
+
 	public Map getBooksOnInventory() {
 		return booksOnInventory;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java
index a7ae37cd9465..a1f08819a6ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.single;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java
index 45103f796a8e..ce687484cd48 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetomany.inheritance.single;
 
@@ -25,19 +23,19 @@ public abstract class Product {
 
 	@Column(name="INVCODE")
 	private String inventoryCode;
-	
+
 	public Product() {
-		
+
 	}
-	
+
 	public Product(String inventoryCode) {
 		this.inventoryCode = inventoryCode;
 	}
-	
+
 	public int getEntid() {
 		return entid;
 	}
-	
+
 	public String getInventoryCode() {
 		return inventoryCode;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java
index 3c3e67e06617..87e4ef60c639 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/OneToOneSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/OneToOneSchemaTest.java
index 4539fba88890..1bbfe91c4bf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/OneToOneSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/OneToOneSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.basic;
 
@@ -36,7 +34,7 @@ public void testUniqueKeyNotGeneratedViaAnnotations() {
 
 			Table childTable = metadata.getDatabase().getDefaultNamespace().locateTable( Identifier.toIdentifier(
 					"CHILD" ) );
-            assertFalse( childTable.getUniqueKeys().values().iterator().hasNext(), "UniqueKey was generated when it should not" );
+			assertFalse( childTable.getUniqueKeys().values().iterator().hasNext(), "UniqueKey was generated when it should not" );
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( ssr );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java
index 450e65f15fb6..cec9fbb96c67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java
index 68e66b1cde6a..ea390834e2a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneCascadeRemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneCascadeRemoveTest.java
index 6ce016d6b2ab..c4158f7e9e62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneCascadeRemoveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneCascadeRemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
@@ -118,4 +116,4 @@ public B(String id, String name, int value, A a1) {
 			this.a1 = a1;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneEagerFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneEagerFKTest.java
index a38cdfc3e430..8b5e6e431525 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneEagerFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneEagerFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneLazyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneLazyFKTest.java
index 1b589f682b78..f5d5cd00767c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneLazyFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneLazyFKTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesTest.java
index fb46bfa2c2ed..dd5584d1210d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesUnownedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesUnownedAssociationTest.java
index 54879481531f..665acb4bc443 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesUnownedAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BidirectionalOneToOneWithIdClassesUnownedAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Details.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Details.java
index af7824246e65..229e04a9a95f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Details.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Details.java
@@ -1,39 +1,37 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
 import java.io.Serializable;
 
 public abstract class Details implements Serializable {
-    private int id;
-    private String data;
-    private Person person;
+	private int id;
+	private String data;
+	private Person person;
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public String getData() {
-        return data;
-    }
+	public String getData() {
+		return data;
+	}
 
-    public void setData(String data) {
-        this.data = data;
-    }
+	public void setData(String data) {
+		this.data = data;
+	}
 
-    public Person getPerson() {
-        return person;
-    }
+	public Person getPerson() {
+		return person;
+	}
 
-    protected void setPerson(Person person) {
-        this.person = person;
-    }
+	protected void setPerson(Person person) {
+		this.person = person;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByFK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByFK.java
index e8eff1c702da..d2fdd9ed9805 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByFK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByFK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByRef.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByRef.java
index 8c593c0c35f9..e9ff3fc6bafe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByRef.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/DetailsByRef.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/MainObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/MainObject.java
index 3a8918efba65..89f2d5bdabed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/MainObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/MainObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Object2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Object2.java
index 245f5ec93690..01c9f351533a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Object2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Object2.java
@@ -1,16 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
 
 /**
- * 
+ *
  * @author Wolfgang Voelkl
- * 
+ *
  */
 public class Object2 {
 	private Long id;
@@ -24,7 +22,7 @@ public Long getId() {
 	public void setId(Long l) {
 		this.id = l;
 	}
-	
+
 	public String getDummy() {
 		return dummy;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java
index 334073c89bbb..322d6f98570e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetoone.cache;
 
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java
index cc762cf25213..5354f5f5f928 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetoone.cache;
 
 import java.lang.reflect.Constructor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneConstrainedCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneConstrainedCacheTest.java
index 9638a92a726d..f5f12158edcc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneConstrainedCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneConstrainedCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Person.java
index 6e0975162239..36409199406e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/Person.java
@@ -1,44 +1,42 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
 import java.io.Serializable;
 
 public abstract class Person implements Serializable {
-    private int id;
-    private String name;
-    private Details details;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    
-    public Details getDetails() {
-        return details;
-    }
-
-    public void setDetails(Details details) {
-        if (details != null) {
-            details.setPerson(this);
-        }
-
-        this.details = details;
-    }
-
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
+	private int id;
+	private String name;
+	private Details details;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public Details getDetails() {
+		return details;
+	}
+
+	public void setDetails(Details details) {
+		if (details != null) {
+			details.setPerson(this);
+		}
+
+		this.details = details;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByFK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByFK.java
index 7ac2e0108f98..7addf3aa3ebb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByFK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByFK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByRef.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByRef.java
index 5a84956249cf..c992cb806da3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByRef.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/PersonByRef.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.cache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java
index 417ba430895f..c396923a32a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetoone.embeddedid;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java
index 699a80318d2c..d4f50fd712b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.onetoone.embeddedid;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java
index c8bdba347e14..a874d2cc2b02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.flush;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java
index 8104fa3ea4ab..8f1266ca4884 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.formula;
 import java.io.Serializable;
 
@@ -18,7 +14,7 @@ public class Address implements Serializable {
 	private String street;
 	private String state;
 	private String zip;
-	
+
 	public Person getPerson() {
 		return person;
 	}
@@ -49,14 +45,14 @@ public String getZip() {
 	public void setZip(String zip) {
 		this.zip = zip;
 	}
-	
+
 	public boolean equals(Object that) {
 		if ( !(that instanceof Address) ) return false;
 		Address address = (Address) that;
-		return address.getType().equals(type) && 
+		return address.getType().equals(type) &&
 			address.getPerson().getName().equals( person.getName() );
 	}
-	
+
 	public int hashCode() {
 		return person.getName().hashCode() + type.hashCode();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java
index 30b333802c1d..3fafca33cf36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.formula;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java
index 23df5b85ea0e..10b43aea54da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.formula;
 import java.io.Serializable;
 
@@ -16,7 +12,7 @@ public class Person implements Serializable {
 	private String name;
 	private Address address;
 	private Address mailingAddress;
-	
+
 	public Address getAddress() {
 		return address;
 	}
@@ -41,7 +37,7 @@ public boolean equals(Object that) {
 		Person person = (Person) that;
 		return person.getName().equals(name);
 	}
-	
+
 	public int hashCode() {
 		return name.hashCode();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java
index 83440d52c0db..6670d26ae673 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 9914 2006-05-09 09:37:18Z max.andersen@jboss.com $
 package org.hibernate.orm.test.onetoone.joined;
 
 
@@ -17,7 +13,7 @@ public class Address {
 	public String street;
 	public String state;
 	public String zip;
-	
+
 	public String toString() {
 		return this.getClass() + ":" + street;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java
index 91e6a420bfd1..8fe38eacd0f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Entity.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java
index c133fa677415..4c070d7f9709 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java
index d1aa9396f3cf..6a4ebbf854f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Org.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java
index 048802f66163..e3a14ded7d52 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java
index 0246a3feec24..f664a1b557fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java
index afcd2e7e5086..d8010400d579 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java
index b31dd039cf11..bcabe6626edf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java
index cf20a61e3999..325343cc3075 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java
index 2be9931d7c6a..2a294a1d20f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.jointable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java
index cc00105afc23..40e36a568158 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.lazy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java
index d628b02e4448..473f94086387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.link;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java
index e7d75506e69b..a362eb81dc28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.link;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java
index c4e7bb3c7e0e..ee62b39efc87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.link;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java
index ad2ef4f92ece..e95d56c7cf98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.link;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java
index d7a369f7f2c3..8678e4fcc823 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DynamicMapOneToOneTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.onetoone.nopojo;
 
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Address.java
index ac7a1d03ea09..6ccda30fdb5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java
index ad3cf96dc241..bda7751bd964 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Entity.java
index 870dff9b068a..5fb3cda6bb75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java
index 0c344d896a20..655c8eafc6aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Org.java
index 71c01bc4af01..818c7c379a18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Org.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Org.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Person.java
index 88a8e4e02c53..0c2c255513ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.optional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/polymorphism/BidirectionalOneToOnePolymorphismTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/polymorphism/BidirectionalOneToOnePolymorphismTest.java
index e7bf6d5cc401..795c8bb10cc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/polymorphism/BidirectionalOneToOnePolymorphismTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/polymorphism/BidirectionalOneToOnePolymorphismTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.polymorphism;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java
index d3071fff91e1..8fa11a882101 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.singletable;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java
index 0f0a4589c938..39425aab2d42 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.singletable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java
index aeb7b34b6664..b7e726ef4831 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Entity.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.singletable;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java
index d5108731feca..49be8f81aec6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Org.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.singletable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java
index 76cf9c0b93ca..9fc6b03a36c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.onetoone.singletable;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java
index 09e5e5ef2b43..b32ee15284b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.onetoone.singletable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/AbstractOperationTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/AbstractOperationTestCase.java
index b2874605467d..caed93a4f305 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/AbstractOperationTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/AbstractOperationTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Address.java
index 24827c15e8c4..044e4d439072 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Category.java
index b814474d0cdc..e03208025bbf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competition.java
index 67337ba51b1c..f5507e38e7aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competition.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.ops;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competitor.java
index 343ff08173a0..597ec6138926 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competitor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Competitor.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.ops;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java
index dc163b265de8..168f06ff8d71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -242,4 +240,3 @@ public void testBasic(SessionFactoryScope scope) throws Exception {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CustomEntityCopyObserver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CustomEntityCopyObserver.java
index 823378d445cb..b6ee63fc1d9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CustomEntityCopyObserver.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CustomEntityCopyObserver.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.ops;
 
 import org.hibernate.event.spi.EntityCopyObserver;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java
index e152f9d29035..6c161b7a6c2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employee.java
index b2d53982bfad..0205f50570bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.ops;
 import java.io.Serializable;
 import java.util.Collection;
@@ -13,7 +9,7 @@
 
 /**
  * Employee in an Employer-Employee relationship
- * 
+ *
  * @author Emmanuel Bernard
  */
 
@@ -29,12 +25,12 @@ public Integer getId() {
 	public void setId(Integer integer) {
 		id = integer;
 	}
-	
-	
+
+
 	public Collection getEmployers() {
 		return employers;
 	}
-	
+
 	public void setEmployers(Collection employers) {
 		this.employers = employers;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employer.java
index b21cc73b8c21..2e062277c6ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Employer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employer.java 8670 2005-11-25 17:36:29Z epbernard $
 package org.hibernate.orm.test.ops;
 import java.io.Serializable;
 import java.util.Collection;
@@ -13,7 +9,7 @@
 
 /**
  * Employer in a employer-Employee relationship
- * 
+ *
  * @author Emmanuel Bernard
  */
 
@@ -34,12 +30,12 @@ public void setVers(Integer vers) {
 	public Collection getEmployees() {
 		return employees;
 	}
-	
-	
+
+
 	public Integer getId() {
 		return id;
 	}
-	
+
 	public void setEmployees(Collection set) {
 		employees = set;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java
index 41c45085ce4b..913fd2530c37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java
index 180a9fd29fbd..6d471ccdea4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -138,4 +136,3 @@ private void assertFetchCount(int count, SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/HANANoColumnInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/HANANoColumnInsertTest.java
index 68fe8f827f77..455a24dbf8bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/HANANoColumnInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/HANANoColumnInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Hoarder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Hoarder.java
index 182ce97b7779..fba05569a0a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Hoarder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Hoarder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Item.java
index 632d4e18b2d3..ca6868186749 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
index cb49e2e274b4..a04ebb734831 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.ops;
 
 import jakarta.persistence.Entity;
@@ -11,61 +15,61 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @Jpa(annotatedClasses = {MergeExplicitInitialVersionTest.E.class,
-        MergeExplicitInitialVersionTest.F.class,
-        MergeExplicitInitialVersionTest.G.class})
+		MergeExplicitInitialVersionTest.F.class,
+		MergeExplicitInitialVersionTest.G.class})
 public class MergeExplicitInitialVersionTest {
-    @Test public void testGeneratedId(EntityManagerFactoryScope scope) {
-        E e = new E();
-        scope.inTransaction(s->s.persist(e));
-        assertEquals(e.version, 1);
-        e.text = "hello";
-        E e2 = scope.fromTransaction(s->s.merge(e));
-        assertEquals(e2.version, 2);
-    }
-    @Test public void testAssignedId(EntityManagerFactoryScope scope) {
-        F f = new F();
-        scope.inTransaction(s->s.persist(f));
-        assertEquals(f.version, 1);
-        f.text = "hello";
-        F f2 = scope.fromTransaction(s->s.merge(f));
-        assertEquals(f2.version, 2);
-    }
-    @Test public void testNegativeVersion(EntityManagerFactoryScope scope) {
-        G g = new G();
-        scope.inTransaction(s->s.persist(g));
-        assertEquals(g.version, 0);
-        g.text = "hello";
-        G g2 = scope.fromTransaction(s->s.merge(g));
-        assertEquals(g2.version, 1);
-    }
+	@Test public void testGeneratedId(EntityManagerFactoryScope scope) {
+		E e = new E();
+		scope.inTransaction(s->s.persist(e));
+		assertEquals(e.version, 1);
+		e.text = "hello";
+		E e2 = scope.fromTransaction(s->s.merge(e));
+		assertEquals(e2.version, 2);
+	}
+	@Test public void testAssignedId(EntityManagerFactoryScope scope) {
+		F f = new F();
+		scope.inTransaction(s->s.persist(f));
+		assertEquals(f.version, 1);
+		f.text = "hello";
+		F f2 = scope.fromTransaction(s->s.merge(f));
+		assertEquals(f2.version, 2);
+	}
+	@Test public void testNegativeVersion(EntityManagerFactoryScope scope) {
+		G g = new G();
+		scope.inTransaction(s->s.persist(g));
+		assertEquals(g.version, 0);
+		g.text = "hello";
+		G g2 = scope.fromTransaction(s->s.merge(g));
+		assertEquals(g2.version, 1);
+	}
 
-    @Entity
-    static class E {
-        @Id
-        @GeneratedValue
-        long id;
-        @Version
-        int version = 1;
-        String text;
-    }
+	@Entity
+	static class E {
+		@Id
+		@GeneratedValue
+		long id;
+		@Version
+		int version = 1;
+		String text;
+	}
 
-    @Entity
-    static class F {
-        @Id
-        long id = 5;
-        @Version
-        int version = 1;
-        String text;
-    }
+	@Entity
+	static class F {
+		@Id
+		long id = 5;
+		@Version
+		int version = 1;
+		String text;
+	}
 
-    @Entity
-    static class G {
-        @Id
-        @GeneratedValue
-        long id;
-        @Version
-        int version = -1;
-        String text;
-    }
+	@Entity
+	static class G {
+		@Id
+		@GeneratedValue
+		long id;
+		@Version
+		int version = -1;
+		String text;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java
index 5ee11fa234f4..6e917e0d6d49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java
index 59ea76b2152d..cc92b1e4962d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java
index 0500eef464ed..588bb6405e6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java
index 7faee0bdc018..c4aca8f497aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java
index 7fac3cf60b16..022211a8811d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
index 6da2cd6c88f3..17676fc45885 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java
index 0005e5660605..4cc1f3a9e5c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
index bd9fac743b0a..61e410e75756 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -853,4 +851,3 @@ public void cleanup(SessionFactoryScope scope) {
 
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
index 1f72c655e3c0..5e90ffc51795 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Node.java 10759 2006-11-08 00:00:53Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.ops;
 
 import java.sql.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java
index a5d5e65ef7df..5c3c847db469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: NumberedNode.java 7236 2005-06-20 03:19:34Z oneovthafew $
 package org.hibernate.orm.test.ops;
 import java.util.Date;
 import java.util.HashSet;
@@ -15,7 +11,7 @@
  * @author Gavin King
  */
 public class NumberedNode {
-	
+
 	private long id;
 	private String name;
 	private NumberedNode parent;
@@ -38,7 +34,7 @@ public long getId() {
 	public void setId(long id) {
 		this.id = id;
 	}
-	
+
 	public Set getChildren() {
 		return children;
 	}
@@ -57,13 +53,13 @@ public NumberedNode getParent() {
 	public void setParent(NumberedNode parent) {
 		this.parent = parent;
 	}
-	
+
 	public NumberedNode addChild(NumberedNode child) {
 		children.add(child);
 		child.setParent(this);
 		return this;
 	}
-	
+
 	public String getDescription() {
 		return description;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java
index 53d99dbf542e..bbc7b6c2ddbd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java
index 7a04db2f954d..820a003829c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -27,8 +25,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderColumn;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java
index fa7018632942..7f544273ddec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java
index b0b4a24703c5..5d9a0c9b33ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -35,4 +33,3 @@ public void test(SessionFactoryScope scope) throws Exception {
 		} );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Person.java
index 782f1f6b2ac0..68a789ccad46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/PersonalDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/PersonalDetails.java
index af9266d94434..f6b996dceacb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/PersonalDetails.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/PersonalDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java
index 2417c1992c6d..3e19128c8ac3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -13,7 +11,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
-import org.hibernate.Session;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleEntity.java
index 56d682e4d61a..a60d2830eef1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java
index 039e5e33cb5a..a2f108ff006f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
@@ -107,4 +105,3 @@ public void testBasicOperations(SessionFactoryScope scope) {
 		assertDeleteCount( 1, scope );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubCategory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubCategory.java
index 5b39f1bdfacd..936db648fe0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubCategory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubCategory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubItem.java
index fc849f65a79a..f937d7736044 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SubItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/TimestampedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/TimestampedEntity.java
index 24ea1805ca22..be0ad529a9e4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/TimestampedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/TimestampedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 import java.util.Date;
@@ -49,4 +47,3 @@ public void setTimestamp(Date timestamp) {
 		this.timestamp = timestamp;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/VersionedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/VersionedEntity.java
index 33978552bb05..6c5b76c04e2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/VersionedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/VersionedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java
index 4acefb2149c3..4fd81224e554 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops.genericApi;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/multiload/MultiLoadEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/multiload/MultiLoadEntityGraphTest.java
index 4f28af8ef8de..5fa575486cd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/multiload/MultiLoadEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/multiload/MultiLoadEntityGraphTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops.multiload;
 
@@ -249,4 +247,4 @@ public int getId() {
 			return id;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java
index 37187f1bc350..401e02ad45a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ops.replicate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java
index e2019fc10c09..22fbdb776bd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Document.java 7552 2005-07-19 18:51:24Z oneovthafew $
 package org.hibernate.orm.test.optlock;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
index 185b2e1518fa..3288dee2b5de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.optlock;
 
@@ -202,4 +200,3 @@ else if ( !( cause instanceof StaleObjectStateException ) && !( cause instanceof
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java
index be59b76e9cc4..510cbc4fb9c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.optlock;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java
index 221a77150d7c..1a053aa30600 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.optlock;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java
index 8a705282cf3a..7c06073dfd67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java
@@ -1,24 +1,20 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: PublicationDate.java 7556 2005-07-19 23:22:27Z oneovthafew $
 package org.hibernate.orm.test.optlock;
 
 
 public class PublicationDate {
 	private int year;
 	private Integer month;
-	
+
 	public PublicationDate(int year) {
 		this.year = year;
 	}
-	
+
 	PublicationDate() {}
-	
+
 	public Integer getMonth() {
 		return month;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
index 904968e33acd..a27174289aa5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orderby;
 
 import org.hibernate.dialect.H2Dialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
index 411f29938e50..f11c858fb3e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orderby;
 
 import org.hibernate.dialect.H2Dialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByExpressionNotInSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByExpressionNotInSelectTest.java
index 5ffd94bae6e9..d0d6d53edf4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByExpressionNotInSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByExpressionNotInSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orderby;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java
index 921c00241f76..81a63d7296cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orderby;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java
index 38eac1f57982..0093d1563922 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orderby;
 
 import java.util.ArrayList;
@@ -8,7 +12,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java
index 074c1e9e072e..6625e715f387 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java
index fa6dc2e6f8bb..b692e794eb35 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Search.java 7772 2005-08-05 23:03:46Z oneovthafew $
 package org.hibernate.orm.test.ordered;
 import java.util.HashSet;
 import java.util.Set;
@@ -13,13 +9,13 @@
 public class Search {
 	private String searchString;
 	private Set searchResults = new HashSet();
-	
+
 	Search() {}
-	
+
 	public Search(String string) {
 		searchString = string;
 	}
-	
+
 	public Set getSearchResults() {
 		return searchResults;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java
index 38b464dce9f6..08a5c15cf87a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ordered;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdateNestedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdateNestedEmbeddedIdTest.java
index 4da9bd06bb82..44d536e2703b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdateNestedEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdateNestedEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orderupdates;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
index af99fe89c47a..4bc2b5b0704a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orderupdates;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Mail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Mail.java
index f1ba88c914e9..e0419c2d15b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Mail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Mail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java
index d318e57a144e..8913571c84f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan;
 
 import org.hibernate.Hibernate;
 import org.hibernate.LockMode;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.util.SerializationHelper;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java
index ae2558e2a350..2f7b0f1eda78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Part.java 5725 2005-02-14 12:10:15Z oneovthafew $
 package org.hibernate.orm.test.orphan;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java
index 0ac77069d9ee..e9ac3f167a46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Product.java 5725 2005-02-14 12:10:15Z oneovthafew $
 package org.hibernate.orm.test.orphan;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java
index 73361b569f41..98d79eb549c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/User.java
index e01d60efdaa3..3132cb0ebc8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/User.java
@@ -1,16 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * User.java
- *
- * Created on May 3, 2005, 9:42 AM
- */
-
 package org.hibernate.orm.test.orphan;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java
index 60519f9d82d6..754aa18ad293 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orphan.elementcollection;
 
 import java.util.Collections;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java
index 46c01161e2a7..1305e5600a63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orphan.elementcollection;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrolledClassSeat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrolledClassSeat.java
index 3951ba737ea4..e72cb6996e53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrolledClassSeat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrolledClassSeat.java
@@ -1,10 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orphan.elementcollection;
 
 public class EnrolledClassSeat {
 	private String id;
 	private int row;
 	private int column;
-	
+
 	public String getId() {
 		return id;
 	}
@@ -16,15 +20,15 @@ public void setId(String id) {
 	public int getRow() {
 		return row;
 	}
-	
+
 	public void setRow(int row) {
 		this.row = row;
 	}
-	
+
 	public int getColumn() {
 		return column;
 	}
-	
+
 	public void setColumn(int column) {
 		this.column = column;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/Student.java
index 51ee92f5e2b1..c414602d1f7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/Student.java
@@ -1,9 +1,13 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orphan.elementcollection;
 
 import java.util.Set;
 
 public class Student {
-	
+
 	private String id;
 	private String firstName;
 	private String lastName;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/StudentEnrolledClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/StudentEnrolledClass.java
index 264b6ffd63f1..8fc26d285b58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/StudentEnrolledClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/StudentEnrolledClass.java
@@ -1,22 +1,26 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.orphan.elementcollection;
 
 public class StudentEnrolledClass {
 	private EnrollableClass enrolledClass;
 	private int classStartTime;
 	private EnrolledClassSeat seat;
-	
+
 	public EnrollableClass getEnrolledClass() {
 		return enrolledClass;
 	}
-	
+
 	public void setEnrolledClass(EnrollableClass enrolledClass) {
 		this.enrolledClass = enrolledClass;
 	}
-	
+
 	public int getClassStartTime() {
 		return classStartTime;
 	}
-	
+
 	public void setClassStartTime(int classStartTime) {
 		this.classStartTime = classStartTime;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/Group.java
index 37ef98ef55f6..8a29ba056bbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/Group.java
@@ -1,60 +1,58 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.orphan.manytomany;
-
-import java.io.Serializable;
-
-public class Group implements Serializable {
-
-	private String org;
-	
-	private String name;
-	
-	private String description;
-	
-	private Integer groupType;
-
-	public Group(String name, String org) {
-		this.org = org;
-		this.name = name;
-	}
-
-	public Group() {
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getOrg() {
-		return org;
-	}
-
-	public void setOrg(String org) {
-		this.org = org;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Integer getGroupType() {
-		return groupType;
-	}
-
-	public void setGroupType(Integer groupType) {
-		this.groupType = groupType;
-	}
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.orphan.manytomany;
+
+import java.io.Serializable;
+
+public class Group implements Serializable {
+
+	private String org;
+
+	private String name;
+
+	private String description;
+
+	private Integer groupType;
+
+	public Group(String name, String org) {
+		this.org = org;
+		this.name = name;
+	}
+
+	public Group() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrg() {
+		return org;
+	}
+
+	public void setOrg(String org) {
+		this.org = org;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Integer getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java
index 7c946f552aca..761ab249b710 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/User.java
index 06b061421cf8..58dc39f28b80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/User.java
@@ -1,53 +1,51 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.orphan.manytomany;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-public class User implements Serializable {
-
-	private String org;
-
-	private String name;
-
-	private Map groups = new HashMap();
-
-	public User(String name, String org) {
-		this.org = org;
-		this.name = name;
-	}
-
-	public User() {
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getOrg() {
-		return org;
-	}
-
-	public void setOrg(String org) {
-		this.org = org;
-	}
-
-	public Map getGroups() {
-		return groups;
-	}
-
-	public void setGroups(Map groups) {
-		this.groups = groups;
-	}
-
-}
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.orphan.manytomany;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class User implements Serializable {
+
+	private String org;
+
+	private String name;
+
+	private Map groups = new HashMap();
+
+	public User(String name, String org) {
+		this.org = org;
+		this.name = name;
+	}
+
+	public User() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrg() {
+		return org;
+	}
+
+	public void setOrg(String org) {
+		this.org = org;
+	}
+
+	public Map getGroups() {
+		return groups;
+	}
+
+	public void setGroups(Map groups) {
+		this.groups = groups;
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java
index 0e376ecf6542..7cc783f101b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java
index 6dad6e2c95f2..cda939a1d0f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java
index ad3f26c7c871..6013d2a89927 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java
index 14a364cc3de6..63c0bada6c18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java
index 46265f0e1a57..25faee7ad351 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java
index 88a948c2e9e5..de0b462e00f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/Employee.java
index 54798e4517dd..ad18f0017c03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java
index b7cbfcfe6f08..6d6a8db30b93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
index a24413a7b38d..5b40cb38a3bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java
index 5bac9d9e643f..c057f0a172d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
@@ -15,27 +13,27 @@
 
 @Entity
 public class Preisregelung {
-    @Id
+	@Id
 	@GeneratedValue
-    private Long id;
+	private Long id;
 
-    @OneToOne(mappedBy = "preisregelung", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
-    private Tranchenmodell tranchenmodell;
+	@OneToOne(mappedBy = "preisregelung", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
+	private Tranchenmodell tranchenmodell;
 
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java
index 843225bd9b2b..cbb30be947a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
@@ -11,31 +9,31 @@
 @Entity
 public class Tranche {
 
-    @Id
+	@Id
 	@GeneratedValue
 	private Long id;
 
-    @ManyToOne(optional = false, fetch = FetchType.EAGER)
-    private Tranchenmodell tranchenmodell;
+	@ManyToOne(optional = false, fetch = FetchType.EAGER)
+	private Tranchenmodell tranchenmodell;
 
 	@OneToOne(mappedBy = "tranche", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
 	private Y y;
 
 	public Long getId() {
-        return id;
-    }
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 
 	public Y getY() {
 		return y;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java
index b8f5d1327743..e501b50101a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
@@ -13,39 +11,39 @@
 @Entity
 public class Tranchenmodell {
 
-    @Id
+	@Id
 	@GeneratedValue
 	private Long id;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
 	@OrderColumn
-    private List tranchen = new ArrayList();
+	private List tranchen = new ArrayList();
 
-    @OneToOne(optional = true, fetch = FetchType.LAZY)
-    private Preisregelung preisregelung;
+	@OneToOne(optional = true, fetch = FetchType.LAZY)
+	private Preisregelung preisregelung;
 
 	@OneToOne(mappedBy = "tranchenmodell", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
 	private X x;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public List getTranchen() {
-        return tranchen;
-    }
+	public List getTranchen() {
+		return tranchen;
+	}
 
-    public Preisregelung getPreisregelung() {
-        return preisregelung;
-    }
+	public Preisregelung getPreisregelung() {
+		return preisregelung;
+	}
 
-    public void setPreisregelung(Preisregelung preisregelung) {
-        this.preisregelung = preisregelung;
-    }
+	public void setPreisregelung(Preisregelung preisregelung) {
+		this.preisregelung = preisregelung;
+	}
 
 	public X getX() {
 		return x;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java
index 23bc906db456..ac02345e5110 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java
index cbd09a9110f3..b44177304cd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java
index ca4b2257ffb8..a9f63805d906 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/Employee.java
index 3245869bb167..3d01f8fe1b17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.composite;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/EmployeeInfo.java
index 81a64ff72ef3..29a24131416c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.composite;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java
index a01d4bd646cf..1390fc770e45 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/Employee.java
index f84bc57b308e..3c8cca9e2766 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java
index 409f3c7da325..b900167cd970 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
index 898689b35a38..12ad5307788c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java
index 4a9084b4da06..446f9aa516ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade;
 
@@ -15,25 +13,25 @@
 @Entity
 public class Preisregelung {
 
-    private Long id;
+	private Long id;
 
-    private Tranchenmodell tranchenmodell;
+	private Tranchenmodell tranchenmodell;
 
-    @Id
-    public Long getId() {
-        return id;
-    }
+	@Id
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java
index 32da35e398e2..5b4e31ffc9cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade;
 
@@ -14,26 +12,26 @@
 @Entity
 public class Tranche {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @ManyToOne(optional = false, fetch = FetchType.EAGER)
-    private Tranchenmodell tranchenmodell;
+	@ManyToOne(optional = false, fetch = FetchType.EAGER)
+	private Tranchenmodell tranchenmodell;
 
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    public Tranchenmodell getTranchenmodell() {
-        return tranchenmodell;
-    }
+	public Tranchenmodell getTranchenmodell() {
+		return tranchenmodell;
+	}
 
-    public void setTranchenmodell(Tranchenmodell tranchenmodell) {
-        this.tranchenmodell = tranchenmodell;
-    }
+	public void setTranchenmodell(Tranchenmodell tranchenmodell) {
+		this.tranchenmodell = tranchenmodell;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java
index de54ccd1bf10..93ccf7258c8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade;
 
@@ -19,40 +17,40 @@
 public class Tranchenmodell {
 
 
-    private Long id;
+	private Long id;
 
-    private List tranchen = new ArrayList();
+	private List tranchen = new ArrayList();
 
 
-    private Preisregelung preisregelung;
+	private Preisregelung preisregelung;
 
 
-    @Id
-    public Long getId() {
-        return id;
-    }
+	@Id
+	public Long getId() {
+		return id;
+	}
 
 	public void setId(Long id) {
 		this.id = id;
 	}
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
-    public List getTranchen() {
-        return tranchen;
-    }
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "tranchenmodell", fetch = FetchType.LAZY, orphanRemoval = true)
+	public List getTranchen() {
+		return tranchen;
+	}
 
-    public void setTranchen(List tranchen) {
-        this.tranchen = tranchen;
-    }
+	public void setTranchen(List tranchen) {
+		this.tranchen = tranchen;
+	}
 
-    @OneToOne(mappedBy="tranchenmodell", optional = true, fetch = FetchType.LAZY)
-    public Preisregelung getPreisregelung() {
-        return preisregelung;
-    }
+	@OneToOne(mappedBy="tranchenmodell", optional = true, fetch = FetchType.LAZY)
+	public Preisregelung getPreisregelung() {
+		return preisregelung;
+	}
 
-    public void setPreisregelung(Preisregelung preisregelung) {
-        this.preisregelung = preisregelung;
-    }
+	public void setPreisregelung(Preisregelung preisregelung) {
+		this.preisregelung = preisregelung;
+	}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
index ff4e29ec6076..adc2dc95a2cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/Employee.java
index f18a03ce053e..d044cd3f5345 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java
index ac4f56f29b7d..5f88d8eb0618 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.fk.reversed.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java
index b51e6fe8aedf..e2c8a2b64571 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/Employee.java
index 8e37c9af533a..9202963cd657 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java
index 7178cb5c255a..aeaf74ce3234 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java
index 8cac3c6a0c97..021187517c02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/Employee.java
index b694f284a46a..0ca354989067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java
index 7ecc02e27fdf..c5e81f8f9b1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.one2one.pk.unidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java
index b03f7ac2b030..fecda1838669 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.onetomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java
index c43999ac48d6..c7a7b5a12d84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.onetomany;
 
@@ -52,4 +50,3 @@ public void setProduct(Product product) {
 		this.product = product;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java
index d229eb191aa3..a730373c2110 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.orphan.onetomany;
 
@@ -49,4 +47,3 @@ public void setFeatures(List features) {
 		this.features = features;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataMetaPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataMetaPoint.java
index 816da754f2f6..5bed336b41d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataMetaPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataMetaPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataPoint.java
index 4141c6f9e6fe..7ab646352e63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DataPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java
index da9ba7164748..b38492d84c76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
@@ -24,7 +22,7 @@
 /**
  * HHH-5715 bug test case: Duplicated entries when using select distinct with join and pagination. The bug has to do
  * with new {@link SQLServerDialect} that uses row_number function for pagination
- * 
+ *
  * @author Valotasios Yoryos
  */
 @JiraKey( value = "HHH-5715" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Entry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Entry.java
index 083f4d1219fe..22f5249f70c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Entry.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Entry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java
index be81951d4546..b299712295fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
@@ -36,52 +34,52 @@
 @ServiceRegistry
 @SessionFactory
 public class FetchClausePaginationTest {
-    @BeforeEach
-    public void createTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    final EntityOfLists entityContainingLists = new EntityOfLists( 1, "first" );
+	@BeforeEach
+	public void createTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					final EntityOfLists entityContainingLists = new EntityOfLists( 1, "first" );
 
-                    entityContainingLists.addBasic( "abc" );
-                    entityContainingLists.addBasic( "def" );
-                    entityContainingLists.addBasic( "ghi" );
+					entityContainingLists.addBasic( "abc" );
+					entityContainingLists.addBasic( "def" );
+					entityContainingLists.addBasic( "ghi" );
 
-                    entityContainingLists.addConvertedEnum( EnumValue.TWO );
+					entityContainingLists.addConvertedEnum( EnumValue.TWO );
 
-                    entityContainingLists.addEnum( EnumValue.ONE );
-                    entityContainingLists.addEnum( EnumValue.THREE );
+					entityContainingLists.addEnum( EnumValue.ONE );
+					entityContainingLists.addEnum( EnumValue.THREE );
 
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a1", "first-another-a1" ) );
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) );
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a1", "first-another-a1" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) );
 
-                    session.persist( entityContainingLists );
-                }
-        );
-    }
+					session.persist( entityContainingLists );
+				}
+		);
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.createQuery( "delete from EntityOfLists" ).executeUpdate();
-                    session.createQuery( "delete from SimpleEntity" ).executeUpdate();
-                }
-        );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "delete from EntityOfLists" ).executeUpdate();
+					session.createQuery( "delete from SimpleEntity" ).executeUpdate();
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsWithTies.class)
-    @SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby only supports row_number, but this requires the dense_rank window function")
-    public void testFetchWithTies(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "select comp from EntityOfLists e join e.listOfComponents comp order by comp.anotherAttribute desc fetch first 1 row with ties",
-                            SimpleComponent.class
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsWithTies.class)
+	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby only supports row_number, but this requires the dense_rank window function")
+	public void testFetchWithTies(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"select comp from EntityOfLists e join e.listOfComponents comp order by comp.anotherAttribute desc fetch first 1 row with ties",
+							SimpleComponent.class
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java
index 9cc0bff20abe..74390f4532b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.pagination;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java
index a668b06d4788..49cd77255363 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.pagination;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
index 26a5b9655d96..d146cfa0e7e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java
index f2caa616664c..65b73c66fce3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
@@ -38,67 +36,67 @@
 @SessionFactory
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsOrderByInCorrelatedSubquery.class)
 public class SubqueryPaginationTest {
-    @BeforeEach
-    public void createTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    final EntityOfLists entityContainingLists = new EntityOfLists( 1, "first" );
+	@BeforeEach
+	public void createTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					final EntityOfLists entityContainingLists = new EntityOfLists( 1, "first" );
 
-                    entityContainingLists.addBasic( "abc" );
-                    entityContainingLists.addBasic( "def" );
-                    entityContainingLists.addBasic( "ghi" );
+					entityContainingLists.addBasic( "abc" );
+					entityContainingLists.addBasic( "def" );
+					entityContainingLists.addBasic( "ghi" );
 
-                    entityContainingLists.addConvertedEnum( EnumValue.TWO );
+					entityContainingLists.addConvertedEnum( EnumValue.TWO );
 
-                    entityContainingLists.addEnum( EnumValue.ONE );
-                    entityContainingLists.addEnum( EnumValue.THREE );
+					entityContainingLists.addEnum( EnumValue.ONE );
+					entityContainingLists.addEnum( EnumValue.THREE );
 
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a1", "first-another-a1" ) );
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) );
-                    entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a1", "first-another-a1" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) );
+					entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) );
 
-                    session.persist( entityContainingLists );
-                }
-        );
-    }
+					session.persist( entityContainingLists );
+				}
+		);
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.createQuery( "delete from EntityOfLists" ).executeUpdate();
-                    session.createQuery( "delete from SimpleEntity" ).executeUpdate();
-                }
-        );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "delete from EntityOfLists" ).executeUpdate();
+					session.createQuery( "delete from SimpleEntity" ).executeUpdate();
+				}
+		);
+	}
 
-    @Test
-    @SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Generates nested correlated subquery which is not supported in that version")
-    public void testLimitInSubquery(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "from EntityOfLists e where 'abc' = (select basic from e.listOfBasics basic order by basic limit 1)",
-                            EntityOfLists.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Generates nested correlated subquery which is not supported in that version")
+	public void testLimitInSubquery(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"from EntityOfLists e where 'abc' = (select basic from e.listOfBasics basic order by basic limit 1)",
+							EntityOfLists.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOffsetInSubquery.class)
-    @SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Generates nested correlated subquery which is not supported in that version")
-    @SkipForDialect(dialectClass = DB2Dialect.class, majorVersion = 10, reason = "Generates nested correlated subquery which is not supported in that version")
-    public void testLimitAndOffsetInSubquery(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "from EntityOfLists e where 'def' = (select basic from e.listOfBasics basic order by basic limit 1 offset 1)",
-                            EntityOfLists.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOffsetInSubquery.class)
+	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Generates nested correlated subquery which is not supported in that version")
+	@SkipForDialect(dialectClass = DB2Dialect.class, majorVersion = 10, reason = "Generates nested correlated subquery which is not supported in that version")
+	public void testLimitAndOffsetInSubquery(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"from EntityOfLists e where 'def' = (select basic from e.listOfBasics basic order by basic limit 1 offset 1)",
+							EntityOfLists.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Tag.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Tag.java
index 940f8bff29b6..19c426a87d06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Tag.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/Tag.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination;
 
@@ -10,15 +8,15 @@
 public class Tag {
 	private int id;
 	private String surrogate;
-	
+
 	public Tag() {
-	
+
 	}
 
 	public Tag(String surrogate) {
 		this.surrogate = surrogate;
 	}
-	
+
 	public int getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java
index 529336c9e85f..3441c86976e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination.hhh9965;
 
@@ -23,37 +21,37 @@
 @JiraKey(value = "HHH-9965")
 public class HHH9965Test extends BaseCoreFunctionalTestCase {
 
-    @Test
-    public void testHHH9965() {
-        Session session = openSession();
-        session.beginTransaction();
-
-        String hql = "SELECT s FROM Shop s join fetch s.products";
-
-        try{
-            session.createQuery(hql)
-                    .setMaxResults(3)
-                    .list();
-            fail("Pagination over collection fetch failure was expected");
-        } catch (Exception e){
-            log.info(e.getMessage());
-        }
-
-        session.getTransaction().commit();
-        session.close();
-    }
-
-    @Override
-    protected void configure(Configuration cfg) {
-        super.configure(cfg);
-        cfg.setProperty( Environment.FAIL_ON_PAGINATION_OVER_COLLECTION_FETCH, true );
-    }
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                Shop.class,
-                Product.class
-        };
-    }
+	@Test
+	public void testHHH9965() {
+		Session session = openSession();
+		session.beginTransaction();
+
+		String hql = "SELECT s FROM Shop s join fetch s.products";
+
+		try{
+			session.createQuery(hql)
+					.setMaxResults(3)
+					.list();
+			fail("Pagination over collection fetch failure was expected");
+		} catch (Exception e){
+			log.info(e.getMessage());
+		}
+
+		session.getTransaction().commit();
+		session.close();
+	}
+
+	@Override
+	protected void configure(Configuration cfg) {
+		super.configure(cfg);
+		cfg.setProperty( Environment.FAIL_ON_PAGINATION_OVER_COLLECTION_FETCH, true );
+	}
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				Shop.class,
+				Product.class
+		};
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java
index 57f201353baa..523f93beb0ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination.hhh9965;
 
@@ -18,16 +16,16 @@
 @Entity
 public class Product {
 
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java
index 1950ffa63acf..2e3afd992371 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pagination.hhh9965;
 
@@ -17,27 +15,27 @@
 @Entity
 public class Shop {
 
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @OneToMany(fetch = FetchType.LAZY)
-    private List products;
+	@OneToMany(fetch = FetchType.LAZY)
+	private List products;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public List getProducts() {
-        return products;
-    }
+	public List getProducts() {
+		return products;
+	}
 
-    public void setProducts(List products) {
-        this.products = products;
-    }
+	public void setProducts(List products) {
+		this.products = products;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
index 8c51116885da..dffb3b86e83b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.paging.keybased;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/BytecodeEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/BytecodeEnhancementTest.java
index fc9f93547733..3bc6eef5601d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/BytecodeEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/BytecodeEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeDetachTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeDetachTest.java
index 253c6c308079..4d8f38261abe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeDetachTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeDetachTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -62,4 +60,4 @@ public void detachTest() {
 			//end::pc-cascade-detach-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeMergeTest.java
index 1652d6a95be8..2168836483b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -57,4 +55,4 @@ public void mergeTest() {
 			//end::pc-cascade-merge-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteCollectionTest.java
index 7eb5bffad464..41ed659b2bd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteTest.java
index b897eef432a1..bb9ffd4f4c4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeOnDeleteTest.java
@@ -1,20 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
 import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
 import org.hibernate.testing.DialectChecks;
@@ -70,7 +65,7 @@ public static class Person {
 		private Long id;
 
 		private String name;
-		
+
 		//Getters and setters are omitted for brevity
 
 	//end::pc-cascade-on-delete-mapping-Person-example[]
@@ -111,7 +106,7 @@ public static class Phone {
 		//Getters and setters are omitted for brevity
 
 	//end::pc-cascade-on-delete-mapping-Phone-example[]
-		
+
 		public Long getId() {
 			return id;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadePersistTest.java
index de3b235a4934..95c146aea7ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadePersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadePersistTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -43,4 +41,4 @@ public void persistTest() {
 			//end::pc-cascade-persist-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRefreshTest.java
index c02a2d58954f..efb717816409 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRefreshTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -57,4 +55,4 @@ public void refreshTest() {
 			//end::pc-cascade-refresh-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRemoveTest.java
index 04d74ac0dee7..d2509b9cb40f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRemoveTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeRemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -48,4 +46,4 @@ public void removeTest() {
 			//end::pc-cascade-remove-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeReplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeReplicateTest.java
index 16a7b0b712e7..5aebb3517bc1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeReplicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/CascadeReplicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -58,4 +56,4 @@ public void refreshTest() {
 			//end::pc-cascade-replicate-example[]
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/DynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/DynamicUpdateTest.java
index 391fdad1ba00..347d839ca520 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/DynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/DynamicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -16,7 +14,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterJoinTableTest.java
index 1b2bd73be2db..8e9cc029f138 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -33,186 +31,186 @@
  */
 public class FilterJoinTableTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Client.class,
-            Account.class
-        };
-    }
-
-    @Test
-    public void testLifecycle() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::pc-filter-join-table-persistence-example[]
-            Client client = new Client()
-            .setId(1L)
-            .setName("John Doe");
-
-            client.addAccount(
-                new Account()
-                .setId(1L)
-                .setType(AccountType.CREDIT)
-                .setAmount(5000d)
-                .setRate(1.25 / 100)
-           );
-
-            client.addAccount(
-                new Account()
-                .setId(2L)
-                .setType(AccountType.DEBIT)
-                .setAmount(0d)
-                .setRate(1.05 / 100)
-           );
-
-            client.addAccount(
-                new Account()
-                .setType(AccountType.DEBIT)
-                .setId(3L)
-                .setAmount(250d)
-                .setRate(1.05 / 100)
-           );
-
-            entityManager.persist(client);
-            //end::pc-filter-join-table-persistence-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::pc-no-filter-join-table-collection-query-example[]
-            Client client = entityManager.find(Client.class, 1L);
-
-            assertEquals(3, client.getAccounts().size());
-            //end::pc-no-filter-join-table-collection-query-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "firstAccounts");
-
-            //tag::pc-filter-join-table-collection-query-example[]
-            Client client = entityManager.find(Client.class, 1L);
-
-            entityManager
-                .unwrap(Session.class)
-                .enableFilter("firstAccounts")
-                .setParameter("maxOrderId", 1);
-
-            assertEquals(2, client.getAccounts().size());
-            //end::pc-filter-join-table-collection-query-example[]
-        });
-    }
-
-    public enum AccountType {
-        DEBIT,
-        CREDIT
-    }
-
-    //tag::pc-filter-join-table-example[]
-    @Entity(name = "Client")
-    @FilterDef(
-        name="firstAccounts",
-        parameters=@ParamDef(
-            name="maxOrderId",
-            type=int.class
-       )
-   )
-    public static class Client {
-
-        @Id
-        private Long id;
-
-        private String name;
-
-        @OneToMany(cascade = CascadeType.ALL)
-        @OrderColumn(name = "order_id")
-        @FilterJoinTable(
-            name="firstAccounts",
-            condition="order_id <= :maxOrderId"
-       )
-        private List accounts = new ArrayList<>();
-
-        //Getters and setters omitted for brevity
-        //end::pc-filter-join-table-example[]
-        public Long getId() {
-            return id;
-        }
-
-        public Client setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public Client setName(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public List getAccounts() {
-            return accounts;
-        }
-        //tag::pc-filter-join-table-example[]
-
-        public void addAccount(Account account) {
-            this.accounts.add(account);
-        }
-    }
-
-    @Entity(name = "Account")
-    public static class Account {
-
-        @Id
-        private Long id;
-
-        @Column(name = "account_type")
-        @Enumerated(EnumType.STRING)
-        private AccountType type;
-
-        private Double amount;
-
-        private Double rate;
-
-        //Getters and setters omitted for brevity
-    //end::pc-filter-join-table-example[]
-        public Long getId() {
-            return id;
-        }
-
-        public Account setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public AccountType getType() {
-            return type;
-        }
-
-        public Account setType(AccountType type) {
-            this.type = type;
-            return this;
-        }
-
-        public Double getAmount() {
-            return amount;
-        }
-
-        public Account setAmount(Double amount) {
-            this.amount = amount;
-            return this;
-        }
-
-        public Double getRate() {
-            return rate;
-        }
-
-        public Account setRate(Double rate) {
-            this.rate = rate;
-            return this;
-        }
-
-        //tag::pc-filter-join-table-example[]
-    }
-    //end::pc-filter-join-table-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Client.class,
+			Account.class
+		};
+	}
+
+	@Test
+	public void testLifecycle() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::pc-filter-join-table-persistence-example[]
+			Client client = new Client()
+			.setId(1L)
+			.setName("John Doe");
+
+			client.addAccount(
+				new Account()
+				.setId(1L)
+				.setType(AccountType.CREDIT)
+				.setAmount(5000d)
+				.setRate(1.25 / 100)
+		);
+
+			client.addAccount(
+				new Account()
+				.setId(2L)
+				.setType(AccountType.DEBIT)
+				.setAmount(0d)
+				.setRate(1.05 / 100)
+		);
+
+			client.addAccount(
+				new Account()
+				.setType(AccountType.DEBIT)
+				.setId(3L)
+				.setAmount(250d)
+				.setRate(1.05 / 100)
+		);
+
+			entityManager.persist(client);
+			//end::pc-filter-join-table-persistence-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::pc-no-filter-join-table-collection-query-example[]
+			Client client = entityManager.find(Client.class, 1L);
+
+			assertEquals(3, client.getAccounts().size());
+			//end::pc-no-filter-join-table-collection-query-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "firstAccounts");
+
+			//tag::pc-filter-join-table-collection-query-example[]
+			Client client = entityManager.find(Client.class, 1L);
+
+			entityManager
+				.unwrap(Session.class)
+				.enableFilter("firstAccounts")
+				.setParameter("maxOrderId", 1);
+
+			assertEquals(2, client.getAccounts().size());
+			//end::pc-filter-join-table-collection-query-example[]
+		});
+	}
+
+	public enum AccountType {
+		DEBIT,
+		CREDIT
+	}
+
+	//tag::pc-filter-join-table-example[]
+	@Entity(name = "Client")
+	@FilterDef(
+		name="firstAccounts",
+		parameters=@ParamDef(
+			name="maxOrderId",
+			type=int.class
+	)
+)
+	public static class Client {
+
+		@Id
+		private Long id;
+
+		private String name;
+
+		@OneToMany(cascade = CascadeType.ALL)
+		@OrderColumn(name = "order_id")
+		@FilterJoinTable(
+			name="firstAccounts",
+			condition="order_id <= :maxOrderId"
+	)
+		private List accounts = new ArrayList<>();
+
+		//Getters and setters omitted for brevity
+		//end::pc-filter-join-table-example[]
+		public Long getId() {
+			return id;
+		}
+
+		public Client setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Client setName(String name) {
+			this.name = name;
+			return this;
+		}
+
+		public List getAccounts() {
+			return accounts;
+		}
+		//tag::pc-filter-join-table-example[]
+
+		public void addAccount(Account account) {
+			this.accounts.add(account);
+		}
+	}
+
+	@Entity(name = "Account")
+	public static class Account {
+
+		@Id
+		private Long id;
+
+		@Column(name = "account_type")
+		@Enumerated(EnumType.STRING)
+		private AccountType type;
+
+		private Double amount;
+
+		private Double rate;
+
+		//Getters and setters omitted for brevity
+	//end::pc-filter-join-table-example[]
+		public Long getId() {
+			return id;
+		}
+
+		public Account setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public AccountType getType() {
+			return type;
+		}
+
+		public Account setType(AccountType type) {
+			this.type = type;
+			return this;
+		}
+
+		public Double getAmount() {
+			return amount;
+		}
+
+		public Account setAmount(Double amount) {
+			this.amount = amount;
+			return this;
+		}
+
+		public Double getRate() {
+			return rate;
+		}
+
+		public Account setRate(Double rate) {
+			this.rate = rate;
+			return this;
+		}
+
+		//tag::pc-filter-join-table-example[]
+	}
+	//end::pc-filter-join-table-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterSqlFragementAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterSqlFragementAliasTest.java
index 05b8670962e3..b46a5ffd147e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterSqlFragementAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterSqlFragementAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterTest.java
index ae14cf301d26..3b1af43791b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -56,753 +54,753 @@
  */
 public class FilterTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Client.class,
-            Account.class,
-            AccountEager.class,
-            AccountNotFound.class,
-            AccountNotFoundException.class
-        };
-    }
-
-    @Override
-    protected void addConfigOptions(Map options) {
-        super.addConfigOptions( options );
-        options.put( DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG.name() );
-    }
-
-    @Before
-    public void setup() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::pc-filter-persistence-example[]
-            Client client = new Client()
-                    .setId(1L)
-                    .setName("John Doe")
-                    .setType(AccountType.DEBIT);
-
-            Account account1;
-            client.addAccount(
-                    account1 = new Account()
-                            .setId(1L)
-                            .setType(AccountType.CREDIT)
-                            .setAmount(5000d)
-                            .setRate(1.25 / 100)
-                            .setActive(true)
-            );
-
-            client.addAccount(
-                    new Account()
-                            .setId(2L)
-                            .setType(AccountType.DEBIT)
-                            .setAmount(0d)
-                            .setRate(1.05 / 100)
-                            .setActive(false)
-                            .setParentAccount( account1 )
-            );
-
-            client.addAccount(
-                    new Account()
-                            .setType(AccountType.DEBIT)
-                            .setId(3L)
-                            .setAmount(250d)
-                            .setRate(1.05 / 100)
-                            .setActive(true)
-            );
-
-            entityManager.persist(client);
-            //end::pc-filter-persistence-example[]
-            entityManager.persist(
-                    new AccountEager()
-                            .setId(2L)
-                            .setParentAccount( account1 )
-            );
-            entityManager.persist(
-                    new AccountNotFound()
-                            .setId(2L)
-                            .setParentAccount( account1 )
-            );
-            entityManager.persist(
-                    new AccountNotFoundException()
-                            .setId(2L)
-                            .setParentAccount( account1 )
-            );
-        });
-    }
-
-    @After
-    public void tearDown() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.createQuery( "update Account set parentAccount = null" ).executeUpdate();
-            entityManager.createQuery( "delete from AccountEager" ).executeUpdate();
-            entityManager.createQuery( "delete from AccountNotFound" ).executeUpdate();
-            entityManager.createQuery( "delete from AccountNotFoundException" ).executeUpdate();
-            entityManager.createQuery( "delete from Account" ).executeUpdate();
-            entityManager.createQuery( "delete from Client" ).executeUpdate();
-        });
-    }
-
-    @Test
-    public void testLifecycle() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "activeAccount");
-
-            entityManager
-                    .unwrap(Session.class)
-                    .enableFilter("activeAccount")
-                    .setParameter("active", true);
-
-            Account account1 = entityManager.find(Account.class, 1L);
-            Account account2 = entityManager.find(Account.class, 2L);
-
-            assertNotNull(account1);
-            assertNotNull(account2);
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "activeAccount");
-
-            entityManager
-                    .unwrap(Session.class)
-                    .enableFilter("activeAccount")
-                    .setParameter("active", true);
-
-            Account account1 = entityManager.createQuery(
-                    "select a from Account a where a.id = :id", Account.class)
-                    .setParameter("id", 1L)
-                    .getSingleResult();
-            assertNotNull(account1);
-            try {
-                Account account2 = entityManager.createQuery(
-                        "select a from Account a where a.id = :id", Account.class)
-                        .setParameter("id", 2L)
-                        .getSingleResult();
-            }
-            catch (NoResultException expected) {
-            }
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "activeAccount");
-            //tag::pc-filter-entity-example[]
-            entityManager
-                .unwrap(Session.class)
-                .enableFilter("activeAccount")
-                .setParameter("active", true);
-
-            Account account = entityManager.find(Account.class, 2L);
-
-            assertFalse( account.isActive() );
-            //end::pc-filter-entity-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::pc-no-filter-entity-query-example[]
-            List accounts = entityManager.createQuery(
-                "select a from Account a", Account.class)
-            .getResultList();
-
-            assertEquals(3, accounts.size());
-            //end::pc-no-filter-entity-query-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "activeAccount");
-            //tag::pc-filter-entity-query-example[]
-            entityManager
-                .unwrap(Session.class)
-                .enableFilter("activeAccount")
-                .setParameter("active", true);
-
-            List accounts = entityManager.createQuery(
-                "select a from Account a", Account.class)
-            .getResultList();
-
-            assertEquals(2, accounts.size());
-            //end::pc-filter-entity-query-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            //tag::pc-no-filter-collection-query-example[]
-            Client client = entityManager.find(Client.class, 1L);
-
-            assertEquals(3, client.getAccounts().size());
-            //end::pc-no-filter-collection-query-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "activeAccount");
-
-            //tag::pc-filter-collection-query-example[]
-            entityManager
-                .unwrap(Session.class)
-                .enableFilter("activeAccount")
-                .setParameter("active", true);
-
-            Client client = entityManager.find(Client.class, 1L);
-
-            assertEquals(2, client.getAccounts().size());
-            //end::pc-filter-collection-query-example[]
-        });
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKey() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "minimumAmount");
-            //tag::pc-filter-entity-example[]
-            entityManager
-                    .unwrap(Session.class)
-                    .enableFilter("minimumAmount")
-                    .setParameter("amount", 9000d);
-
-            Account account = entityManager.find(Account.class, 1L);
-
-            assertNull( account );
-            //end::pc-filter-entity-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "minimumAmount");
-            //tag::pc-filter-entity-example[]
-            entityManager
-                    .unwrap(Session.class)
-                    .enableFilter("minimumAmount")
-                    .setParameter("amount", 100d);
-
-            Account account = entityManager.find(Account.class, 1L);
-
-            assertNotNull( account );
-            //end::pc-filter-entity-example[]
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            log.infof("Activate filter [%s]", "minimumAmount");
-            //tag::pc-filter-entity-query-example[]
-            entityManager
-                    .unwrap(Session.class)
-                    .enableFilter("minimumAmount")
-                    .setParameter("amount", 500d);
-
-            List accounts = entityManager.createQuery(
-                            "select a from Account a", Account.class)
-                    .getResultList();
-
-            assertEquals(1, accounts.size());
-            //end::pc-filter-entity-query-example[]
-        });
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFiltering() {
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            Account account = entityManager.find( Account.class, 2L );
-            assertNotNull( account.getParentAccount() );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringLazyInitialization() {
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap( Session.class )
-                    .enableFilter( "accountType" )
-                    .setParameter( "type", "DEBIT" );
-
-            Account account = entityManager.find( Account.class, 2L );
-            EntityNotFoundException exception = assertThrows(
-                    EntityNotFoundException.class,
-                    () -> Hibernate.initialize( account.getParentAccount() )
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getMessage().endsWith( "#1]" ) );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringAccountLoadGraphInitializer() {
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap( Session.class )
-                    .enableFilter( "accountType" )
-                    .setParameter( "type", "DEBIT" );
-            EntityGraph entityGraph = entityManager.createEntityGraph( Account.class );
-            entityGraph.addAttributeNodes( "parentAccount" );
-
-            EntityFilterException exception = assertThrows(
-                    EntityFilterException.class,
-                    () -> entityManager.find(
-                            Account.class,
-                            2L,
-                            Map.of( AvailableHints.HINT_SPEC_LOAD_GRAPH, entityGraph )
-                    )
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getRole().endsWith( "parentAccount" ) );
-            assertEquals( 1L, exception.getIdentifier() );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringAccountJoinInitializer() {
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap( Session.class )
-                    .enableFilter( "accountType" )
-                    .setParameter( "type", "DEBIT" );
-
-            EntityFilterException exception = assertThrows(
-                    EntityFilterException.class,
-                    () -> entityManager.createQuery(
-                            "select a from Account a left join fetch a.parentAccount where a.id = 2",
-                            Account.class
-                    ).getResultList()
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getRole().contains( "parentAccount" ) );
-            assertEquals( 1L, exception.getIdentifier() );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringAccountSelectInitializer() {
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap( Session.class )
-                    .enableFilter( "accountType" )
-                    .setParameter( "type", "DEBIT" );
-
-            EntityFilterException exception = assertThrows(
-                    EntityFilterException.class,
-                    () -> entityManager.createQuery(
-                            "select a from AccountEager a where a.id = 2",
-                            AccountEager.class
-                    ).getResultList()
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getRole().contains( "parentAccount" ) );
-            assertEquals( 1L, exception.getIdentifier() );
-        } );
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringAccountNotFoundException() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap(Session.class)
-                    .enableFilter("accountType")
-                    .setParameter("type", "DEBIT");
-
-            EntityFilterException exception = assertThrows(
-                    EntityFilterException.class,
-                    () -> entityManager.createQuery(
-                            "select a from AccountNotFoundException a where a.id = 2",
-                            AccountNotFoundException.class
-                    ).getSingleResult()
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getRole().contains( "parentAccount" ) );
-            assertEquals( 1L, exception.getIdentifier() );
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap(Session.class)
-                    .enableFilter("accountType")
-                    .setParameter("type", "DEBIT");
-
-            EntityFilterException exception = assertThrows(
-                    EntityFilterException.class,
-                    () -> entityManager.createQuery(
-                            "select a from AccountNotFoundException a left join fetch a.parentAccount where a.id = 2",
-                            AccountNotFoundException.class
-                    ).getSingleResult()
-            );
-            // Account with id 1 does not exist
-            assertTrue( exception.getRole().contains( "parentAccount" ) );
-            assertEquals( 1L, exception.getIdentifier() );
-        });
-    }
-
-    @Test
-    @JiraKey("HHH-16830")
-    public void testApplyToLoadByKeyAssociationFilteringAccountNotFoundIgnore() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap(Session.class)
-                    .enableFilter("accountType")
-                    .setParameter("type", "DEBIT");
-
-            AccountNotFound account = entityManager.createQuery(
-                    "select a from AccountNotFound a where a.id = 2",
-                    AccountNotFound.class
-            ).getSingleResult();
-            // No exception, since we use NotFoundAction.IGNORE
-            assertNull( account.getParentAccount() );
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            entityManager.unwrap(Session.class)
-                    .enableFilter("accountType")
-                    .setParameter("type", "DEBIT");
-
-            AccountNotFound account = entityManager.createQuery(
-                    "select a from AccountNotFound a left join fetch a.parentAccount where a.id = 2",
-                    AccountNotFound.class
-            ).getSingleResult();
-            // No exception, since we use NotFoundAction.IGNORE
-            assertNull( account.getParentAccount() );
-        });
-    }
-
-    public enum AccountType {
-        DEBIT,
-        CREDIT
-    }
-
-    //tag::pc-filter-Client-example[]
-    @Entity(name = "Client")
-    @Table(name = "client")
-    public static class Client {
-
-        @Id
-        private Long id;
-
-        private String name;
-
-        private AccountType type;
-
-        @OneToMany(
-            mappedBy = "client",
-            cascade = CascadeType.ALL
-       )
-        @Filter(
-            name="activeAccount",
-            condition="active_status = :active"
-       )
-        private List accounts = new ArrayList<>();
-
-        //Getters and setters omitted for brevity
-    //end::pc-filter-Client-example[]
-        public Long getId() {
-            return id;
-        }
-
-        public Client setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public Client setName(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public AccountType getType() {
-            return type;
-        }
-
-        public Client setType(AccountType type) {
-            this.type = type;
-            return this;
-        }
-
-        public List getAccounts() {
-            return accounts;
-        }
-    //tag::pc-filter-Client-example[]
-
-        public void addAccount(Account account) {
-            account.setClient(this);
-            this.accounts.add(account);
-        }
-    }
-    //end::pc-filter-Client-example[]
-
-    //tag::pc-filter-Account-example[]
-    @Entity(name = "Account")
-    @Table(name = "account")
-    @FilterDef(
-        name="activeAccount",
-        parameters = @ParamDef(
-            name="active",
-            type=Boolean.class
-       )
-   )
-    @Filter(
-            name="activeAccount",
-            condition="active_status = :active"
-    )
-    @FilterDef(
-            name="minimumAmount",
-            parameters = @ParamDef(
-                    name="amount",
-                    type=Double.class
-            ),
-            applyToLoadByKey = true
-    )
-    @Filter(
-            name="minimumAmount",
-            condition="amount > :amount"
-    )
-    @FilterDef(
-            name="accountType",
-            parameters = @ParamDef(
-                    name="type",
-                    type=String.class
-            ),
-            applyToLoadByKey = true
-    )
-    @Filter(
-            name="accountType",
-            condition="account_type = :type"
-    )
-
-    public static class Account {
-
-        @Id
-        private Long id;
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        private Client client;
-
-        @Column(name = "account_type")
-        @Enumerated(EnumType.STRING)
-        private AccountType type;
-
-        private Double amount;
-
-        private Double rate;
-
-        @Column(name = "active_status")
-        private boolean active;
-
-        //Getters and setters omitted for brevity
-    //end::pc-filter-Account-example[]
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        private Account parentAccount;
-
-        public Long getId() {
-            return id;
-        }
-
-        public Account setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public Client getClient() {
-            return client;
-        }
-
-        public Account setClient(Client client) {
-            this.client = client;
-            return this;
-        }
-
-        public AccountType getType() {
-            return type;
-        }
-
-        public Account setType(AccountType type) {
-            this.type = type;
-            return this;
-        }
-
-        public Double getAmount() {
-            return amount;
-        }
-
-        public Account setAmount(Double amount) {
-            this.amount = amount;
-            return this;
-        }
-
-        public Double getRate() {
-            return rate;
-        }
-
-        public Account setRate(Double rate) {
-            this.rate = rate;
-            return this;
-        }
-
-        public boolean isActive() {
-            return active;
-        }
-
-        public Account setActive(boolean active) {
-            this.active = active;
-            return this;
-        }
-
-        public Account getParentAccount() {
-            return parentAccount;
-        }
-
-        public Account setParentAccount(Account parentAccount) {
-            this.parentAccount = parentAccount;
-            return this;
-        }
-    //tag::pc-filter-Account-example[]
-    }
-    //end::pc-filter-Account-example[]
-
-
-    @Entity(name = "AutoFilteredAccount")
-    @Table(name = "autofilteredaccount")
-    //tag::pc-filter-auto-enabled-Account-example[]
-    @FilterDef(
-            name="activeAccount",
-            parameters = @ParamDef(
-                    name="active",
-                    type=Boolean.class
-            ),
-            autoEnabled = true
-    )
-    //end::pc-filter-auto-enabled-Account-example[]
-    @Filter(
-            name="activeAccount",
-            condition="active_status = :active"
-    )
-    //tag::pc-filter-resolver-Account-example[]
-    @FilterDef(
-            name="activeAccountWithResolver",
-            parameters = @ParamDef(
-                    name="active",
-                    type=Boolean.class,
-                    resolver = AccountIsActiveResolver.class
-            ),
-            autoEnabled = true
-    )
-    //end::pc-filter-resolver-Account-example[]
-    public static class AutoFilteredAccount {
-
-        @Id
-        private Long id;
-
-        @Column(name = "active_status")
-        private boolean active;
-
-        public Long getId() {
-            return id;
-        }
-
-        public AutoFilteredAccount setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public boolean isActive() {
-            return active;
-        }
-
-        public AutoFilteredAccount setActive(boolean active) {
-            this.active = active;
-            return this;
-        }
-    }
-
-    //tag::pc-filter-resolver-Account-example[]
-
-    public static class AccountIsActiveResolver implements Supplier {
-        @Override
-        public Boolean get() {
-            return true;
-        }
-    }
-    //end::pc-filter-resolver-Account-example[]
-
-    @Entity(name = "AccountEager")
-    @Table(name = "account_eager")
-    public static class AccountEager {
-
-        @Id
-        private Long id;
-
-        @ManyToOne
-        private Account parentAccount;
-
-        public Long getId() {
-            return id;
-        }
-
-        public AccountEager setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public Account getParentAccount() {
-            return parentAccount;
-        }
-
-        public AccountEager setParentAccount(Account parentAccount) {
-            this.parentAccount = parentAccount;
-            return this;
-        }
-    }
-
-    @Entity(name = "AccountNotFound")
-    @Table(name = "account_not_found")
-    public static class AccountNotFound {
-
-        @Id
-        private Long id;
-
-        @ManyToOne
-        @NotFound(action = NotFoundAction.IGNORE)
-        private Account parentAccount;
-
-        public Long getId() {
-            return id;
-        }
-
-        public AccountNotFound setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public Account getParentAccount() {
-            return parentAccount;
-        }
-
-        public AccountNotFound setParentAccount(Account parentAccount) {
-            this.parentAccount = parentAccount;
-            return this;
-        }
-    }
-
-    @Entity(name = "AccountNotFoundException")
-    @Table(name = "account_not_found_exception")
-    public static class AccountNotFoundException {
-
-        @Id
-        private Long id;
-
-        @ManyToOne
-        @NotFound
-        private Account parentAccount;
-
-        public Long getId() {
-            return id;
-        }
-
-        public AccountNotFoundException setId(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public Account getParentAccount() {
-            return parentAccount;
-        }
-
-        public AccountNotFoundException setParentAccount(Account parentAccount) {
-            this.parentAccount = parentAccount;
-            return this;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Client.class,
+			Account.class,
+			AccountEager.class,
+			AccountNotFound.class,
+			AccountNotFoundException.class
+		};
+	}
+
+	@Override
+	protected void addConfigOptions(Map options) {
+		super.addConfigOptions( options );
+		options.put( DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG.name() );
+	}
+
+	@Before
+	public void setup() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::pc-filter-persistence-example[]
+			Client client = new Client()
+					.setId(1L)
+					.setName("John Doe")
+					.setType(AccountType.DEBIT);
+
+			Account account1;
+			client.addAccount(
+					account1 = new Account()
+							.setId(1L)
+							.setType(AccountType.CREDIT)
+							.setAmount(5000d)
+							.setRate(1.25 / 100)
+							.setActive(true)
+			);
+
+			client.addAccount(
+					new Account()
+							.setId(2L)
+							.setType(AccountType.DEBIT)
+							.setAmount(0d)
+							.setRate(1.05 / 100)
+							.setActive(false)
+							.setParentAccount( account1 )
+			);
+
+			client.addAccount(
+					new Account()
+							.setType(AccountType.DEBIT)
+							.setId(3L)
+							.setAmount(250d)
+							.setRate(1.05 / 100)
+							.setActive(true)
+			);
+
+			entityManager.persist(client);
+			//end::pc-filter-persistence-example[]
+			entityManager.persist(
+					new AccountEager()
+							.setId(2L)
+							.setParentAccount( account1 )
+			);
+			entityManager.persist(
+					new AccountNotFound()
+							.setId(2L)
+							.setParentAccount( account1 )
+			);
+			entityManager.persist(
+					new AccountNotFoundException()
+							.setId(2L)
+							.setParentAccount( account1 )
+			);
+		});
+	}
+
+	@After
+	public void tearDown() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.createQuery( "update Account set parentAccount = null" ).executeUpdate();
+			entityManager.createQuery( "delete from AccountEager" ).executeUpdate();
+			entityManager.createQuery( "delete from AccountNotFound" ).executeUpdate();
+			entityManager.createQuery( "delete from AccountNotFoundException" ).executeUpdate();
+			entityManager.createQuery( "delete from Account" ).executeUpdate();
+			entityManager.createQuery( "delete from Client" ).executeUpdate();
+		});
+	}
+
+	@Test
+	public void testLifecycle() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "activeAccount");
+
+			entityManager
+					.unwrap(Session.class)
+					.enableFilter("activeAccount")
+					.setParameter("active", true);
+
+			Account account1 = entityManager.find(Account.class, 1L);
+			Account account2 = entityManager.find(Account.class, 2L);
+
+			assertNotNull(account1);
+			assertNotNull(account2);
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "activeAccount");
+
+			entityManager
+					.unwrap(Session.class)
+					.enableFilter("activeAccount")
+					.setParameter("active", true);
+
+			Account account1 = entityManager.createQuery(
+					"select a from Account a where a.id = :id", Account.class)
+					.setParameter("id", 1L)
+					.getSingleResult();
+			assertNotNull(account1);
+			try {
+				Account account2 = entityManager.createQuery(
+						"select a from Account a where a.id = :id", Account.class)
+						.setParameter("id", 2L)
+						.getSingleResult();
+			}
+			catch (NoResultException expected) {
+			}
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "activeAccount");
+			//tag::pc-filter-entity-example[]
+			entityManager
+				.unwrap(Session.class)
+				.enableFilter("activeAccount")
+				.setParameter("active", true);
+
+			Account account = entityManager.find(Account.class, 2L);
+
+			assertFalse( account.isActive() );
+			//end::pc-filter-entity-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::pc-no-filter-entity-query-example[]
+			List accounts = entityManager.createQuery(
+				"select a from Account a", Account.class)
+			.getResultList();
+
+			assertEquals(3, accounts.size());
+			//end::pc-no-filter-entity-query-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "activeAccount");
+			//tag::pc-filter-entity-query-example[]
+			entityManager
+				.unwrap(Session.class)
+				.enableFilter("activeAccount")
+				.setParameter("active", true);
+
+			List accounts = entityManager.createQuery(
+				"select a from Account a", Account.class)
+			.getResultList();
+
+			assertEquals(2, accounts.size());
+			//end::pc-filter-entity-query-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			//tag::pc-no-filter-collection-query-example[]
+			Client client = entityManager.find(Client.class, 1L);
+
+			assertEquals(3, client.getAccounts().size());
+			//end::pc-no-filter-collection-query-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "activeAccount");
+
+			//tag::pc-filter-collection-query-example[]
+			entityManager
+				.unwrap(Session.class)
+				.enableFilter("activeAccount")
+				.setParameter("active", true);
+
+			Client client = entityManager.find(Client.class, 1L);
+
+			assertEquals(2, client.getAccounts().size());
+			//end::pc-filter-collection-query-example[]
+		});
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKey() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "minimumAmount");
+			//tag::pc-filter-entity-example[]
+			entityManager
+					.unwrap(Session.class)
+					.enableFilter("minimumAmount")
+					.setParameter("amount", 9000d);
+
+			Account account = entityManager.find(Account.class, 1L);
+
+			assertNull( account );
+			//end::pc-filter-entity-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "minimumAmount");
+			//tag::pc-filter-entity-example[]
+			entityManager
+					.unwrap(Session.class)
+					.enableFilter("minimumAmount")
+					.setParameter("amount", 100d);
+
+			Account account = entityManager.find(Account.class, 1L);
+
+			assertNotNull( account );
+			//end::pc-filter-entity-example[]
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			log.infof("Activate filter [%s]", "minimumAmount");
+			//tag::pc-filter-entity-query-example[]
+			entityManager
+					.unwrap(Session.class)
+					.enableFilter("minimumAmount")
+					.setParameter("amount", 500d);
+
+			List accounts = entityManager.createQuery(
+							"select a from Account a", Account.class)
+					.getResultList();
+
+			assertEquals(1, accounts.size());
+			//end::pc-filter-entity-query-example[]
+		});
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFiltering() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Account account = entityManager.find( Account.class, 2L );
+			assertNotNull( account.getParentAccount() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringLazyInitialization() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap( Session.class )
+					.enableFilter( "accountType" )
+					.setParameter( "type", "DEBIT" );
+
+			Account account = entityManager.find( Account.class, 2L );
+			EntityNotFoundException exception = assertThrows(
+					EntityNotFoundException.class,
+					() -> Hibernate.initialize( account.getParentAccount() )
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getMessage().endsWith( "#1]" ) );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringAccountLoadGraphInitializer() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap( Session.class )
+					.enableFilter( "accountType" )
+					.setParameter( "type", "DEBIT" );
+			EntityGraph entityGraph = entityManager.createEntityGraph( Account.class );
+			entityGraph.addAttributeNodes( "parentAccount" );
+
+			EntityFilterException exception = assertThrows(
+					EntityFilterException.class,
+					() -> entityManager.find(
+							Account.class,
+							2L,
+							Map.of( AvailableHints.HINT_SPEC_LOAD_GRAPH, entityGraph )
+					)
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getRole().endsWith( "parentAccount" ) );
+			assertEquals( 1L, exception.getIdentifier() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringAccountJoinInitializer() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap( Session.class )
+					.enableFilter( "accountType" )
+					.setParameter( "type", "DEBIT" );
+
+			EntityFilterException exception = assertThrows(
+					EntityFilterException.class,
+					() -> entityManager.createQuery(
+							"select a from Account a left join fetch a.parentAccount where a.id = 2",
+							Account.class
+					).getResultList()
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getRole().contains( "parentAccount" ) );
+			assertEquals( 1L, exception.getIdentifier() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringAccountSelectInitializer() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap( Session.class )
+					.enableFilter( "accountType" )
+					.setParameter( "type", "DEBIT" );
+
+			EntityFilterException exception = assertThrows(
+					EntityFilterException.class,
+					() -> entityManager.createQuery(
+							"select a from AccountEager a where a.id = 2",
+							AccountEager.class
+					).getResultList()
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getRole().contains( "parentAccount" ) );
+			assertEquals( 1L, exception.getIdentifier() );
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringAccountNotFoundException() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap(Session.class)
+					.enableFilter("accountType")
+					.setParameter("type", "DEBIT");
+
+			EntityFilterException exception = assertThrows(
+					EntityFilterException.class,
+					() -> entityManager.createQuery(
+							"select a from AccountNotFoundException a where a.id = 2",
+							AccountNotFoundException.class
+					).getSingleResult()
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getRole().contains( "parentAccount" ) );
+			assertEquals( 1L, exception.getIdentifier() );
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap(Session.class)
+					.enableFilter("accountType")
+					.setParameter("type", "DEBIT");
+
+			EntityFilterException exception = assertThrows(
+					EntityFilterException.class,
+					() -> entityManager.createQuery(
+							"select a from AccountNotFoundException a left join fetch a.parentAccount where a.id = 2",
+							AccountNotFoundException.class
+					).getSingleResult()
+			);
+			// Account with id 1 does not exist
+			assertTrue( exception.getRole().contains( "parentAccount" ) );
+			assertEquals( 1L, exception.getIdentifier() );
+		});
+	}
+
+	@Test
+	@JiraKey("HHH-16830")
+	public void testApplyToLoadByKeyAssociationFilteringAccountNotFoundIgnore() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap(Session.class)
+					.enableFilter("accountType")
+					.setParameter("type", "DEBIT");
+
+			AccountNotFound account = entityManager.createQuery(
+					"select a from AccountNotFound a where a.id = 2",
+					AccountNotFound.class
+			).getSingleResult();
+			// No exception, since we use NotFoundAction.IGNORE
+			assertNull( account.getParentAccount() );
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			entityManager.unwrap(Session.class)
+					.enableFilter("accountType")
+					.setParameter("type", "DEBIT");
+
+			AccountNotFound account = entityManager.createQuery(
+					"select a from AccountNotFound a left join fetch a.parentAccount where a.id = 2",
+					AccountNotFound.class
+			).getSingleResult();
+			// No exception, since we use NotFoundAction.IGNORE
+			assertNull( account.getParentAccount() );
+		});
+	}
+
+	public enum AccountType {
+		DEBIT,
+		CREDIT
+	}
+
+	//tag::pc-filter-Client-example[]
+	@Entity(name = "Client")
+	@Table(name = "client")
+	public static class Client {
+
+		@Id
+		private Long id;
+
+		private String name;
+
+		private AccountType type;
+
+		@OneToMany(
+			mappedBy = "client",
+			cascade = CascadeType.ALL
+	)
+		@Filter(
+			name="activeAccount",
+			condition="active_status = :active"
+	)
+		private List accounts = new ArrayList<>();
+
+		//Getters and setters omitted for brevity
+	//end::pc-filter-Client-example[]
+		public Long getId() {
+			return id;
+		}
+
+		public Client setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Client setName(String name) {
+			this.name = name;
+			return this;
+		}
+
+		public AccountType getType() {
+			return type;
+		}
+
+		public Client setType(AccountType type) {
+			this.type = type;
+			return this;
+		}
+
+		public List getAccounts() {
+			return accounts;
+		}
+	//tag::pc-filter-Client-example[]
+
+		public void addAccount(Account account) {
+			account.setClient(this);
+			this.accounts.add(account);
+		}
+	}
+	//end::pc-filter-Client-example[]
+
+	//tag::pc-filter-Account-example[]
+	@Entity(name = "Account")
+	@Table(name = "account")
+	@FilterDef(
+		name="activeAccount",
+		parameters = @ParamDef(
+			name="active",
+			type=Boolean.class
+	)
+)
+	@Filter(
+			name="activeAccount",
+			condition="active_status = :active"
+	)
+	@FilterDef(
+			name="minimumAmount",
+			parameters = @ParamDef(
+					name="amount",
+					type=Double.class
+			),
+			applyToLoadByKey = true
+	)
+	@Filter(
+			name="minimumAmount",
+			condition="amount > :amount"
+	)
+	@FilterDef(
+			name="accountType",
+			parameters = @ParamDef(
+					name="type",
+					type=String.class
+			),
+			applyToLoadByKey = true
+	)
+	@Filter(
+			name="accountType",
+			condition="account_type = :type"
+	)
+
+	public static class Account {
+
+		@Id
+		private Long id;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Client client;
+
+		@Column(name = "account_type")
+		@Enumerated(EnumType.STRING)
+		private AccountType type;
+
+		private Double amount;
+
+		private Double rate;
+
+		@Column(name = "active_status")
+		private boolean active;
+
+		//Getters and setters omitted for brevity
+	//end::pc-filter-Account-example[]
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Account parentAccount;
+
+		public Long getId() {
+			return id;
+		}
+
+		public Account setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public Client getClient() {
+			return client;
+		}
+
+		public Account setClient(Client client) {
+			this.client = client;
+			return this;
+		}
+
+		public AccountType getType() {
+			return type;
+		}
+
+		public Account setType(AccountType type) {
+			this.type = type;
+			return this;
+		}
+
+		public Double getAmount() {
+			return amount;
+		}
+
+		public Account setAmount(Double amount) {
+			this.amount = amount;
+			return this;
+		}
+
+		public Double getRate() {
+			return rate;
+		}
+
+		public Account setRate(Double rate) {
+			this.rate = rate;
+			return this;
+		}
+
+		public boolean isActive() {
+			return active;
+		}
+
+		public Account setActive(boolean active) {
+			this.active = active;
+			return this;
+		}
+
+		public Account getParentAccount() {
+			return parentAccount;
+		}
+
+		public Account setParentAccount(Account parentAccount) {
+			this.parentAccount = parentAccount;
+			return this;
+		}
+	//tag::pc-filter-Account-example[]
+	}
+	//end::pc-filter-Account-example[]
+
+
+	@Entity(name = "AutoFilteredAccount")
+	@Table(name = "autofilteredaccount")
+	//tag::pc-filter-auto-enabled-Account-example[]
+	@FilterDef(
+			name="activeAccount",
+			parameters = @ParamDef(
+					name="active",
+					type=Boolean.class
+			),
+			autoEnabled = true
+	)
+	//end::pc-filter-auto-enabled-Account-example[]
+	@Filter(
+			name="activeAccount",
+			condition="active_status = :active"
+	)
+	//tag::pc-filter-resolver-Account-example[]
+	@FilterDef(
+			name="activeAccountWithResolver",
+			parameters = @ParamDef(
+					name="active",
+					type=Boolean.class,
+					resolver = AccountIsActiveResolver.class
+			),
+			autoEnabled = true
+	)
+	//end::pc-filter-resolver-Account-example[]
+	public static class AutoFilteredAccount {
+
+		@Id
+		private Long id;
+
+		@Column(name = "active_status")
+		private boolean active;
+
+		public Long getId() {
+			return id;
+		}
+
+		public AutoFilteredAccount setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public boolean isActive() {
+			return active;
+		}
+
+		public AutoFilteredAccount setActive(boolean active) {
+			this.active = active;
+			return this;
+		}
+	}
+
+	//tag::pc-filter-resolver-Account-example[]
+
+	public static class AccountIsActiveResolver implements Supplier {
+		@Override
+		public Boolean get() {
+			return true;
+		}
+	}
+	//end::pc-filter-resolver-Account-example[]
+
+	@Entity(name = "AccountEager")
+	@Table(name = "account_eager")
+	public static class AccountEager {
+
+		@Id
+		private Long id;
+
+		@ManyToOne
+		private Account parentAccount;
+
+		public Long getId() {
+			return id;
+		}
+
+		public AccountEager setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public Account getParentAccount() {
+			return parentAccount;
+		}
+
+		public AccountEager setParentAccount(Account parentAccount) {
+			this.parentAccount = parentAccount;
+			return this;
+		}
+	}
+
+	@Entity(name = "AccountNotFound")
+	@Table(name = "account_not_found")
+	public static class AccountNotFound {
+
+		@Id
+		private Long id;
+
+		@ManyToOne
+		@NotFound(action = NotFoundAction.IGNORE)
+		private Account parentAccount;
+
+		public Long getId() {
+			return id;
+		}
+
+		public AccountNotFound setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public Account getParentAccount() {
+			return parentAccount;
+		}
+
+		public AccountNotFound setParentAccount(Account parentAccount) {
+			this.parentAccount = parentAccount;
+			return this;
+		}
+	}
+
+	@Entity(name = "AccountNotFoundException")
+	@Table(name = "account_not_found_exception")
+	public static class AccountNotFoundException {
+
+		@Id
+		private Long id;
+
+		@ManyToOne
+		@NotFound
+		private Account parentAccount;
+
+		public Long getId() {
+			return id;
+		}
+
+		public AccountNotFoundException setId(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public Account getParentAccount() {
+			return parentAccount;
+		}
+
+		public AccountNotFoundException setParentAccount(Account parentAccount) {
+			this.parentAccount = parentAccount;
+			return this;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/MultiLoadIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/MultiLoadIdTest.java
index 970269903c66..16deabd597a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/MultiLoadIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/MultiLoadIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/NoDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/NoDynamicUpdateTest.java
index 2761a8d55066..0db71e92a975 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/NoDynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/NoDynamicUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
index 01be5c1db3f6..9a899f23e41f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -22,7 +20,6 @@
 import jakarta.persistence.PersistenceUtil;
 
 import org.hibernate.Hibernate;
-import org.hibernate.LockMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.annotations.NaturalId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Person.java
index 278ada051a13..5cd3212754b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -20,43 +18,43 @@
 @Entity
 public class Person {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    private String name;
+	private String name;
 
-    @OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)
-    private List phones = new ArrayList<>();
+	@OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)
+	private List phones = new ArrayList<>();
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 //end::pc-cascade-domain-model-example[]
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public List getPhones() {
-        return phones;
-    }
+	public List getPhones() {
+		return phones;
+	}
 
 //tag::pc-cascade-domain-model-example[]
 
-    public void addPhone(Phone phone) {
-        this.phones.add(phone);
-        phone.setOwner(this);
-    }
+	public void addPhone(Phone phone) {
+		this.phones.add(phone);
+		phone.setOwner(this);
+	}
 }
 
 //end::pc-cascade-domain-model-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Phone.java
index fcbea5e54dfa..f06c1f224cdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
@@ -19,41 +17,41 @@
 @Entity
 public class Phone {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Column(name = "`number`")
-    private String number;
+	@Column(name = "`number`")
+	private String number;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Person owner;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Person owner;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 //end::pc-cascade-domain-model-example[]
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getNumber() {
-        return number;
-    }
+	public String getNumber() {
+		return number;
+	}
 
-    public void setNumber(String number) {
-        this.number = number;
-    }
+	public void setNumber(String number) {
+		this.number = number;
+	}
 
-    public Person getOwner() {
-        return owner;
-    }
+	public Person getOwner() {
+		return owner;
+	}
 
-    public void setOwner(Person owner) {
-        this.owner = owner;
-    }
+	public void setOwner(Person owner) {
+		this.owner = owner;
+	}
 //tag::pc-cascade-domain-model-example[]
 }
 //end::pc-cascade-domain-model-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereJoinTableTest.java
index 865b383d10a2..750919e5924d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereTest.java
index 29eac595a929..818a6a1fb06d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/WhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.pc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java
index 5d33c37f7ed2..86ec5436c3a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java
index 5dbb4a1e082e..a19cdcf798ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java
index f1b6c82696ec..a977bc74b186 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
@@ -46,17 +44,17 @@ public void testSchemaNotReplacedInCustomSQL(SessionFactoryScope scope) throws E
 
 		String className = CustomEntity.class.getName();
 
-        final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className);
+		final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className);
 		String insertQuery = ( (JdbcMutationOperation) persister.getInsertCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 		String updateQuery = ( (JdbcMutationOperation) persister.getUpdateCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 		String deleteQuery = ( (JdbcMutationOperation) persister.getDeleteCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 
 		assertEquals( "Incorrect custom SQL for insert in  Entity: " + className,
 				"INSERT INTO FOO (name) VALUES (?)", insertQuery );
-		
+
 		assertEquals( "Incorrect custom SQL for delete in  Entity: " + className,
 				"DELETE FROM FOO WHERE id = ?", deleteQuery );
-		
+
 		assertEquals( "Incorrect custom SQL for update in  Entity: " + className,
 				"UPDATE FOO SET name = ? WHERE id = ?", updateQuery );
 
@@ -97,7 +95,7 @@ public static class CustomEntity {
 
 		private String name;
 	}
-	
+
 	@Entity(name = "Dummy")
 	@Table(name = "FOO")
 	public static class Dummy {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java
index 81ea35813666..b4f9661d5be3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
@@ -41,17 +39,17 @@ public void testSchemaNotReplacedInCustomSQL(SessionFactoryScope scope) throws E
 
 		String className = CustomEntity.class.getName();
 
-        final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className);
+		final AbstractEntityPersister persister = (AbstractEntityPersister) scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(className);
 		String insertQuery = ( (JdbcMutationOperation) persister.getInsertCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 		String updateQuery = ( (JdbcMutationOperation) persister.getUpdateCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 		String deleteQuery = ( (JdbcMutationOperation) persister.getDeleteCoordinator().getStaticMutationOperationGroup().getSingleOperation() ).getSqlString();
 
 		assertEquals( "Incorrect custom SQL for insert in  Entity: " + className,
 				"INSERT INTO FOO (name, id) VALUES (?, ?)", insertQuery );
-		
+
 		assertEquals( "Incorrect custom SQL for delete in  Entity: " + className,
 				"DELETE FROM FOO WHERE id = ?", deleteQuery );
-		
+
 		assertEquals( "Incorrect custom SQL for update in  Entity: " + className,
 				"UPDATE FOO SET name = ? WHERE id = ?", updateQuery );
 
@@ -90,7 +88,7 @@ public static class CustomEntity {
 
 		private String name;
 	}
-	
+
 	@Entity(name = "Dummy")
 	@Table(name = "FOO")
 	public static class Dummy {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateEmptySchemaSubstitutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateEmptySchemaSubstitutionTest.java
index 077f7577d5da..41b84fa6e5b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateEmptySchemaSubstitutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateEmptySchemaSubstitutionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateSchemaSubstitutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateSchemaSubstitutionTest.java
index 0929176485bf..25fe12b07a69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateSchemaSubstitutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/FormulaTemplateSchemaSubstitutionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
@@ -28,7 +26,7 @@ public class FormulaTemplateSchemaSubstitutionTest extends AbstractSchemaSubstit
 	@Override
 	void validate(String formula) {
 		assertEquals( "Formula should not contain {} characters",
-					  4, formula.split( CUSTOM_SCHEMA + ".", -1 ).length - 1
+					4, formula.split( CUSTOM_SCHEMA + ".", -1 ).length - 1
 		);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java
index 928e876a47fa..fcd6720afdb4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.persister.entity;
 
 import java.util.List;
@@ -24,134 +28,134 @@
 
 @JiraKey(value = "HHH-14223")
 @Jpa(annotatedClasses = {
-        JoinFormulaImplicitJoinTest.Person.class, JoinFormulaImplicitJoinTest.PersonVersion.class
+		JoinFormulaImplicitJoinTest.Person.class, JoinFormulaImplicitJoinTest.PersonVersion.class
 }, properties = {
-        @Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
+		@Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
 })
 public class JoinFormulaImplicitJoinTest {
 
-    @BeforeEach
-    public void setUp(EntityManagerFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            final Person person = new Person();
-            entityManager.persist(person);
-
-            for (int i = 0; i < 3; i++) {
-                final PersonVersion personVersion = new PersonVersion();
-                personVersion.setName("Name" + i);
-                personVersion.setVersion(i);
-                personVersion.setPerson(person);
-                entityManager.persist(personVersion);
-            }
-        });
-    }
-
-    protected int entityCount() {
-        return 5;
-    }
-
-    @Test
-    public void testImplicitJoin(EntityManagerFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            entityManager.createQuery(
-                "SELECT person\n" +
-                    "FROM Person AS person\n" +
-                    "    LEFT JOIN FETCH person.latestPersonVersion\n" +
-                    "order by person.latestPersonVersion.id desc\n"
-            );
-        });
-    }
-
-    @Entity(name = "Person")
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @OneToMany(mappedBy = "person", cascade = CascadeType.ALL, orphanRemoval = true)
-        private List personVersions;
-
-        @ManyToOne
-        @JoinColumnsOrFormulas({
-            @JoinColumnOrFormula(
-                formula = @JoinFormula(
-                    value = "(SELECT person_version.id FROM person_version WHERE person_version.person_id = id ORDER BY person_version.version DESC LIMIT 1)",
-                    referencedColumnName = "id")
-            )
-        })
-        private PersonVersion latestPersonVersion;
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public List getPersonVersions() {
-            return personVersions;
-        }
-
-        public void setPersonVersions(List personVersions) {
-            this.personVersions = personVersions;
-        }
-
-        public PersonVersion getLatestPersonVersion() {
-            return latestPersonVersion;
-        }
-
-        public void setLatestPersonVersion(PersonVersion latestPersonVersion) {
-            this.latestPersonVersion = latestPersonVersion;
-        }
-    }
-
-    @Entity(name = "PersonVersion")
-    public static class PersonVersion {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String name;
-
-        private Integer version;
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        @JoinColumn(name = "person_id")
-        private Person person;
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Integer getVersion() {
-            return version;
-        }
-
-        public void setVersion(Integer version) {
-            this.version = version;
-        }
-
-        public Person getPerson() {
-            return person;
-        }
-
-        public void setPerson(Person person) {
-            this.person = person;
-        }
-    }
+	@BeforeEach
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			final Person person = new Person();
+			entityManager.persist(person);
+
+			for (int i = 0; i < 3; i++) {
+				final PersonVersion personVersion = new PersonVersion();
+				personVersion.setName("Name" + i);
+				personVersion.setVersion(i);
+				personVersion.setPerson(person);
+				entityManager.persist(personVersion);
+			}
+		});
+	}
+
+	protected int entityCount() {
+		return 5;
+	}
+
+	@Test
+	public void testImplicitJoin(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			entityManager.createQuery(
+				"SELECT person\n" +
+					"FROM Person AS person\n" +
+					"    LEFT JOIN FETCH person.latestPersonVersion\n" +
+					"order by person.latestPersonVersion.id desc\n"
+			);
+		});
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@OneToMany(mappedBy = "person", cascade = CascadeType.ALL, orphanRemoval = true)
+		private List personVersions;
+
+		@ManyToOne
+		@JoinColumnsOrFormulas({
+			@JoinColumnOrFormula(
+				formula = @JoinFormula(
+					value = "(SELECT person_version.id FROM person_version WHERE person_version.person_id = id ORDER BY person_version.version DESC LIMIT 1)",
+					referencedColumnName = "id")
+			)
+		})
+		private PersonVersion latestPersonVersion;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public List getPersonVersions() {
+			return personVersions;
+		}
+
+		public void setPersonVersions(List personVersions) {
+			this.personVersions = personVersions;
+		}
+
+		public PersonVersion getLatestPersonVersion() {
+			return latestPersonVersion;
+		}
+
+		public void setLatestPersonVersion(PersonVersion latestPersonVersion) {
+			this.latestPersonVersion = latestPersonVersion;
+		}
+	}
+
+	@Entity(name = "PersonVersion")
+	public static class PersonVersion {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		private Integer version;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name = "person_id")
+		private Person person;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Integer getVersion() {
+			return version;
+		}
+
+		public void setVersion(Integer version) {
+			this.version = version;
+		}
+
+		public Person getPerson() {
+			return person;
+		}
+
+		public void setPerson(Person person) {
+			this.person = person;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java
index f17304776ca8..0486a0aa0eb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.persister.entity;
 
 import jakarta.persistence.Entity;
@@ -27,155 +31,155 @@
 
 @JiraKey(value = "HHH-16979")
 @Jpa(annotatedClasses = {
-        JoinedInheritanceImplicitJoinTest.MasterEntity.class,
-        JoinedInheritanceImplicitJoinTest.ChildEntity.class,
-        JoinedInheritanceImplicitJoinTest.RelatedEntity.class
+		JoinedInheritanceImplicitJoinTest.MasterEntity.class,
+		JoinedInheritanceImplicitJoinTest.ChildEntity.class,
+		JoinedInheritanceImplicitJoinTest.RelatedEntity.class
 }, properties = {
-        @Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
+		@Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
 })
 public class JoinedInheritanceImplicitJoinTest {
 
-    @BeforeEach
-    public void setup(EntityManagerFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            final var childEntity = new ChildEntity();
-            childEntity.setMasterField("masterValue001");
-            childEntity.setChildField("childValue001");
-
-            RelatedEntity relatedEntity = new RelatedEntity();
-            relatedEntity.setRelatedField("relatedValue001");
-            relatedEntity.setChildEntity(childEntity);
-
-            RelatedEntity relatedEntity2 = new RelatedEntity();
-            relatedEntity2.setRelatedField("relatedValue002");
-            relatedEntity2.setChildEntity(childEntity);
-
-            Set relatedEntityHashSet = Set.of(relatedEntity, relatedEntity2);
-
-            childEntity.setRelatedEntitySet(relatedEntityHashSet);
-
-            entityManager.persist(childEntity);
-            entityManager.persist(relatedEntity);
-            entityManager.persist(relatedEntity2);
-        });
-    }
-
-    @Test
-    public void testImplicitJoinWithoutRelatedEntity(EntityManagerFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-            CriteriaQuery query = cb.createQuery(Tuple.class);
-            Root root = query.from(ChildEntity.class);
-
-            query.multiselect(
-                    root.get("masterField"),
-                    root.get("childField")
-            );
-
-            TypedQuery result = entityManager.createQuery(query);
-            List resultList = result.getResultList();
-
-            Assertions.assertFalse(resultList.isEmpty());
-        });
-    }
-
-    @Test
-    public void testImplicitJoinWithRelatedEntity(EntityManagerFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-            CriteriaQuery query = cb.createQuery(Tuple.class);
-            Root root = query.from(ChildEntity.class);
-            Join relatedEntityJoin = root.join("relatedEntitySet");
-
-            query.multiselect(
-                    root.get("masterField"),
-                    root.get("childField"),
-                    relatedEntityJoin.get("relatedField")
-            );
-
-            TypedQuery result = entityManager.createQuery(query);
-            List resultList = result.getResultList();
-
-            Assertions.assertFalse(resultList.isEmpty());
-        });
-    }
-
-    @Entity(name = "MasterEntity")
-    @Inheritance(strategy = InheritanceType.JOINED)
-    public static class MasterEntity {
-        @Id
-        @GeneratedValue
-        public Long id;
-
-        public String masterField;
-
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getMasterField() {
-            return masterField;
-        }
-
-        public void setMasterField(final String masterField) {
-            this.masterField = masterField;
-        }
-    }
-
-    @Entity(name = "ChildEntity")
-    public static class ChildEntity extends MasterEntity {
-        private String childField;
-
-        @OneToMany(mappedBy = "childEntity")
-        public Set relatedEntitySet;
-
-        public String getChildField() {
-            return childField;
-        }
-
-        public void setChildField(final String childField) {
-            this.childField = childField;
-        }
-
-        public Set getRelatedEntitySet() {
-            return relatedEntitySet;
-        }
-
-        public void setRelatedEntitySet(final Set relatedEntitySet) {
-            this.relatedEntitySet = relatedEntitySet;
-        }
-    }
-
-    @Entity(name = "RelatedEntity")
-    public static class RelatedEntity {
-        @Id
-        @GeneratedValue
-        public Long id;
-
-        public String relatedField;
-
-        @ManyToOne
-        public ChildEntity childEntity;
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getRelatedField() {
-            return relatedField;
-        }
-
-        public void setRelatedField(final String relatedField) {
-            this.relatedField = relatedField;
-        }
-
-        public ChildEntity getChildEntity() {
-            return childEntity;
-        }
-
-        public void setChildEntity(final ChildEntity childEntity) {
-            this.childEntity = childEntity;
-        }
-    }
+	@BeforeEach
+	public void setup(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			final var childEntity = new ChildEntity();
+			childEntity.setMasterField("masterValue001");
+			childEntity.setChildField("childValue001");
+
+			RelatedEntity relatedEntity = new RelatedEntity();
+			relatedEntity.setRelatedField("relatedValue001");
+			relatedEntity.setChildEntity(childEntity);
+
+			RelatedEntity relatedEntity2 = new RelatedEntity();
+			relatedEntity2.setRelatedField("relatedValue002");
+			relatedEntity2.setChildEntity(childEntity);
+
+			Set relatedEntityHashSet = Set.of(relatedEntity, relatedEntity2);
+
+			childEntity.setRelatedEntitySet(relatedEntityHashSet);
+
+			entityManager.persist(childEntity);
+			entityManager.persist(relatedEntity);
+			entityManager.persist(relatedEntity2);
+		});
+	}
+
+	@Test
+	public void testImplicitJoinWithoutRelatedEntity(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+			CriteriaQuery query = cb.createQuery(Tuple.class);
+			Root root = query.from(ChildEntity.class);
+
+			query.multiselect(
+					root.get("masterField"),
+					root.get("childField")
+			);
+
+			TypedQuery result = entityManager.createQuery(query);
+			List resultList = result.getResultList();
+
+			Assertions.assertFalse(resultList.isEmpty());
+		});
+	}
+
+	@Test
+	public void testImplicitJoinWithRelatedEntity(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+			CriteriaQuery query = cb.createQuery(Tuple.class);
+			Root root = query.from(ChildEntity.class);
+			Join relatedEntityJoin = root.join("relatedEntitySet");
+
+			query.multiselect(
+					root.get("masterField"),
+					root.get("childField"),
+					relatedEntityJoin.get("relatedField")
+			);
+
+			TypedQuery result = entityManager.createQuery(query);
+			List resultList = result.getResultList();
+
+			Assertions.assertFalse(resultList.isEmpty());
+		});
+	}
+
+	@Entity(name = "MasterEntity")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static class MasterEntity {
+		@Id
+		@GeneratedValue
+		public Long id;
+
+		public String masterField;
+
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getMasterField() {
+			return masterField;
+		}
+
+		public void setMasterField(final String masterField) {
+			this.masterField = masterField;
+		}
+	}
+
+	@Entity(name = "ChildEntity")
+	public static class ChildEntity extends MasterEntity {
+		private String childField;
+
+		@OneToMany(mappedBy = "childEntity")
+		public Set relatedEntitySet;
+
+		public String getChildField() {
+			return childField;
+		}
+
+		public void setChildField(final String childField) {
+			this.childField = childField;
+		}
+
+		public Set getRelatedEntitySet() {
+			return relatedEntitySet;
+		}
+
+		public void setRelatedEntitySet(final Set relatedEntitySet) {
+			this.relatedEntitySet = relatedEntitySet;
+		}
+	}
+
+	@Entity(name = "RelatedEntity")
+	public static class RelatedEntity {
+		@Id
+		@GeneratedValue
+		public Long id;
+
+		public String relatedField;
+
+		@ManyToOne
+		public ChildEntity childEntity;
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getRelatedField() {
+			return relatedField;
+		}
+
+		public void setRelatedField(final String relatedField) {
+			this.relatedField = relatedField;
+		}
+
+		public ChildEntity getChildEntity() {
+			return childEntity;
+		}
+
+		public void setChildEntity(final ChildEntity childEntity) {
+			this.childEntity = childEntity;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java
index 3a425a8de9a5..4f77c26462a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java
index 1a34270aa05c..cfe3a26f7cf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.persister.entity;
 
@@ -23,8 +21,6 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.jboss.logging.Logger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java
index 6a7ee11adcb3..02883ca2567b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java
index 66d5cf254a52..79b2a2cd2dc2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java
index d1ae8ad8048a..598cee2dec80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.polymorphic;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java
index 403b2be10cbd..95880c0137e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java
index b5f9354d136a..1948049ec553 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.polymorphic;
 
 import java.util.HashSet;
@@ -16,8 +20,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.TypedQuery;
 
 @DomainModel(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/UnmappedPolymorphismQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/UnmappedPolymorphismQueryTest.java
index 3de6c1423d2d..94abca70e537 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/UnmappedPolymorphismQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/UnmappedPolymorphismQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.polymorphic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
index 36e58475957f..a25880f9a0cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -29,7 +27,6 @@
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java
index a7deb4fb3024..6a7f3538cf6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Helper.java
index 90048120eb5a..5d21fa8ad7cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Helper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
index 718ee472ac1c..bb6f0a328644 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -131,7 +129,7 @@ public void init(EntityManagerFactoryScope scope) {
 					person1.setNickName( "JD" );
 					person1.setAddress( "Earth" );
 					person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-																  .toInstant( ZoneOffset.UTC ) ) );
+																.toInstant( ZoneOffset.UTC ) ) );
 
 					em.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/NumericParameterTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/NumericParameterTypeTests.java
index af2053608948..0296955f75fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/NumericParameterTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/NumericParameterTypeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java
index d391b0d15e2c..dc4993c13b37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Person.java
index 2181c719377c..4a2657e143f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -16,7 +14,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityResult;
 import jakarta.persistence.FieldResult;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedStoredProcedureQuery;
 import jakarta.persistence.OneToMany;
@@ -35,142 +32,142 @@
  * @author Vlad Mihalcea
  */
 @NamedStoredProcedureQuery(
-        name = "personAndPhonesFunction",
-        procedureName = "fn_person_and_phones",
-        resultSetMappings = "personWithPhonesMapping",
-        parameters = @StoredProcedureParameter(type = Long.class),
-        hints = @QueryHint(name = HINT_CALLABLE_FUNCTION, value = "true")
+		name = "personAndPhonesFunction",
+		procedureName = "fn_person_and_phones",
+		resultSetMappings = "personWithPhonesMapping",
+		parameters = @StoredProcedureParameter(type = Long.class),
+		hints = @QueryHint(name = HINT_CALLABLE_FUNCTION, value = "true")
 )
 @NamedNativeQuery(
-        name = "fn_person_and_phones_hana",
-        query = "select \"pr.id\", \"pr.name\", \"pr.nickName\", \"pr.address\", \"pr.createdOn\", \"pr.version\", \"ph.id\", \"ph.person_id\", \"ph.phone_number\", \"ph.valid\" from fn_person_and_phones( ? )",
-        resultSetMapping = "person_with_phones_hana"
+		name = "fn_person_and_phones_hana",
+		query = "select \"pr.id\", \"pr.name\", \"pr.nickName\", \"pr.address\", \"pr.createdOn\", \"pr.version\", \"ph.id\", \"ph.person_id\", \"ph.phone_number\", \"ph.valid\" from fn_person_and_phones( ? )",
+		resultSetMapping = "person_with_phones_hana"
 )
 @SqlResultSetMappings({
-     @SqlResultSetMapping(
-         name = "personWithPhonesMapping",
-         entities = {
-             @EntityResult(
-                 entityClass = Person.class,
-                 fields = {
-                     @FieldResult( name = "id", column = "pr.id" ),
-                     @FieldResult( name = "name", column = "pr.name" ),
-                     @FieldResult( name = "nickName", column = "pr.nickName" ),
-                     @FieldResult( name = "address", column = "pr.address" ),
-                     @FieldResult( name = "createdOn", column = "pr.createdOn" ),
-                     @FieldResult( name = "version", column = "pr.version" ),
-                 }
-             ),
-             @EntityResult(
-                 entityClass = Phone.class,
-                 fields = {
-                     @FieldResult( name = "id", column = "ph.id" ),
-                     @FieldResult( name = "person", column = "ph.person_id" ),
-                     @FieldResult( name = "number", column = "ph.phone_number" ),
-                     @FieldResult( name = "valid", column = "ph.valid" )
-                 }
-             )
-         }
-     ),
-     @SqlResultSetMapping(
-         name = "person_with_phones_hana",
-         entities = {
-             @EntityResult(
-                 entityClass = Person.class,
-                 fields = {
-                     @FieldResult( name = "id", column = "pr.id" ),
-                     @FieldResult( name = "name", column = "pr.name" ),
-                     @FieldResult( name = "nickName", column = "pr.nickName" ),
-                     @FieldResult( name = "address", column = "pr.address" ),
-                     @FieldResult( name = "createdOn", column = "pr.createdOn" ),
-                     @FieldResult( name = "version", column = "pr.version" ),
-                 }
-             ),
-             @EntityResult(
-                 entityClass = Phone.class,
-                 fields = {
-                     @FieldResult( name = "id", column = "ph.id" ),
-                     @FieldResult( name = "person", column = "ph.person_id" ),
-                     @FieldResult( name = "number", column = "ph.phone_number" ),
-                     @FieldResult( name = "valid", column = "ph.valid" )
-                 }
-             )
-         }
-     ),
+	@SqlResultSetMapping(
+		name = "personWithPhonesMapping",
+		entities = {
+			@EntityResult(
+				entityClass = Person.class,
+				fields = {
+					@FieldResult( name = "id", column = "pr.id" ),
+					@FieldResult( name = "name", column = "pr.name" ),
+					@FieldResult( name = "nickName", column = "pr.nickName" ),
+					@FieldResult( name = "address", column = "pr.address" ),
+					@FieldResult( name = "createdOn", column = "pr.createdOn" ),
+					@FieldResult( name = "version", column = "pr.version" ),
+				}
+			),
+			@EntityResult(
+				entityClass = Phone.class,
+				fields = {
+					@FieldResult( name = "id", column = "ph.id" ),
+					@FieldResult( name = "person", column = "ph.person_id" ),
+					@FieldResult( name = "number", column = "ph.phone_number" ),
+					@FieldResult( name = "valid", column = "ph.valid" )
+				}
+			)
+		}
+	),
+	@SqlResultSetMapping(
+		name = "person_with_phones_hana",
+		entities = {
+			@EntityResult(
+				entityClass = Person.class,
+				fields = {
+					@FieldResult( name = "id", column = "pr.id" ),
+					@FieldResult( name = "name", column = "pr.name" ),
+					@FieldResult( name = "nickName", column = "pr.nickName" ),
+					@FieldResult( name = "address", column = "pr.address" ),
+					@FieldResult( name = "createdOn", column = "pr.createdOn" ),
+					@FieldResult( name = "version", column = "pr.version" ),
+				}
+			),
+			@EntityResult(
+				entityClass = Phone.class,
+				fields = {
+					@FieldResult( name = "id", column = "ph.id" ),
+					@FieldResult( name = "person", column = "ph.person_id" ),
+					@FieldResult( name = "number", column = "ph.phone_number" ),
+					@FieldResult( name = "valid", column = "ph.valid" )
+				}
+			)
+		}
+	),
 })
 @Entity
 public class Person {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    private String name;
+	private String name;
 
-    private String nickName;
+	private String nickName;
 
-    private String address;
+	private String address;
 
-    @Temporal(TemporalType.TIMESTAMP )
-    private Date createdOn;
+	@Temporal(TemporalType.TIMESTAMP )
+	private Date createdOn;
 
-    @OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
-    @OrderColumn(name = "order_id")
-    private List phones = new ArrayList<>();
+	@OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
+	@OrderColumn(name = "order_id")
+	private List phones = new ArrayList<>();
 
-    @Version
-    private int version;
+	@Version
+	private int version;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::hql-examples-domain-model-example[]
 
-    public Person() {}
+	public Person() {}
 
-    public Person(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
+	public Person(Long id, String name) {
+		this.id = id;
+		this.name = name;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public String getNickName() {
-        return nickName;
-    }
+	public String getNickName() {
+		return nickName;
+	}
 
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
 
-    public String getAddress() {
-        return address;
-    }
+	public String getAddress() {
+		return address;
+	}
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
+	public void setAddress(String address) {
+		this.address = address;
+	}
 
-    public Date getCreatedOn() {
-        return createdOn;
-    }
+	public Date getCreatedOn() {
+		return createdOn;
+	}
 
-    public void setCreatedOn(Date createdOn) {
-        this.createdOn = createdOn;
-    }
+	public void setCreatedOn(Date createdOn) {
+		this.createdOn = createdOn;
+	}
 
-    public List getPhones() {
-        return phones;
-    }
+	public List getPhones() {
+		return phones;
+	}
 
-    public void addPhone(Phone phone) {
-        phones.add( phone );
-        phone.setPerson( this );
-    }
+	public void addPhone(Phone phone) {
+		phones.add( phone );
+		phone.setPerson( this );
+	}
 //tag::hql-examples-domain-model-example[]
 }
 //end::hql-examples-domain-model-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Phone.java
index 70a1ce44014f..e4d09f1998ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -22,51 +20,51 @@
 @Entity
 public class Phone {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Person person;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Person person;
 
-    @Column(name = "phone_number")
-    private String number;
+	@Column(name = "phone_number")
+	private String number;
 
-    private boolean valid;
+	private boolean valid;
 
-    @ElementCollection
-    private List repairTimestamps = new ArrayList<>(  );
+	@ElementCollection
+	private List repairTimestamps = new ArrayList<>(  );
 
-    public Phone() {}
+	public Phone() {}
 
-    public Phone(String number) {
-        this.number = number;
-    }
+	public Phone(String number) {
+		this.number = number;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getNumber() {
-        return number;
-    }
+	public String getNumber() {
+		return number;
+	}
 
-    public Person getPerson() {
-        return person;
-    }
+	public Person getPerson() {
+		return person;
+	}
 
-    public void setPerson(Person person) {
-        this.person = person;
-    }
+	public void setPerson(Person person) {
+		this.person = person;
+	}
 
-    public boolean isValid() {
-        return valid;
-    }
+	public boolean isValid() {
+		return valid;
+	}
 
-    public void setValid(boolean valid) {
-        this.valid = valid;
-    }
+	public void setValid(boolean valid) {
+		this.valid = valid;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
index 173f80432599..c3e92a6ab82b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -153,7 +151,7 @@ public void init() {
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
 			person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-														  .toInstant( ZoneOffset.UTC ) ) );
+														.toInstant( ZoneOffset.UTC ) ) );
 
 			entityManager.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
index 696125dd75f1..4e9be0e312d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -434,7 +432,7 @@ public void prepareSchema(EntityManagerFactoryScope scope) {
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
 			person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-														  .toInstant( ZoneOffset.UTC ) ) );
+														.toInstant( ZoneOffset.UTC ) ) );
 
 			entityManager.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/ProcedureParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/ProcedureParameterTests.java
index 2d605286bf14..d0a8d17abe03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/ProcedureParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/ProcedureParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java
index ee8271d04a5d..1ace850d9bd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java
index 5f88bddf64fe..c8cb627660d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java
index 34195e99af28..76ce315a2249 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -69,7 +67,7 @@ public void init(EntityManagerFactoryScope scope) {
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
 			person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-														  .toInstant( ZoneOffset.UTC ) ) );
+														.toInstant( ZoneOffset.UTC ) ) );
 
 			entityManager.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java
index 0bc12b632a75..6e6f2447b30f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -29,7 +27,6 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.Id;
 import jakarta.persistence.ParameterMode;
 import jakarta.persistence.StoredProcedureQuery;
@@ -132,7 +129,7 @@ public void init(EntityManagerFactoryScope scope) {
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
 			person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-														  .toInstant( ZoneOffset.UTC ) ) );
+														.toInstant( ZoneOffset.UTC ) ) );
 
 			entityManager.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java
index 1584e7a7912d..2c559480654f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.procedure;
 
 import java.sql.PreparedStatement;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
index 03bee8c7c0b8..8c633cbc2406 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -43,7 +41,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SybaseStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SybaseStoredProcedureTest.java
index 260c74abbf6e..38667c732a28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SybaseStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SybaseStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -78,7 +76,7 @@ public void init(EntityManagerFactoryScope scope) {
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
 			person1.setCreatedOn( Timestamp.from( LocalDateTime.of( 2000, 1, 1, 0, 0, 0 )
-														  .toInstant( ZoneOffset.UTC ) ) );
+														.toInstant( ZoneOffset.UTC ) ) );
 
 			entityManager.persist( person1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Vote.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Vote.java
index e716970e5188..50c39e2f5e32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Vote.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/Vote.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.procedure;
 
@@ -21,26 +19,26 @@
 @Table(name = "vote")
 public class Vote {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @Column(name = "vote_choice")
-    @Convert( converter = YesNoConverter.class )
-    private boolean voteChoice;
+	@Column(name = "vote_choice")
+	@Convert( converter = YesNoConverter.class )
+	private boolean voteChoice;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public boolean isVoteChoice() {
-        return voteChoice;
-    }
+	public boolean isVoteChoice() {
+		return voteChoice;
+	}
 
-    public void setVoteChoice(boolean voteChoice) {
-        this.voteChoice = voteChoice;
-    }
+	public void setVoteChoice(boolean voteChoice) {
+		this.voteChoice = voteChoice;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java
index fc7789bc06ce..d42ddc985e4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.procedure.internal;
 
 import java.util.stream.Stream;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/BasicPropertyAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/BasicPropertyAccessorTest.java
index 84821fea34c1..c2143c2d4324 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/BasicPropertyAccessorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/BasicPropertyAccessorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java
index 9901b44f4387..07e3062001e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest.java
index 7f6adfb7f9ce..ab64772309ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest2.java
index 2ade8949f045..d64698565193 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/FieldMappingWithGetterAndIsTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java
index bac201f662bb..899cb2a997f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java
index a2228691d690..8b762d72918a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java
index 0e102eb7aacb..5348350aa52e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.property;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java
index b9229956e9a3..c0d363f34a6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id$
-
 package org.hibernate.orm.test.property;
 
 import java.io.Serializable;
@@ -31,7 +26,7 @@ public class Order implements Serializable {
 
 	@OneToMany( fetch = FetchType.LAZY )
 	private Set items = new HashSet();
-	
+
 	public int getOrderNumber() {
 		return orderNumber;
 	}
@@ -39,7 +34,7 @@ public int getOrderNumber() {
 	public void setOrderNumber(int orderNumber) {
 		this.orderNumber = orderNumber;
 	}
-	
+
 	public Set getItems() {
 		return items;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/PropertyAccessStrategyMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/PropertyAccessStrategyMapTest.java
index b7faec7ae472..bee0c48dfa5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/PropertyAccessStrategyMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/PropertyAccessStrategyMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.property;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterFieldImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterFieldImplTest.java
index 3ba9276f4da0..f48f04022f92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterFieldImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterFieldImplTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.property.access.spi;
 
 import java.lang.reflect.Field;
@@ -8,7 +12,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Vlad Mihalcea
@@ -55,4 +58,4 @@ private Getter getter(String property) {
 			throw new IllegalArgumentException( e );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterMethodImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterMethodImplTest.java
index e9a72381f3e8..cda5366465a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterMethodImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/GetterMethodImplTest.java
@@ -1,20 +1,21 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.property.access.spi;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import org.hibernate.PropertyAccessException;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.property.access.spi.Getter;
-import org.hibernate.property.access.spi.GetterFieldImpl;
 import org.hibernate.property.access.spi.GetterMethodImpl;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.assertj.core.api.Assertions;
 
 public class GetterMethodImplTest {
 
@@ -117,4 +118,4 @@ private Getter getter(Class clazz, String property) {
 		final Method getterMethod = ReflectHelper.findGetterMethod( clazz, property );
 		return new GetterMethodImpl( clazz, property, getterMethod );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/SetterMethodImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/SetterMethodImplTest.java
index 60f9f8160ed9..4f80c83f9e00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/SetterMethodImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/access/spi/SetterMethodImplTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.property.access.spi;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -120,4 +124,4 @@ private Setter setter(Class clazz, String property, Class type) {
 		final Method setterMethod = ReflectHelper.findSetterMethod( clazz, property, type );
 		return new SetterMethodImpl( clazz, property, setterMethod );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java
index cfac5c35dea3..c288f0bb4e1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java
index 897f6b719039..431190ba145a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java
index e4ec886ae35e..40c508ab6b9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java
index 9545f2ec836a..8f0497a3c4e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Account.java
index 5a1b4346eadf..c22cd991eacf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Account.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Account.java 4399 2004-08-21 08:43:20Z oneovthafew $
 package org.hibernate.orm.test.propertyref.basic;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Address.java
index 469b05396346..dab6d903e61a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 4390 2004-08-20 07:54:48Z oneovthafew $
 package org.hibernate.orm.test.propertyref.basic;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java
index d36e8ccbda2f..68ecf7eb1615 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.basic;
 
@@ -50,4 +48,3 @@ public void testProperties(SessionFactoryScope scope) {
 		assertEquals( ec.getField2(), "foo2" );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/EntityClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/EntityClass.java
index 2691686b6e43..e4f0dc7fccc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/EntityClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/EntityClass.java
@@ -1,41 +1,39 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-package org.hibernate.orm.test.propertyref.basic;
-
-public class EntityClass {
-
-	private Long key;
-
-	private String field1;
-
-	private String field2;
-
-	public Long getKey() {
-		return this.key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getField2() {
-		return this.field2;
-	}
-
-	public void setField2(String field2) {
-		this.field2 = field2;
-	}
-
-	public String getField1() {
-		return this.field1;
-	}
-
-	public void setField1(String field1) {
-		this.field1 = field1;
-	}
-
-}
\ No newline at end of file
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.propertyref.basic;
+
+public class EntityClass {
+
+	private Long key;
+
+	private String field1;
+
+	private String field2;
+
+	public Long getKey() {
+		return this.key;
+	}
+
+	public void setKey(Long key) {
+		this.key = key;
+	}
+
+	public String getField2() {
+		return this.field2;
+	}
+
+	public void setField2(String field2) {
+		this.field2 = field2;
+	}
+
+	public String getField1() {
+		return this.field1;
+	}
+
+	public void setField1(String field1) {
+		this.field1 = field1;
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Group.java
index 1f1385cab34c..483ba75e68d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 7589 2005-07-21 01:56:42Z oneovthafew $
 package org.hibernate.orm.test.propertyref.basic;
 import java.util.HashSet;
 import java.util.Set;
@@ -13,7 +9,7 @@
 public class Group {
 	private String name;
 	private Set users = new HashSet();
-	
+
 	public String getName() {
 		return name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Person.java
index 57b9f20796ee..17c3fd93615a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 10396 2006-09-01 08:48:02 -0500 (Fri, 01 Sep 2006) steve.ebersole@jboss.com $
 package org.hibernate.orm.test.propertyref.basic;
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java
index 255c5577827e..f43f55dd0340 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.basic;
 
@@ -269,7 +267,7 @@ public void testJoinFetchPropertyRef(SessionFactoryScope scope) {
 	public void testForeignKeyCreation(SessionFactoryScope scope) {
 		PersistentClass classMapping = scope.getMetadataImplementor().getEntityBinding( Account.class.getName() );
 
-        Iterator foreignKeyIterator = classMapping.getTable().getForeignKeys().values().iterator();
+		Iterator foreignKeyIterator = classMapping.getTable().getForeignKeys().values().iterator();
 		boolean found = false;
 		while ( foreignKeyIterator.hasNext() ) {
 			ForeignKey element = (ForeignKey) foreignKeyIterator.next();
@@ -288,4 +286,3 @@ public void testForeignKeyCreation(SessionFactoryScope scope) {
 		assertTrue( found, "Property ref foreign key not found" );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java
index 28c4fe7cccde..7a8c15867e3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.cachedcollections;
 
@@ -77,4 +75,3 @@ public void testRetrievalOfCachedCollectionWithPropertyRefKey(SessionFactoryScop
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/ManagedObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/ManagedObject.java
index 31d17c61580b..8142106ed26a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/ManagedObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/ManagedObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.cachedcollections;
 
@@ -69,5 +67,3 @@ public void setMembers(Set members1) {
 	}
 
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Account.java
index b2a8e7c14dfb..1f90710dedb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.component.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java
index b75a93e65ccd..e9a53d22785e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.component.complete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Identity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Identity.java
index 79997ecc7596..d9a757e11625 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Identity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Identity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.component.complete;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Person.java
index 519fb0ceda77..2cd97b8f38f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.component.complete;
 
@@ -11,7 +9,7 @@
 public class Person {
 	private Long id;
 	private Identity identity;
-	
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Account.java
index 9b2c62979e45..b71fdec18c58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Account.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Account.java 6029 2005-03-06 16:34:16Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.discrim;
 
 
@@ -56,10 +52,10 @@ public void setType(char type) {
 	public Person getPerson() {
 		return person;
 	}
-	
+
 	public void setPerson(Person person) {
 		this.person = person;
 	}
-	
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Customer.java
index 4bac71990a15..b03aeeabae3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 6029 2005-03-06 16:34:16Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.discrim;
 
 
@@ -18,9 +14,9 @@ public class Customer extends Person {
 	public String getCustomerId() {
 		return customerId;
 	}
-	
+
 	public void setCustomerId(String customerId) {
 		this.customerId = customerId;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Person.java
index 454898a561f9..79d2bdc27fc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 6029 2005-03-06 16:34:16Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.discrim;
 
 
@@ -44,9 +40,9 @@ public void setName(String name) {
 	public String getPersonId() {
 		return personId;
 	}
-	
+
 	public void setPersonId(String personId) {
 		this.personId = personId;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java
index b3c1e14493e9..90afe0ada9d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.discrim;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Account.java
index 2a63ba97a5f1..343435ead944 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Account.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Account.java 7274 2005-06-22 17:07:29Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.joined;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/BankAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/BankAccount.java
index 8d74b1fbb995..8e40df33ff51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/BankAccount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/BankAccount.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: BankAccount.java 7274 2005-06-22 17:07:29Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java
index 1242569eefc1..3180a85bd3ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.joined;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Person.java
index 10fb663ff921..f347a1f6bd83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 7274 2005-06-22 17:07:29Z oneovthafew $
 package org.hibernate.orm.test.propertyref.inheritence.joined;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Account.java
index 2e2111facf8d..952c2d3ab294 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.union;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Customer.java
index 7392f23acbe3..3e4ee2961152 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.union;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Person.java
index 482062c58013..cb3dfdef95d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.union;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java
index 254902f7f30f..137d89a50ede 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.inheritence.union;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Account.java
index 4e0f3238fafd..204c7a2e9a92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.partial;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Identity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Identity.java
index 60b8541dd8ee..252aba662316 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Identity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Identity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.partial;
 
@@ -10,7 +8,7 @@
 public class Identity {
 	private String name;
 	private String ssn;
-	
+
 	public String getSsn() {
 		return ssn;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/PartialComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/PartialComponentPropertyRefTest.java
index 8ba69858173e..c01c8364e58f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/PartialComponentPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/PartialComponentPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.partial;
 
@@ -74,4 +72,3 @@ public void testComponentPropertyRef(SessionFactoryScope scope) {
 		} );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Person.java
index 8fd0b8a40288..71e7a68cfdd7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/partial/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.propertyref.partial;
 
@@ -10,7 +8,7 @@
 public class Person {
 	private Long id;
 	private Identity identity;
-	
+
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Container.java
index 73b7661138c1..399d8d44763f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Container.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DataPoint.java
index 7803ecc1a595..847f1b8195a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DataPoint.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DataPoint.java 10223 2006-08-04 20:29:21Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.proxy;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -76,7 +72,7 @@ public BigDecimal getY() {
 	public void setY(BigDecimal y) {
 		this.y = y;
 	}
-	
+
 	void exception() throws Exception {
 		throw new Exception("foo");
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
index 290e645ede07..ee5605669533 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.proxy;
 
 import org.hibernate.Hibernate;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java
index 84e47c55a02c..e2f5ae41c50f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
@@ -50,7 +48,7 @@ public void testInitializedProxyCanBeUnproxied(EntityManagerFactoryScope scope)
 		p.setChild( c );
 
 		scope.inTransaction( entityManager ->
-									 entityManager.persist( p )
+									entityManager.persist( p )
 		);
 
 		scope.inTransaction( entityManager -> {
@@ -84,7 +82,7 @@ public void testNotInitializedProxyCanBeUnproxiedWithInitialization(EntityManage
 		p.setChild( c );
 
 		scope.inTransaction( entityManager ->
-									 entityManager.persist( p )
+									entityManager.persist( p )
 		);
 
 		scope.inTransaction( entityManager -> {
@@ -121,7 +119,7 @@ public void testNotHibernateProxyShouldThrowException(EntityManagerFactoryScope
 		p.setChild( c );
 
 		scope.inTransaction( entityManager ->
-									 entityManager.persist( p )
+									entityManager.persist( p )
 		);
 
 		scope.inTransaction( entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Info.java
index 3f31be062e05..b77112a4c334 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MissingSetterWithEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MissingSetterWithEnhancementTest.java
index 8747ef66aafc..a63874523da2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MissingSetterWithEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MissingSetterWithEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
@@ -37,25 +35,25 @@
 @JiraKey("HHH-14460")
 @BytecodeEnhanced
 public class MissingSetterWithEnhancementTest {
-    private ServiceRegistry serviceRegistry;
+	private ServiceRegistry serviceRegistry;
 
-    @BeforeEach
-    public void setUp() {
+	@BeforeEach
+	public void setUp() {
 		final BootstrapServiceRegistryBuilder builder = new BootstrapServiceRegistryBuilder();
 		builder.applyClassLoader( getClass().getClassLoader() );
 		serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder( builder.build() )
 				.applySettings( Environment.getProperties() )
 				.build();
-    }
+	}
 
-    @AfterEach
-    public void tearDown() {
-        if ( serviceRegistry != null ) {
-            ServiceRegistryBuilder.destroy( serviceRegistry );
-        }
-    }
+	@AfterEach
+	public void tearDown() {
+		if ( serviceRegistry != null ) {
+			ServiceRegistryBuilder.destroy( serviceRegistry );
+		}
+	}
 
-    @Test
+	@Test
 	public void testEnhancedClassMissesSetterForProperty() {
 		Configuration cfg = new Configuration();
 		cfg.addAnnotatedClass( EntityWithMissingSetter.class );
@@ -74,12 +72,12 @@ public void testEnhancedClassMissesSetterForProperty() {
 	@Entity
 	@Access(AccessType.PROPERTY)
 	public static class EntityWithMissingSetter {
-    	private Long id;
-    	@Column
+		private Long id;
+		@Column
 		@Access(AccessType.FIELD)
 		private int someInt;
 
-    	@Id
+		@Id
 		public Long getId() {
 			return id;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
index 96b510a14bc1..4b5faface4bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Owner.java
index 78260cea6311..bcc08da5165b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyAsQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyAsQueryParameterTest.java
index a6350fcce0e5..4b112161df2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyAsQueryParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyAsQueryParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java
index d52a3e21f9ab..2cbe4c0a1b22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java
index ce637290bf8e..200bb76371d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy;
 
@@ -483,9 +481,9 @@ public void testFullyLoadedPCSerialization() {
 		s.remove( container );
 		// force a snapshot retrieval of the proxied container
 		SessionImpl sImpl = ( SessionImpl ) s;
-        sImpl.getPersistenceContext().getDatabaseSnapshot(
+		sImpl.getPersistenceContext().getDatabaseSnapshot(
 				lastContainerId,
-                sImpl.getFactory().getMappingMetamodel().getEntityDescriptor(Container.class.getName())
+				sImpl.getFactory().getMappingMetamodel().getEntityDescriptor(Container.class.getName())
 		);
 		assertFalse( Hibernate.isInitialized( proxy ) );
 		t.commit();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/AbstractConcreteProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/AbstractConcreteProxyTest.java
index 36aefdf74eaa..5c7201088522 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/AbstractConcreteProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/AbstractConcreteProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.concrete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/BytecodeConcreteProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/BytecodeConcreteProxyTest.java
index 3ab4c45b6636..5d96f5426ec3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/BytecodeConcreteProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/BytecodeConcreteProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.concrete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/LazyOptionalOneToOneConcreteProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/LazyOptionalOneToOneConcreteProxyTest.java
index 6cfaaec51a54..b1c2981fc1c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/LazyOptionalOneToOneConcreteProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/LazyOptionalOneToOneConcreteProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.concrete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/ProxyConcreteProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/ProxyConcreteProxyTest.java
index 5e14d6a8c711..39dc2cd6d23c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/ProxyConcreteProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/concrete/ProxyConcreteProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.concrete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java
index cdf3e4008b68..0b89b830593a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.narrow;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/BidirectionalManyToOneNarrowingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/BidirectionalManyToOneNarrowingTest.java
index 857df4cf3f3b..c07891f84730 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/BidirectionalManyToOneNarrowingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/BidirectionalManyToOneNarrowingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.narrow;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java
index 75fd12e01717..77dc90b5915c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.narrow;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java
index 634fb860e668..d86af759bb64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.narrow;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java
index 51cc64e8498e..d735b7b0bf92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.proxy.narrow;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/MetadataCopyingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/MetadataCopyingTest.java
index 068ffc68ce2d..130757359466 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/MetadataCopyingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/MetadataCopyingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quarkus;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/package-info.java
index 255814f14a97..b9a3e9b96d54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quarkus/package-info.java
@@ -13,4 +13,4 @@
  * of Hibernate ORM.
  * It's acceptable to occasionally change these, but please ensure there's
  * a plan for progress that works for both projects.
- */
\ No newline at end of file
+ */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java
index 32fbf7ad0238..2c4e917f6680 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java
index 0f781e8c0bfe..09f5be69a871 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java
index bfded03e14e6..23c8614cce59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.io.Serializable;
@@ -14,7 +18,6 @@
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
-import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
 @JiraKey(value = "HHH-15418")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CorrelatedListJoinInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CorrelatedListJoinInSubqueryTest.java
index 9a4a8fd4674c..0abfab8e4de0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CorrelatedListJoinInSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CorrelatedListJoinInSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaExpressionAsValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaExpressionAsValueTests.java
index d2e3db04309f..0d35ea212b0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaExpressionAsValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaExpressionAsValueTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaSubqueryInPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaSubqueryInPredicateTest.java
index cf1863824207..c2aaa2f72e06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaSubqueryInPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CriteriaSubqueryInPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java
index 184f6b35e7c5..932f37b5ca05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java
index cb0e022f2507..d51a8f2b2c6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EmbeddedForeignKeyInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EmbeddedForeignKeyInSubqueryTest.java
index 43e0980dcf6b..8a94f9877ac9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EmbeddedForeignKeyInSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EmbeddedForeignKeyInSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java
index 2bd37ce7c432..71495d4d31e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedInSubqueryGroupAndOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedInSubqueryGroupAndOrderTest.java
index 399668377e99..7ad7a4d031d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedInSubqueryGroupAndOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedInSubqueryGroupAndOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathInSubqueryTest.java
index 461bcd30d90f..78e4c3fdc9e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathInSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathInSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
index a267bd8c2b1d..ee82eaebd3eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java
index 66c7386b0189..eefeb9c4358d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ImplicitJoinInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ImplicitJoinInSubqueryTest.java
index d4e448feac95..50ea12774ee8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ImplicitJoinInSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ImplicitJoinInSubqueryTest.java
@@ -1,10 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -14,71 +16,70 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
-import org.assertj.core.api.Assertions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DomainModel(annotatedClasses = {
-        ImplicitJoinInSubqueryTest.A.class,
-        ImplicitJoinInSubqueryTest.B.class,
-        ImplicitJoinInSubqueryTest.C.class
+		ImplicitJoinInSubqueryTest.A.class,
+		ImplicitJoinInSubqueryTest.B.class,
+		ImplicitJoinInSubqueryTest.C.class
 })
 @SessionFactory(useCollectingStatementInspector = true)
 public class ImplicitJoinInSubqueryTest {
 
-    @Test
-    @JiraKey("HHH-16721")
-    public void testImplicitJoinInSubquery(SessionFactoryScope scope) {
-        SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
-        statementInspector.clear();
-        scope.inTransaction(
-                entityManager -> {
-                    entityManager.createSelectionQuery(
-                            "select 1 from A a where exists (select 1 from B b where a.b.c.id = 5)"
-                    ).getResultList();
-                    assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "b2_0.id=a1_0.b_id" );
-                }
-        );
-    }
+	@Test
+	@JiraKey("HHH-16721")
+	public void testImplicitJoinInSubquery(SessionFactoryScope scope) {
+		SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createSelectionQuery(
+							"select 1 from A a where exists (select 1 from B b where a.b.c.id = 5)"
+					).getResultList();
+					assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "b2_0.id=a1_0.b_id" );
+				}
+		);
+	}
 
-    @Test
-    @JiraKey("HHH-17445")
-    public void testImplicitJoinInSubquery2(SessionFactoryScope scope) {
-        SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
-        statementInspector.clear();
-        scope.inTransaction(
-                entityManager -> {
-                    entityManager.createSelectionQuery(
-                            "select a from A a where exists (select 1 from B b where a.b.c is null)"
-                    ).getResultList();
-                    assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "b1_0.c_id is null" );
-                    assertThat( statementInspector.getSqlQueries().get( 0 ) ).doesNotContain( ".id=b1_0.c_id" );
-                }
-        );
-    }
+	@Test
+	@JiraKey("HHH-17445")
+	public void testImplicitJoinInSubquery2(SessionFactoryScope scope) {
+		SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createSelectionQuery(
+							"select a from A a where exists (select 1 from B b where a.b.c is null)"
+					).getResultList();
+					assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "b1_0.c_id is null" );
+					assertThat( statementInspector.getSqlQueries().get( 0 ) ).doesNotContain( ".id=b1_0.c_id" );
+				}
+		);
+	}
 
-    @Entity(name = "A")
-    public static class A {
-        @Id
-        @GeneratedValue
-        Long id;
-        @ManyToOne(fetch = FetchType.LAZY)
-        B b;
-    }
+	@Entity(name = "A")
+	public static class A {
+		@Id
+		@GeneratedValue
+		Long id;
+		@ManyToOne(fetch = FetchType.LAZY)
+		B b;
+	}
 
-    @Entity(name = "B")
-    public static class B {
-        @Id
-        @GeneratedValue
-        Long id;
-        @ManyToOne(fetch = FetchType.LAZY)
-        C c;
-    }
+	@Entity(name = "B")
+	public static class B {
+		@Id
+		@GeneratedValue
+		Long id;
+		@ManyToOne(fetch = FetchType.LAZY)
+		C c;
+	}
 
-    @Entity(name = "C")
-    public static class C {
-        @Id
-        @GeneratedValue
-        Long id;
-    }
+	@Entity(name = "C")
+	public static class C {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java
index 260492f5fa46..a49d2b5a4a9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java
index 29ad96923f8a..944bf1ed42d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java
index d39869aed413..6b8c97fc1dc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/JoinReuseInCorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/JoinReuseInCorrelatedSubqueryTest.java
index 4cf43ad9cb82..d346d4c38e84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/JoinReuseInCorrelatedSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/JoinReuseInCorrelatedSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/LeftJoinNullnessPredicateQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/LeftJoinNullnessPredicateQueryTest.java
index 92b79bc67bdf..5cbed52886aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/LeftJoinNullnessPredicateQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/LeftJoinNullnessPredicateQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
index 674371ddbf62..332f34db4e2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
index 6ae77543e432..599a91ab11ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java
index e9a4875c89ca..01efc29a6177 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -31,9 +28,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MultipleJoinFetchesDifferentAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MultipleJoinFetchesDifferentAliasTest.java
index ba533e98f6a7..4fe61b56e240 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MultipleJoinFetchesDifferentAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MultipleJoinFetchesDifferentAliasTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NamedParameterInSelectAndWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NamedParameterInSelectAndWhereTest.java
index 58b0b77a65c5..9500202671b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NamedParameterInSelectAndWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NamedParameterInSelectAndWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java
index 9eb5f4fcfa20..880028679b69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
index ba33b6129d56..3b8709e45842 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
index dda9ed14a79e..0c494131f034 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java
index eb3b2a87fe49..286787313381 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java
index f9996cd40071..0959c7717252 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
index bcf7470bd4f8..616ac5a85043 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java
index 70fd5d0b143f..6e6bc480d924 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -186,4 +184,4 @@ public Order getOrder() {
 			return order;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OracleNumericTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OracleNumericTypesTest.java
index 7bb06499a43a..b41f5b536d67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OracleNumericTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OracleNumericTypesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import org.hibernate.dialect.OracleDialect;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java
index fe657e9683c2..aefd7e0a3fd4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java
index 27163a063f39..ab06793d79b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QuerySqlExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QuerySqlExceptionTest.java
index c070f730d5a4..cd9ce925fb6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QuerySqlExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QuerySqlExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
index 560f9f9505ff..4286790f049a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryToManyWithNestedToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryToManyWithNestedToOneTest.java
index 4c870bab4981..43cb7286f71c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryToManyWithNestedToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryToManyWithNestedToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadEntityTest.java
index fd9ad9012dad..d4d55d955b9b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest.java
index 3d8370f94fc1..b350dd9bd965 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java
index 1b6833aa358c..f4a902a36b00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java
index 155c4fac4844..520394459fa6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
index de8ca1ec840c..d9122f160822 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java
index 6fd81a79cc66..9dd3b8b6fe8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java
index ceae9817ea94..b0229f1b66e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.List;
@@ -16,7 +20,6 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 @DomainModel(
 		annotatedClasses = { SelectCaseWhenNullLiteralTest.Person.class }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectForeignKeyWithMissingFromTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectForeignKeyWithMissingFromTest.java
index 0f1cf89133b5..6d4138a47825 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectForeignKeyWithMissingFromTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectForeignKeyWithMissingFromTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java
index c4014fef4b8a..52d9a4e53ca8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java
index 50412be30b90..8c75d2432ee2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java
index 022d700ce6c0..45c1ed1a1f12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java
index 027f54e678f5..5c1d07e94956 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -230,7 +227,7 @@ private  void verifySame(T criteriaResult, T hqlResult, Consumer verifier)
 		verifier.accept( criteriaResult );
 		verifier.accept( hqlResult );
 	}
-	
+
 	/**
 	 * @author Steve Ebersole
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java
index fcb74b8a123d..35761f7650a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -31,7 +28,6 @@
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Table;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java
index d8a23fe88486..06396b1de356 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java
index f754a2c6061f..8c7db7f3f0da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -15,7 +13,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java
index 28045cf7018e..5529496bd7cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -31,10 +28,7 @@
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Table;
 import jakarta.persistence.Tuple;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java
index 794f095d580b..38369e769202 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -30,11 +27,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Table;
 import jakarta.persistence.Tuple;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java
index 115dce557440..fb73eb294548 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -30,11 +27,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Table;
 import jakarta.persistence.Tuple;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java
index 173da2ff9f5f..2a820cfe5571 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java
index 448b04497248..01bc20f46176 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java
index 3a1320840df5..08ebd66a8df2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -16,7 +14,6 @@
 import org.hibernate.query.criteria.JpaSubQuery;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java
index 4acccacb252a..d96812c997d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -19,7 +17,6 @@
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.InterpretationException;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -37,7 +34,6 @@
 import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.Root;
-import org.assertj.core.api.Assertions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TemporalParameterPlusDurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TemporalParameterPlusDurationTest.java
index 90d414624f96..4ad38877da13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TemporalParameterPlusDurationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TemporalParameterPlusDurationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.time.Duration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
index bad6aedbe73e..a560b05fb43b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import org.hibernate.query.spi.SqmQuery;
@@ -19,8 +23,6 @@
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.Root;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java
index f7040d71ba58..44c52e5425eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query;
 
@@ -75,8 +73,8 @@ public void testQueryResultsForHhh16886(SessionFactoryScope scope) {
 							.setParameter(
 									"subs",
 									Arrays.asList( new EntityWithEmbeddedSubEntity.Sub( "ZH2", "HDS" ),
-												   new EntityWithEmbeddedSubEntity.Sub( "GXZ", "HDS" ),
-												   new EntityWithEmbeddedSubEntity.Sub( "KAZ", "TST" )
+												new EntityWithEmbeddedSubEntity.Sub( "GXZ", "HDS" ),
+												new EntityWithEmbeddedSubEntity.Sub( "KAZ", "TST" )
 									)
 							)
 							.setParameter( "present", "Y" ).list();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/UnrelatedEntitiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/UnrelatedEntitiesTest.java
index 5ac6d76cb9b5..e0e84342241c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/UnrelatedEntitiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/UnrelatedEntitiesTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/count/CountTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/count/CountTest.java
index 49ece17d8107..f63945f02773 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/count/CountTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/count/CountTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.count;
 
 import jakarta.persistence.Entity;
@@ -23,130 +27,130 @@
 @DomainModel(annotatedClasses = {CountTest.Book.class, CountTest.Author.class, CountTest.Publisher.class})
 public class CountTest {
 
-    @Test void testCount(SessionFactoryScope scope) {
-        scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
-        scope.inTransaction(session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        scope.inSession(session -> {
-            assertEquals(1L,
-                    session.createSelectionQuery("from Book where title like 'Hibernate%'", Book.class)
-                            .getResultCount());
-            assertEquals(2L,
-                    session.createSelectionQuery("from Book where title like '%Hibernate%'", Book.class)
-                            .getResultCount());
-            assertEquals(1L,
-                    session.createSelectionQuery("select isbn, title from Book where title like 'Hibernate%'", String.class)
-                            .getResultCount());
-            assertEquals(1L,
-                    session.createSelectionQuery("from Book where title like :title", Book.class)
-                            .setParameter("title", "Hibernate%")
-                            .getResultCount());
-            assertEquals(0L,
-                    session.createSelectionQuery("from Book where title like :title", Book.class)
-                            .setParameter("title", "Jibernate%")
-                            .getResultCount());
-            assertEquals(2L,
-                    session.createSelectionQuery("select title from Book where title like '%Hibernate' union select title from Book where title like 'Hibernate%'", String.class)
-                            .getResultCount());
-            assertEquals(2L,
-                    session.createSelectionQuery("from Book left join fetch authors left join fetch publisher", Book.class)
-                            .getResultCount());
-            assertEquals(0L,
-                    session.createSelectionQuery("from Book join fetch publisher", Book.class)
-                            .getResultCount());
-        });
-    }
+	@Test void testCount(SessionFactoryScope scope) {
+		scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
+		scope.inTransaction(session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		scope.inSession(session -> {
+			assertEquals(1L,
+					session.createSelectionQuery("from Book where title like 'Hibernate%'", Book.class)
+							.getResultCount());
+			assertEquals(2L,
+					session.createSelectionQuery("from Book where title like '%Hibernate%'", Book.class)
+							.getResultCount());
+			assertEquals(1L,
+					session.createSelectionQuery("select isbn, title from Book where title like 'Hibernate%'", String.class)
+							.getResultCount());
+			assertEquals(1L,
+					session.createSelectionQuery("from Book where title like :title", Book.class)
+							.setParameter("title", "Hibernate%")
+							.getResultCount());
+			assertEquals(0L,
+					session.createSelectionQuery("from Book where title like :title", Book.class)
+							.setParameter("title", "Jibernate%")
+							.getResultCount());
+			assertEquals(2L,
+					session.createSelectionQuery("select title from Book where title like '%Hibernate' union select title from Book where title like 'Hibernate%'", String.class)
+							.getResultCount());
+			assertEquals(2L,
+					session.createSelectionQuery("from Book left join fetch authors left join fetch publisher", Book.class)
+							.getResultCount());
+			assertEquals(0L,
+					session.createSelectionQuery("from Book join fetch publisher", Book.class)
+							.getResultCount());
+		});
+	}
 
-    @Test void testCountNative(SessionFactoryScope scope) {
-        scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
-        scope.inTransaction(session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        scope.inSession(session -> {
-            assertEquals(2L,
-                    session.createNativeQuery("select title from books", String.class)
-                            .setMaxResults(1)
-                            .getResultCount());
-            assertEquals(1L,
-                    session.createNativeQuery("select title from books where title like :title", String.class)
-                            .setParameter("title", "Hibernate%")
-                            .getResultCount());
-            assertEquals(2L,
-                    session.createNativeQuery("select title from books", String.class)
-                            .setMaxResults(1)
-                            .getResultCount());
-        });
-    }
+	@Test void testCountNative(SessionFactoryScope scope) {
+		scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
+		scope.inTransaction(session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		scope.inSession(session -> {
+			assertEquals(2L,
+					session.createNativeQuery("select title from books", String.class)
+							.setMaxResults(1)
+							.getResultCount());
+			assertEquals(1L,
+					session.createNativeQuery("select title from books where title like :title", String.class)
+							.setParameter("title", "Hibernate%")
+							.getResultCount());
+			assertEquals(2L,
+					session.createNativeQuery("select title from books", String.class)
+							.setMaxResults(1)
+							.getResultCount());
+		});
+	}
 
-    @Test void testCountCriteria(SessionFactoryScope scope) {
-        scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
-        scope.inTransaction(session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder();
-        scope.inSession(session -> {
-            CriteriaQuery query1 = builder.createQuery(Book.class);
-            query1.where( builder.like( query1.from(Book.class).get("title"), "Hibernate%" ) );
-            assertEquals(1L,
-                    session.createQuery(query1)
-                            .getResultCount());
-            CriteriaQuery query2 = builder.createQuery(Book.class);
-            query2.from(Book.class);
-            assertEquals(2L,
-                    session.createQuery(query2)
-                            .setMaxResults(1)
-                            .getResultCount());
-            CriteriaQuery query3 = builder.createQuery(Book.class);
-            ParameterExpression parameter = builder.parameter(String.class);
-            query3.where( builder.like( query3.from(Book.class).get("title"), parameter ) );
-            assertEquals(1L,
-                    session.createQuery(query3)
-                            .setParameter(parameter, "Hibernate%")
-                            .getResultCount());
-            CriteriaQuery query4 = builder.createQuery(Book.class);
-            Root book = query4.from(Book.class);
-            book.fetch("authors", JoinType.INNER);
-            assertEquals(0L,
-                    session.createQuery(query4)
-                            .getResultCount());
-        });
-    }
+	@Test void testCountCriteria(SessionFactoryScope scope) {
+		scope.inTransaction(session -> session.createMutationQuery("delete Book").executeUpdate());
+		scope.inTransaction(session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder();
+		scope.inSession(session -> {
+			CriteriaQuery query1 = builder.createQuery(Book.class);
+			query1.where( builder.like( query1.from(Book.class).get("title"), "Hibernate%" ) );
+			assertEquals(1L,
+					session.createQuery(query1)
+							.getResultCount());
+			CriteriaQuery query2 = builder.createQuery(Book.class);
+			query2.from(Book.class);
+			assertEquals(2L,
+					session.createQuery(query2)
+							.setMaxResults(1)
+							.getResultCount());
+			CriteriaQuery query3 = builder.createQuery(Book.class);
+			ParameterExpression parameter = builder.parameter(String.class);
+			query3.where( builder.like( query3.from(Book.class).get("title"), parameter ) );
+			assertEquals(1L,
+					session.createQuery(query3)
+							.setParameter(parameter, "Hibernate%")
+							.getResultCount());
+			CriteriaQuery query4 = builder.createQuery(Book.class);
+			Root book = query4.from(Book.class);
+			book.fetch("authors", JoinType.INNER);
+			assertEquals(0L,
+					session.createQuery(query4)
+							.getResultCount());
+		});
+	}
 
-    @Entity(name="Book")
-    @Table(name = "books")
-    static class Book {
-        @Id String isbn;
-        String title;
+	@Entity(name="Book")
+	@Table(name = "books")
+	static class Book {
+		@Id String isbn;
+		String title;
 
-        @ManyToMany
-        List authors;
+		@ManyToMany
+		List authors;
 
-        @ManyToOne
-        Publisher publisher;
+		@ManyToOne
+		Publisher publisher;
 
-        Book(String isbn, String title) {
-            this.isbn = isbn;
-            this.title = title;
-        }
+		Book(String isbn, String title) {
+			this.isbn = isbn;
+			this.title = title;
+		}
 
-        Book() {
-        }
-    }
+		Book() {
+		}
+	}
 
-    @Entity(name="Author")
-    @Table(name = "authors")
-    static class Author {
-        @Id String ssn;
-        String name;
-    }
+	@Entity(name="Author")
+	@Table(name = "authors")
+	static class Author {
+		@Id String ssn;
+		String name;
+	}
 
-    @Entity(name="Publisher")
-    @Table(name = "pubs")
-    static class Publisher {
-        @Id String name;
-    }
+	@Entity(name="Publisher")
+	@Table(name = "pubs")
+	static class Publisher {
+		@Id String name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java
index d2a43d9a76e7..b1bb27126724 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
index aa5215dfc51d..5f281675014c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -39,11 +37,9 @@
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MappedSuperclass;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Tuple;
 import jakarta.persistence.TypedQuery;
-import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Root;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
index 25f321002347..a570429ac6be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java
index 577bcae76ecb..7f7e8575be75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteOffsetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteOffsetFetchTest.java
index d01362ad9085..8967f5f1584d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteOffsetFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteOffsetFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteUnionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteUnionTest.java
index 1daa101c489e..a5b419c15d64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteUnionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCteUnionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaGetJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaGetJoinsTest.java
index 4e19b917a053..4b615dbc873f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaGetJoinsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaGetJoinsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria;
 
 import java.util.Set;
@@ -44,8 +48,8 @@ public void testGetJoinsFiltersEntityJoin(SessionFactoryScope scope) {
 					root.join( MyEntity.class, SqmJoinType.LEFT );
 					Set> joins = root.getJoins();
 					/*
-					 	SqmEntityJoin does not implement jakarta.persistence.criteria.Join, iterating through the
-					 	result would cause a ClassCastException
+						SqmEntityJoin does not implement jakarta.persistence.criteria.Join, iterating through the
+						result would cause a ClassCastException
 
 					 */
 					assertThat( joins.size() ).isEqualTo( 1 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaInheritanceJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaInheritanceJoinTest.java
index ea30d3f4195e..84725fdc76bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaInheritanceJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaInheritanceJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -79,8 +77,8 @@ public void findAddressImplicitJoin(SessionFactoryScope scope) {
 			final Root
     addressRoot = cq.from( Address.class );
 			cq.select( addressRoot ).where(
 					cb.equal( cb.treat( addressRoot, StreetAddress.class )
-									  .get( "street" )
-									  .get( "name" ), "Via Roma" )
+									.get( "street" )
+									.get( "name" ), "Via Roma" )
 			);
 			final Address result = session.createQuery( cq ).getSingleResult();
 			assertThat( result ).isInstanceOf( StreetAddress.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
index ed63d8d23dcb..937f105ded97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java
index f8367906bc94..f9c4fab4c522 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java
index b8cdb38eeca5..24ed7207a5bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java
index dacac280da12..2e016e6130f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java
index 6f0ac9cf5460..87e088c1bef9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -41,7 +39,7 @@ public void testCriteriaInlineStringLiteralRendering() {
 		CriteriaBuilder.Case sCase = cb.selectCase();
 		Expression caseSelect =
 				sCase.when( cb.equal( animalRoot.get( "name" ), cb.literal( "kitty" ) ), cb.literal( "Cat" ) )
-				      .otherwise("escapez'moi" );
+					.otherwise("escapez'moi" );
 		criteriaQuery.multiselect( caseSelect );
 		criteriaQuery.where( cb.equal( animalRoot.get( "name" ), "myFavoriteAnimal" ) );
 		entityManager.createQuery( criteriaQuery); // would throw exception for unescaped otherwise literal in HHH-13889
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTest.java
index 38a56918ece6..62d2b773fb51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -53,7 +51,7 @@ protected Class[] getAnnotatedClasses() {
 		return new Class[] {
 			Person.class,
 			Partner.class,
-            Phone.class,
+			Phone.class,
 			Call.class,
 			CreditCardPayment.class,
 			WireTransferPayment.class,
@@ -131,7 +129,7 @@ public void init() {
 	@Test
 	public void test_criteria_typedquery_entity_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-typedquery-entity-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -149,7 +147,7 @@ public void test_criteria_typedquery_entity_example() {
 	@Test
 	public void test_criteria_typedquery_expression_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-typedquery-expression-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -163,11 +161,11 @@ public void test_criteria_typedquery_expression_example() {
 			assertEquals(1, nickNames.size());
 		});
 	}
-	
+
 	@Test
 	public void test_criteria_typedquery_multiselect_explicit_array_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-typedquery-multiselect-array-explicit-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -185,11 +183,11 @@ public void test_criteria_typedquery_multiselect_explicit_array_example() {
 			assertEquals(1, idAndNickNames.size());
 		});
 	}
-	
+
 	@Test
 	public void test_criteria_typedquery_multiselect_implicit_array_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-typedquery-multiselect-array-implicit-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -211,7 +209,7 @@ public void test_criteria_typedquery_multiselect_implicit_array_example() {
 	@Test
 	public void test_criteria_typedquery_wrapper_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-typedquery-wrapper-example[]
 
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
@@ -234,7 +232,7 @@ public void test_criteria_typedquery_wrapper_example() {
 	@Test
 	public void test_criteria_tuple_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-tuple-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -263,11 +261,11 @@ public void test_criteria_tuple_example() {
 			assertEquals(1, tuples.size());
 		});
 	}
-	
+
 	@Test
 	public void test_criteria_from_root_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::criteria-from-root-example[]
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 
@@ -280,7 +278,7 @@ public void test_criteria_from_root_example() {
 	@Test
 	public void test_criteria_from_multiple_root_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			String address = "Earth";
 			String prefix = "J%";
 			//tag::criteria-from-multiple-root-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTimeoutTest.java
index ed4bea65b1b8..49736dc85774 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
index ddecce8a8b36..8a8527414963 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
index 3dba2892db22..892792225da8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/DerivedRootExpansionUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/DerivedRootExpansionUsageTest.java
index 4c060f63bb78..63d87015a2e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/DerivedRootExpansionUsageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/DerivedRootExpansionUsageTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria;
 
 import org.hibernate.query.SemanticException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/EmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/EmptyPredicateTest.java
index dedec0e16180..5913b5440486 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/EmptyPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/EmptyPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/InsertSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/InsertSelectTests.java
index 7eb98962c0d3..091783800c46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/InsertSelectTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/InsertSelectTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -48,10 +46,10 @@ public void simpleTest(SessionFactoryScope scope) {
 	@Entity( name = "AnEntity" )
 	@Table( name = "AnEntity" )
 	public static class AnEntity {
-	    @Id
+		@Id
 		@GeneratedValue
-	    private Integer id;
-	    @Basic
+		private Integer id;
+		@Basic
 		private String name;
 
 		private AnEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/LocateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/LocateTests.java
index ba722822c21b..c0179eb802d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/LocateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/LocateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java
index eb67b65f6efb..0b118bcf0254 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
 import java.util.List;
 
-import org.hibernate.query.sqm.NodeBuilder;
 
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java
index 1b4c55c95d06..789afd4fe39a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NodeBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NodeBuilderTests.java
index cb58880dfa5a..5db7059d01c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NodeBuilderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NodeBuilderTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/PersonWrapper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/PersonWrapper.java
index f28710ac0570..87a94a6d1ebd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/PersonWrapper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/PersonWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
@@ -12,22 +10,21 @@
 //tag::criteria-typedquery-wrapper-example[]
 public class PersonWrapper {
 
-    private final Long id;
+	private final Long id;
 
-    private final String nickName;
+	private final String nickName;
 
-    public PersonWrapper(Long id, String nickName) {
-        this.id = id;
-        this.nickName = nickName;
-    }
+	public PersonWrapper(Long id, String nickName) {
+		this.id = id;
+		this.nickName = nickName;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public String getNickName() {
-        return nickName;
-    }
+	public String getNickName() {
+		return nickName;
+	}
 }
 //end::criteria-typedquery-wrapper-example[]
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/RootEntityTypeModelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/RootEntityTypeModelTest.java
index a85f35f03ad9..59ce4d59d61f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/RootEntityTypeModelTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/RootEntityTypeModelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java
index 1a0b9247b48b..0461447c36a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
index 903ae3df728e..b274011aa35a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryGroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryGroupByTest.java
index deea9122b80c..8994349b39b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryGroupByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryGroupByTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java
index d7b293713098..f44b869d7379 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java
index 505fb7058039..b183d992f25e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal;
 
-import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Order;
 
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java
index 8dda06a136b6..c23c7ba00196 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java
index 797cd33d53e0..ce7c75cd3675 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal.expression;
 
@@ -33,7 +31,7 @@
  */
 public class SearchedCaseExpressionTest extends BaseCoreFunctionalTestCase {
 
-    @Test
+	@Test
 	public void testCaseClause() {
 		doInHibernate( this::sessionFactory, session -> {
 			CriteriaBuilder cb = session.getCriteriaBuilder();
@@ -55,10 +53,10 @@ public void testCaseClause() {
 
 			Assert.assertNotNull(resultList);
 		} );
-    }
+	}
 
-    @Test
-    public void testEqualClause() {
+	@Test
+	public void testEqualClause() {
 		doInHibernate( this::sessionFactory, session -> {
 			CriteriaBuilder cb = session.getCriteriaBuilder();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java
index 06f5154f871d..e231677f2bbd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh11877;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java
index d05640e0fd13..3ada241027c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh11877;
 
 import jakarta.persistence.TypedQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java
index 3c1314a6661f..f10dacb2a9ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import java.util.Arrays;
@@ -114,8 +118,8 @@ public void testCorrelateSubQueryLeftJoin() {
 							subquery.select( subtask )
 									.where(
 											builder.or(
-												   patient.isNull(),
-												   site.in( validSites )
+												patient.isNull(),
+												site.in( validSites )
 											)
 									)
 					)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java
index 8055373ee7ef..e9063658f78f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java
index 5c231dddf746..bcb1c9bcd287 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java
index da7ef5eb7441..aaa68b058660 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import java.util.Objects;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java
index 4b33875293cd..d03a6281ebf5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java
index d4f436a2945b..675289fb9d12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java
index dcc626138238..668a00c931b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java
index f08711632ec5..7bec0d5633f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java
index b0db8bf7bad1..dea2549d9fad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13908;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java
index c7d7748503b2..83e973d9e7ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh13908;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java
index 4707e4174f00..886d85de455a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java
index 1bfda91fcf30..89a0cd3ab532 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java
index 8772ae190dc4..3095a5d89333 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java
index 9b8039afd1ad..466b47be58f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.MapJoin;
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.SetJoin;
 import jakarta.persistence.criteria.Subquery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Author.java
index c8e52f116596..772b38485530 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14916;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Book.java
index 1f1d56b37dfe..90aa0aa82d91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14916;
 
 import java.util.ArrayList;
@@ -15,7 +19,7 @@
 
 @Entity
 public class Book {
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	public Long bookId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Chapter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Chapter.java
index e12193ab0d4f..fef28f681a6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Chapter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/Chapter.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14916;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java
index 7a4bf9620d7d..1d4b27444890 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.criteria.internal.hhh14916;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java
index a40b5720f621..b31c4d911430 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Claim.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Claim.java
index fe4b2e219f45..f6111e31da83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Claim.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Claim.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/EwtAssessmentExtension.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/EwtAssessmentExtension.java
index 53440abce5ab..b2c7c5ca67b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/EwtAssessmentExtension.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/EwtAssessmentExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Extension.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Extension.java
index 13cf26f98494..6d8cc7990db6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Extension.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Extension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/GapAssessmentExtension.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/GapAssessmentExtension.java
index 02af642fe52b..37d497039af5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/GapAssessmentExtension.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/GapAssessmentExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java
index f9a5bff67038..20cdb6073f6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Settlement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Settlement.java
index d5986aa95061..8422814de88b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Settlement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Settlement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementExtension.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementExtension.java
index 5e0ec5c06a5b..a2d30632e388 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementExtension.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementStatus.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementStatus.java
index aa94c7847d86..736f643a3d56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementStatus.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementStatus.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementTask.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementTask.java
index 657821feeb2e..91b29f9b2d2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementTask.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/SettlementTask.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Task.java
index 2dd37941209c..7aea3b69b33a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Task.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/Task.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/TaskStatus.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/TaskStatus.java
index d59e41f0b928..6a9c29b6435a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/TaskStatus.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/TaskStatus.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12076;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Contract.java
index 4af1410a45aa..cd28d40c47f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Contract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Contract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12225;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java
index 424a9a993ccc..4a3931cc96e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12225;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Vehicle.java
index cdf738df7580..7d4a493d4a00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Vehicle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/Vehicle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12225;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleContract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleContract.java
index 91344e65eabd..76b3465b9bdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleContract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleContract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12225;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleTrackContract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleTrackContract.java
index 030c226a8673..42c7937e41a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleTrackContract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/VehicleTrackContract.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh12225;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java
index 860a8e9babd6..4f4b07da419b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh13670;
 
@@ -31,186 +29,186 @@
 @JiraKey(value = "HHH-13670")
 public class HHH13670Test extends BaseCoreFunctionalTestCase {
 
-    @Before
-    public void setUp() {
-        doInJPA(this::sessionFactory, em -> {
-            SubA a_1 = new SubA(1L);
-            SubA a_2 = new SubA(2L);
-            SubA a_3 = new SubA(3L);
-            SubA a_14 = em.getReference(SubA.class, 10L);
-            SubB b_4 = new SubB(4L, null);
-            SubB b_5 = new SubB(5L, a_3);
-            SubB b_6 = new SubB(6L, b_4);
-            SubB b_7 = new SubB(7L, a_14);
-
-            em.merge(a_1);
-            em.merge(a_2);
-            em.merge(a_3);
-            em.merge(b_4);
-            em.merge(b_5);
-            em.merge(b_6);
-            em.merge(b_7);
-        });
-    }
-
-    @Test
-    public void testDereferenceSuperClassAttributeInWithClause() {
-        doInJPA(this::sessionFactory, em -> {
-            em.createQuery("SELECT subB_0.id FROM SubB subB_0 LEFT JOIN subB_0.other subA_0 ON subA_0.id = subB_0.parent.id", Tuple.class).getResultList();
-        });
-    }
-
-    @Test
-    public void testRootTypeJoinWithGroupJoins() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery("SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 LEFT JOIN Super subA_0 ON subA_0.id = subB_0.parent.id ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals("Rows omitted despite optional association should have rendered a left join", 4, resultList.size());
-
-            assertEquals((Long) 4L , resultList.get(0).get(0));
-            assertEquals((Long) 5L , resultList.get(1).get(0));
-            assertEquals((Long) 6L , resultList.get(2).get(0));
-            assertEquals((Long) 7L , resultList.get(3).get(0));
-
-            assertNull(resultList.get(0).get(1, Long.class));
-            assertEquals((Long) 3L , resultList.get(1).get(1, Long.class));
-            assertEquals((Long) 4L , resultList.get(2).get(1, Long.class));
-            assertNull("Missing entry in foreign table should not be returned", resultList.get(3).get(1, Long.class));
-        });
-    }
-
-    @Test
-    public void testSubTypeJoinWithTableGroupJoins() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery("SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 LEFT JOIN SubA subA_0 ON subA_0.id = subB_0.parent.id ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals("Rows omitted despite optional association should have rendered a left join", 4, resultList.size());
-
-            assertEquals((Long) 4L, resultList.get(0).get(0));
-            assertEquals((Long) 5L, resultList.get(1).get(0));
-            assertEquals((Long) 6L, resultList.get(2).get(0));
-            assertEquals((Long) 7L, resultList.get(3).get(0));
-
-            assertNull(resultList.get(0).get(1, Long.class));
-            assertEquals((Long) 3L, resultList.get(1).get(1, Long.class));
-            assertNull("Another subtype than queried for was returned", resultList.get(2).get(1));
-            assertNull("Missing entry in foreign table should not be returned", resultList.get(3).get(1, Long.class));
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery(
-                    "SELECT  subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM subB_0.parent _synth_subquery_0 WHERE subA_0.id = _synth_subquery_0.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals(1, resultList.size());
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery2() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery(
-                    "SELECT  subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE subA_0.id = s.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals(4, resultList.size());
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery3() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery(
-                    "SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE s.id = subB_0.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals(6, resultList.size());
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery4() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery(
-                    "SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE s.id = subA_0.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
-                    .getResultList();
-
-            assertEquals(0, resultList.size());
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromWhereClause() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 WHERE subB_0.parent.id IS NOT NULL", Tuple.class)
-                    .getResultList();
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromGroupByClause() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 GROUP BY subB_0.id , subB_0.parent.id", Tuple.class)
-                    .getResultList();
-        });
-    }
-
-    @Test
-    public void testSubTypePropertyReferencedFromOrderByClause() {
-        doInJPA(this::sessionFactory, em -> {
-            List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 ORDER BY subB_0.id , subB_0.parent.id", Tuple.class)
-                    .getResultList();
-        });
-    }
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Super.class, SubA.class, SubB.class };
-    }
-
-    @Entity(name = "Super")
-    @Inheritance(strategy = InheritanceType.JOINED)
-    public static class Super {
-
-        @Id
-        @Column
-        Long id;
-
-        @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
-        @ManyToOne(targetEntity = Super.class, fetch = FetchType.LAZY)
-        SubType parent;
-
-    }
-
-    @Entity(name = "SubA")
-    public static class SubA extends Super {
-
-        SubA() {}
-
-        SubA(Long id) {
-            this.id = id;
-        }
-
-    }
-
-    @Entity(name = "SubB")
-    public static class SubB extends Super {
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        Super other;
-
-        SubB() {}
-
-        SubB(Long id, Super parent) {
-            this.id = id;
-            ((Super) this).parent = parent;
-        }
-
-    }
+	@Before
+	public void setUp() {
+		doInJPA(this::sessionFactory, em -> {
+			SubA a_1 = new SubA(1L);
+			SubA a_2 = new SubA(2L);
+			SubA a_3 = new SubA(3L);
+			SubA a_14 = em.getReference(SubA.class, 10L);
+			SubB b_4 = new SubB(4L, null);
+			SubB b_5 = new SubB(5L, a_3);
+			SubB b_6 = new SubB(6L, b_4);
+			SubB b_7 = new SubB(7L, a_14);
+
+			em.merge(a_1);
+			em.merge(a_2);
+			em.merge(a_3);
+			em.merge(b_4);
+			em.merge(b_5);
+			em.merge(b_6);
+			em.merge(b_7);
+		});
+	}
+
+	@Test
+	public void testDereferenceSuperClassAttributeInWithClause() {
+		doInJPA(this::sessionFactory, em -> {
+			em.createQuery("SELECT subB_0.id FROM SubB subB_0 LEFT JOIN subB_0.other subA_0 ON subA_0.id = subB_0.parent.id", Tuple.class).getResultList();
+		});
+	}
+
+	@Test
+	public void testRootTypeJoinWithGroupJoins() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery("SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 LEFT JOIN Super subA_0 ON subA_0.id = subB_0.parent.id ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals("Rows omitted despite optional association should have rendered a left join", 4, resultList.size());
+
+			assertEquals((Long) 4L , resultList.get(0).get(0));
+			assertEquals((Long) 5L , resultList.get(1).get(0));
+			assertEquals((Long) 6L , resultList.get(2).get(0));
+			assertEquals((Long) 7L , resultList.get(3).get(0));
+
+			assertNull(resultList.get(0).get(1, Long.class));
+			assertEquals((Long) 3L , resultList.get(1).get(1, Long.class));
+			assertEquals((Long) 4L , resultList.get(2).get(1, Long.class));
+			assertNull("Missing entry in foreign table should not be returned", resultList.get(3).get(1, Long.class));
+		});
+	}
+
+	@Test
+	public void testSubTypeJoinWithTableGroupJoins() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery("SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 LEFT JOIN SubA subA_0 ON subA_0.id = subB_0.parent.id ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals("Rows omitted despite optional association should have rendered a left join", 4, resultList.size());
+
+			assertEquals((Long) 4L, resultList.get(0).get(0));
+			assertEquals((Long) 5L, resultList.get(1).get(0));
+			assertEquals((Long) 6L, resultList.get(2).get(0));
+			assertEquals((Long) 7L, resultList.get(3).get(0));
+
+			assertNull(resultList.get(0).get(1, Long.class));
+			assertEquals((Long) 3L, resultList.get(1).get(1, Long.class));
+			assertNull("Another subtype than queried for was returned", resultList.get(2).get(1));
+			assertNull("Missing entry in foreign table should not be returned", resultList.get(3).get(1, Long.class));
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery(
+					"SELECT  subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM subB_0.parent _synth_subquery_0 WHERE subA_0.id = _synth_subquery_0.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals(1, resultList.size());
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery2() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery(
+					"SELECT  subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE subA_0.id = s.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals(4, resultList.size());
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery3() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery(
+					"SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE s.id = subB_0.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals(6, resultList.size());
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromEntityJoinInSyntheticSubquery4() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery(
+					"SELECT subB_0.id, subA_0.id, subB_0.id, subA_0.id FROM SubB subB_0 INNER JOIN SubA subA_0 ON 1=1 WHERE (EXISTS (SELECT 1 FROM Super s WHERE s.id = subA_0.parent.id)) ORDER BY subB_0.id ASC, subA_0.id ASC", Tuple.class)
+					.getResultList();
+
+			assertEquals(0, resultList.size());
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromWhereClause() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 WHERE subB_0.parent.id IS NOT NULL", Tuple.class)
+					.getResultList();
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromGroupByClause() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 GROUP BY subB_0.id , subB_0.parent.id", Tuple.class)
+					.getResultList();
+		});
+	}
+
+	@Test
+	public void testSubTypePropertyReferencedFromOrderByClause() {
+		doInJPA(this::sessionFactory, em -> {
+			List resultList = em.createQuery("SELECT subB_0.id FROM SubB subB_0 ORDER BY subB_0.id , subB_0.parent.id", Tuple.class)
+					.getResultList();
+		});
+	}
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Super.class, SubA.class, SubB.class };
+	}
+
+	@Entity(name = "Super")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static class Super {
+
+		@Id
+		@Column
+		Long id;
+
+		@JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+		@ManyToOne(targetEntity = Super.class, fetch = FetchType.LAZY)
+		SubType parent;
+
+	}
+
+	@Entity(name = "SubA")
+	public static class SubA extends Super {
+
+		SubA() {}
+
+		SubA(Long id) {
+			this.id = id;
+		}
+
+	}
+
+	@Entity(name = "SubB")
+	public static class SubB extends Super {
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		Super other;
+
+		SubB() {}
+
+		SubB(Long id, Super parent) {
+			this.id = id;
+			((Super) this).parent = parent;
+		}
+
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java
index e911447a86a7..b31227151007 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hhh13712;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java
index 3bb32b23e278..3329be9d82dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh14112;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java
index 5a3b87e0d096..e8ef18bc6123 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh14116;
 
 import java.util.Set;
@@ -33,10 +37,10 @@ protected Class[] getAnnotatedClasses() {
 	@Test
 	public void testNoExceptionThrown() {
 		doInJPA( this::sessionFactory, em -> {
-				 em.createQuery(
-						 "SELECT g FROM User u JOIN u.groups g JOIN FETCH g.permissions JOIN FETCH g.tenant where u.id = ?1", Group.class )
-						 .setParameter(1, 1L )
-						 .getResultList();
+				em.createQuery(
+						"SELECT g FROM User u JOIN u.groups g JOIN FETCH g.permissions JOIN FETCH g.tenant where u.id = ?1", Group.class )
+						.setParameter(1, 1L )
+						.getResultList();
 			}
 		);
 	}
@@ -83,4 +87,3 @@ public enum Permission {
 		EXECUTE;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java
index afd27f04c176..de2c05bbc721 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh14154;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java
index e169e3a2a043..f4382761f7a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh14156;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/BooleanSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/BooleanSubqueryTest.java
index b39b3c21e028..978dbf738aa9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/BooleanSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/BooleanSubqueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh18291;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/InvoiceBE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/InvoiceBE.java
index b6d4c1ba1aee..450782297999 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/InvoiceBE.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/InvoiceBE.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh18291;
 
 import jakarta.persistence.Column;
@@ -9,20 +13,20 @@
 @Table(name = "invoice")
 public class InvoiceBE {
 
-  @Id
+@Id
 //  @GeneratedValue
-  private long id;
+private long id;
 
-  @Column(name = "removed", nullable = false)
-  private boolean removed;
+@Column(name = "removed", nullable = false)
+private boolean removed;
 
-  public InvoiceBE setId(long id) {
-    this.id = id;
-    return this;
-  }
+public InvoiceBE setId(long id) {
+	this.id = id;
+	return this;
+}
 
-  public InvoiceBE setRemoved(boolean removed) {
-    this.removed = removed;
-    return this;
-  }
+public InvoiceBE setRemoved(boolean removed) {
+	this.removed = removed;
+	return this;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/PaidInvoiceBE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/PaidInvoiceBE.java
index 7437c2b12251..0850845cb4fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/PaidInvoiceBE.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh18291/PaidInvoiceBE.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hhh18291;
 
 import jakarta.persistence.Entity;
@@ -8,23 +12,23 @@
 
 @Entity
 @Table(
-    name = "paid_invoice")
+	name = "paid_invoice")
 public class PaidInvoiceBE {
 
-  @Id
+@Id
 //  @GeneratedValue
-  private long id;
+private long id;
 
-  @ManyToOne(optional = false, fetch = FetchType.LAZY)
-  private InvoiceBE invoice;
+@ManyToOne(optional = false, fetch = FetchType.LAZY)
+private InvoiceBE invoice;
 
-  public PaidInvoiceBE setId(long id) {
-    this.id = id;
-    return this;
-  }
+public PaidInvoiceBE setId(long id) {
+	this.id = id;
+	return this;
+}
 
-  public PaidInvoiceBE setInvoice(InvoiceBE invoice) {
-    this.invoice = invoice;
-    return this;
-  }
+public PaidInvoiceBE setInvoice(InvoiceBE invoice) {
+	this.invoice = invoice;
+	return this;
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
index 416c579456a7..9dfac4cdf60a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
index 18808396343d..57887d31da0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AliasCollisionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AliasCollisionTest.java
index 443a4e163756..9d418dcbad19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AliasCollisionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AliasCollisionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java
index 1f0960e39056..a8b317a2c673 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AvgFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AvgFunctionTest.java
index 4a758ba6f47e..75773eb583d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AvgFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AvgFunctionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.Entity;
@@ -14,38 +18,38 @@
 @SessionFactory
 public class AvgFunctionTest {
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.persist( new Score(0) );
-                    session.persist( new Score(1) );
-                    session.persist( new Score(2) );
-                    session.persist( new Score(3) );
-                    assertThat(
-                            session.createQuery("select avg(doubleValue) from ScoreForAvg", Double.class)
-                                    .getSingleResult(),
-                            is(1.5)
-                    );
-                    assertThat(
-                            session.createQuery("select avg(integerValue) from ScoreForAvg", Double.class)
-                                    .getSingleResult(),
-                            is(1.5)
-                    );
-                }
-        );
-    }
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.persist( new Score(0) );
+					session.persist( new Score(1) );
+					session.persist( new Score(2) );
+					session.persist( new Score(3) );
+					assertThat(
+							session.createQuery("select avg(doubleValue) from ScoreForAvg", Double.class)
+									.getSingleResult(),
+							is(1.5)
+					);
+					assertThat(
+							session.createQuery("select avg(integerValue) from ScoreForAvg", Double.class)
+									.getSingleResult(),
+							is(1.5)
+					);
+				}
+		);
+	}
 
-    @Entity(name="ScoreForAvg")
-    public static class Score {
-        public Score() {}
-        public Score(int value) {
-            this.doubleValue = value;
-            this.integerValue = value;
-        }
-        @Id
-        double doubleValue;
-        int integerValue;
-    }
+	@Entity(name="ScoreForAvg")
+	public static class Score {
+		public Score() {}
+		public Score(int value) {
+			this.doubleValue = value;
+			this.integerValue = value;
+		}
+		@Id
+		double doubleValue;
+		int integerValue;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseExpressionsTest.java
index a83485413bde..f7d1e70c242a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseExpressionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseExpressionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -13,7 +11,6 @@
 import org.hibernate.query.sqm.tree.expression.SqmCaseSimple;
 import org.hibernate.query.sqm.tree.expression.SqmFunction;
 import org.hibernate.query.sqm.tree.expression.SqmHqlNumericLiteral;
-import org.hibernate.query.sqm.tree.expression.SqmLiteral;
 import org.hibernate.query.sqm.tree.predicate.SqmComparisonPredicate;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java
index dba7d9b91c9d..4a892514a24e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java
index f3ecc646a7e4..70a69b34fec7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
index 7eef146edfd1..1fd11100bc44 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CharacterColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CharacterColumnTest.java
index c4c6952aae54..7fa74f7e52b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CharacterColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CharacterColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
index c425724f64b4..71d5167920b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -86,4 +84,4 @@ public void testCollateHSQL(SessionFactoryScope scope) {
 		);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
index b35e3ebea519..9c537abae769 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java
index 99260a84e037..b42885692359 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java
index d1fbfeb8f4b2..22bda3acfb66 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
index 2d2836e82ef9..e085ec8f048d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -134,4 +132,4 @@ public void testNotDistinctFromStringParam(SessionFactoryScope scope) {
 			assertEquals(1, session.createSelectionQuery("select 1 where null is not distinct from null").getResultList().size());
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicInstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicInstantiationTests.java
index 5f7e8e24b195..e0364369b214 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicInstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicInstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java
index 6ab98faaf4dd..476efb84847c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.internal.CoreMessageLogger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ElementCollectionLeftJoinSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ElementCollectionLeftJoinSubqueryTest.java
index 0bec63ef04d0..82a4c698cc4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ElementCollectionLeftJoinSubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ElementCollectionLeftJoinSubqueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
index c87c7e79ec7c..2124bf47c0b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java
index 275d0351c68c..916875a1968e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
index fc845cd67ec5..59d0e78213e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedTupleSubqueryComparisonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedTupleSubqueryComparisonTest.java
index 567b9be18cda..ce79a3fae4e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedTupleSubqueryComparisonTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedTupleSubqueryComparisonTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
index 40824c3cb14f..51779d97bdb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -24,7 +22,6 @@
 import org.hibernate.query.internal.QueryParameterBindingsImpl;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.sql.SqmTranslation;
 import org.hibernate.query.sqm.tree.SqmStatement;
@@ -58,26 +55,26 @@
 @SessionFactory
 public class EntityJoinTest {
 
-    @Test
-    public void testInnerEntityJoins(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                        // this should get financial records which have a lastUpdateBy user set
-                        List result = session.createQuery(
-                                "select r.id, c.name, u.id, u.username " +
-                                        "from FinancialRecord r " +
-                                        "   inner join r.customer c " +
-                                        "	inner join User u on r.lastUpdateBy = u.username",
-                                Object[].class
-                        ).list();
-
-                        assertThat( result.size(), is( 1 ) );
-                        Object[] steveAndAcme = result.get( 0 );
-                        assertThat( steveAndAcme[0], is( 1 ) );
-                        assertThat( steveAndAcme[1], is( "Acme" ) );
-                        assertThat( steveAndAcme[3], is( "steve" ) );
-
-            // NOTE that this leads to not really valid SQL, although some databases might support it /
+	@Test
+	public void testInnerEntityJoins(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+						// this should get financial records which have a lastUpdateBy user set
+						List result = session.createQuery(
+								"select r.id, c.name, u.id, u.username " +
+										"from FinancialRecord r " +
+										"   inner join r.customer c " +
+										"	inner join User u on r.lastUpdateBy = u.username",
+								Object[].class
+						).list();
+
+						assertThat( result.size(), is( 1 ) );
+						Object[] steveAndAcme = result.get( 0 );
+						assertThat( steveAndAcme[0], is( 1 ) );
+						assertThat( steveAndAcme[1], is( "Acme" ) );
+						assertThat( steveAndAcme[3], is( "steve" ) );
+
+			// NOTE that this leads to not really valid SQL, although some databases might support it /
 //			result = session.createQuery(
 //					"select r.id, r.customer.name, u.id, u.username " +
 //							"from FinancialRecord r " +
@@ -85,352 +82,352 @@ public void testInnerEntityJoins(SessionFactoryScope scope) {
 //			).list();
 //			assertThat( result.size(), is( 1 ) );
 
-                }
-        );
-    }
-
-    @Test
-    public void testLeftOuterEntityJoins(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    // this should get all financial records even if their lastUpdateBy user is null
-                    List result = session.createQuery(
-                            "select r.id, u.id, u.username " +
-                                    "from FinancialRecord r " +
-                                    "	left join User u on r.lastUpdateBy = u.username" +
-                                    "   order by r.id",
-                            Object[].class
-                    ).list();
-                    assertThat( result.size(), is( 2 ) );
-
-                    Object[] stevesRecord = result.get( 0 );
-                    assertThat( stevesRecord[0], is( 1 ) );
-                    assertThat( stevesRecord[2], is( "steve" ) );
-
-                    Object[] noOnesRecord = result.get( 1 );
-                    assertThat( noOnesRecord[0], is( 2 ) );
-                    assertNull( noOnesRecord[2] );
-                }
-        );
-    }
-
-    @Test
-    @JiraKey(value = "HHH-11337")
-    @SkipForDialect(dialectClass = SybaseDialect.class)
-    public void testLeftOuterEntityJoinsWithImplicitInnerJoinInSelectClause(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    // this should get all financial records even if their lastUpdateBy user is null
-                    List result = session.createQuery(
-                            "select r.id, u.id, u.username, r.customer.name " +
-                                    "from FinancialRecord r " +
-                                    "	left join User u on r.lastUpdateBy = u.username" +
-                                    "   order by r.id",
-                            Object[].class
-                    ).list();
-                    assertThat( result.size(), is( 2 ) );
-
-                    Object[] stevesRecord = result.get( 0 );
-                    assertThat( stevesRecord[0], is( 1 ) );
-                    assertThat( stevesRecord[2], is( "steve" ) );
-
-                    Object[] noOnesRecord = result.get( 1 );
-                    assertThat( noOnesRecord[0], is( 2 ) );
-                    assertNull( noOnesRecord[2] );
-                }
-        );
-    }
-
-    @Test
-    @JiraKey(value = "HHH-11340")
-    public void testJoinOnEntityJoinNode(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    // this should get all financial records even if their lastUpdateBy user is null
-                    List result = session.createQuery(
-                            "select u.username, c.name " +
-                                    "from FinancialRecord r " +
-                                    "	left join User u on r.lastUpdateBy = u.username " +
-                                    "   left join u.customer c " +
-                                    "   order by r.id",
-                            Object[].class
-                    ).list();
-                    assertThat( result.size(), is( 2 ) );
-
-                    Object[] stevesRecord = result.get( 0 );
-                    assertThat( stevesRecord[0], is( "steve" ) );
-                    assertThat( stevesRecord[1], is( "Acme" ) );
-
-                    Object[] noOnesRecord = result.get( 1 );
-                    assertNull( noOnesRecord[0] );
-                    assertNull( noOnesRecord[1] );
-                }
-        );
-    }
-
-    @Test
-    @JiraKey(value = "HHH-11538")
-    public void testNoImpliedJoinGeneratedForEqualityComparison(SessionFactoryScope scope) {
-        final String qry = "select r.id, cust.name " +
-                "from FinancialRecord r " +
-                "	join Customer cust on r.customer = cust" +
-                "   order by r.id";
-
-        scope.inTransaction(
-                (session) -> {
-                    final SessionFactoryImplementor factory = scope.getSessionFactory();
-
-                    final EntityMappingType customerEntityDescriptor = factory.getRuntimeMetamodels()
-                            .getMappingMetamodel()
-                            .findEntityDescriptor( Customer.class );
-
-                    final QueryEngine queryEngine = factory.getQueryEngine();
-
-                    final SqmStatement sqm =
-                            queryEngine.getHqlTranslator().translate( qry, null );
-
-                    final SqmTranslation sqmTranslation =
-                            queryEngine.getSqmTranslatorFactory()
-                                    .createSelectTranslator(
-                                            (SqmSelectStatement) sqm,
-                                            QueryOptions.NONE,
-                                            DomainParameterXref.EMPTY,
-                                            QueryParameterBindingsImpl.EMPTY,
-                                            new LoadQueryInfluencers( factory ),
-                                            factory,
-                                            true
-                                    )
-                                    .translate();
-
-                    final SelectStatement sqlAst = sqmTranslation.getSqlAst();
-                    final List roots = sqlAst.getQuerySpec().getFromClause().getRoots();
-                    assertThat( roots.size(), is( 1 ) );
-
-                    final TableGroup rootTableGroup = roots.get( 0 );
-                    assertThat( rootTableGroup.getTableGroupJoins().size(), is( 1 ) );
-                    assertThat( rootTableGroup.getNestedTableGroupJoins().size(), is( 1 ) );
-
-                    // An uninitialized lazy table group for the path in the on clause
-                    final TableGroupJoin nestedTableGroupJoin = rootTableGroup.getNestedTableGroupJoins().get( 0 );
-                    assertThat( nestedTableGroupJoin.getJoinedGroup(), instanceOf( LazyTableGroup.class ) );
-                    assertThat( ((LazyTableGroup) nestedTableGroupJoin.getJoinedGroup()).getUnderlyingTableGroup(), is( CoreMatchers.nullValue() ) );
-
-                    final TableGroupJoin tableGroupJoin = rootTableGroup.getTableGroupJoins().get( 0 );
-                    assertThat( tableGroupJoin.getJoinedGroup().getModelPart(), is( customerEntityDescriptor ) );
-                }
-        );
-    }
-
-    @Test
-    public void testRightOuterEntityJoins(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    // this should get all users even if they have no financial records
-                    List result = session.createQuery(
-                            "select r.id, u.id, u.username " +
-                                    "from FinancialRecord r " +
-                                    "	right join User u on r.lastUpdateBy = u.username" +
-                                    "   order by u.id",
-                            Object[].class
-                    ).list();
-
-                    assertThat( result.size(), is( 2 ) );
-
-                    Object[] steveAndAcme = result.get( 0 );
-                    assertThat( steveAndAcme[ 0 ], is( 1 ) );
-                    assertThat( steveAndAcme[ 2 ], is( "steve" ) );
-
-                    Object[] janeAndNull = result.get( 1 );
-                    assertNull( janeAndNull[ 0 ] );
-                    assertThat( janeAndNull[ 2 ], is( "jane" ) );
-                }
-        );
-    }
-
-    @Test
-    @Jira( "https://hibernate.atlassian.net/browse/HHH-16495" )
-    public void testEntityJoinWithoutPredicate(SessionFactoryScope scope) {
-        scope.inTransaction( (session) -> {
-            try {
-                // this should throw an exception since it's not a cross join
-                final List result = session.createQuery(
-                        "select r.id, u.id, u.username " +
-                        "from FinancialRecord r join User u",
-                        Object[].class
-                ).getResultList();
-                fail( "Should've thrown SemanticException" );
-            }
-            catch (Exception expected) {
-                assertThat( expected.getCause(), instanceOf( SemanticException.class ) );
-                assertThat( expected.getMessage(), CoreMatchers.containsString( "Entity join did not specify a join condition" ) );
-            }
-        } );
-    }
-
-    @Test
-    @Jira( "https://hibernate.atlassian.net/browse/HHH-16495" )
-    public void testEntityCrossJoinWithoutPredicate(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    final List result = session.createQuery(
-                            "select r.id, u.id, u.username " +
-                            "from FinancialRecord r cross join User u",
-                            Object[].class
-                    ).getResultList();
-                    assertThat( result.size(), is( 4 ) );
-                }
-        );
-    }
-
-    @BeforeEach
-    public void createTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    final Customer customer = new Customer( 1, "Acme" );
-                    session.persist( customer );
-                    session.persist( new User( 1, "steve", customer ) );
-                    session.persist( new User( 2, "jane" ) );
-                    session.persist( new FinancialRecord( 1, customer, "steve" ) );
-                    session.persist( new FinancialRecord( 2, customer, null ) );
-                }
-        );
-    }
-
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                    session.createQuery( "delete FinancialRecord" ).executeUpdate();
-                    session.createQuery( "delete User" ).executeUpdate();
-                    session.createQuery( "delete Customer" ).executeUpdate();
-                }
-        );
-    }
-
-    @Entity(name = "Customer")
-    @Table(name = "`a:customer`")
-    public static class Customer {
-        private Integer id;
-        private String name;
-
-        public Customer() {
-        }
-
-        public Customer(Integer id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        @Id
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
-
-    @Entity(name = "FinancialRecord")
-    @Table(name = "`a:financial_record`")
-    public static class FinancialRecord {
-        private Integer id;
-        private Customer customer;
-        private String lastUpdateBy;
-
-        public FinancialRecord() {
-        }
-
-        public FinancialRecord(Integer id, Customer customer, String lastUpdateBy) {
-            this.id = id;
-            this.customer = customer;
-            this.lastUpdateBy = lastUpdateBy;
-        }
-
-        @Id
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        @ManyToOne
-        @JoinColumn
-        public Customer getCustomer() {
-            return customer;
-        }
-
-        public void setCustomer(Customer customer) {
-            this.customer = customer;
-        }
-
-        public String getLastUpdateBy() {
-            return lastUpdateBy;
-        }
-
-        public void setLastUpdateBy(String lastUpdateBy) {
-            this.lastUpdateBy = lastUpdateBy;
-        }
-    }
-
-    @Entity(name = "User")
-    @Table(name = "`a:user`")
-    public static class User {
-        private Integer id;
-        private String username;
-        private Customer customer;
-
-        public User() {
-        }
-
-        public User(Integer id, String username) {
-            this.id = id;
-            this.username = username;
-        }
-
-        public User(Integer id, String username, Customer customer) {
-            this.id = id;
-            this.username = username;
-            this.customer = customer;
-        }
-
-        @Id
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        @NaturalId
-        public String getUsername() {
-            return username;
-        }
-
-        public void setUsername(String username) {
-            this.username = username;
-        }
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        public Customer getCustomer() {
-            return customer;
-        }
-
-        public void setCustomer(Customer customer) {
-            this.customer = customer;
-        }
-    }
+				}
+		);
+	}
+
+	@Test
+	public void testLeftOuterEntityJoins(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					// this should get all financial records even if their lastUpdateBy user is null
+					List result = session.createQuery(
+							"select r.id, u.id, u.username " +
+									"from FinancialRecord r " +
+									"	left join User u on r.lastUpdateBy = u.username" +
+									"   order by r.id",
+							Object[].class
+					).list();
+					assertThat( result.size(), is( 2 ) );
+
+					Object[] stevesRecord = result.get( 0 );
+					assertThat( stevesRecord[0], is( 1 ) );
+					assertThat( stevesRecord[2], is( "steve" ) );
+
+					Object[] noOnesRecord = result.get( 1 );
+					assertThat( noOnesRecord[0], is( 2 ) );
+					assertNull( noOnesRecord[2] );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey(value = "HHH-11337")
+	@SkipForDialect(dialectClass = SybaseDialect.class)
+	public void testLeftOuterEntityJoinsWithImplicitInnerJoinInSelectClause(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					// this should get all financial records even if their lastUpdateBy user is null
+					List result = session.createQuery(
+							"select r.id, u.id, u.username, r.customer.name " +
+									"from FinancialRecord r " +
+									"	left join User u on r.lastUpdateBy = u.username" +
+									"   order by r.id",
+							Object[].class
+					).list();
+					assertThat( result.size(), is( 2 ) );
+
+					Object[] stevesRecord = result.get( 0 );
+					assertThat( stevesRecord[0], is( 1 ) );
+					assertThat( stevesRecord[2], is( "steve" ) );
+
+					Object[] noOnesRecord = result.get( 1 );
+					assertThat( noOnesRecord[0], is( 2 ) );
+					assertNull( noOnesRecord[2] );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey(value = "HHH-11340")
+	public void testJoinOnEntityJoinNode(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					// this should get all financial records even if their lastUpdateBy user is null
+					List result = session.createQuery(
+							"select u.username, c.name " +
+									"from FinancialRecord r " +
+									"	left join User u on r.lastUpdateBy = u.username " +
+									"   left join u.customer c " +
+									"   order by r.id",
+							Object[].class
+					).list();
+					assertThat( result.size(), is( 2 ) );
+
+					Object[] stevesRecord = result.get( 0 );
+					assertThat( stevesRecord[0], is( "steve" ) );
+					assertThat( stevesRecord[1], is( "Acme" ) );
+
+					Object[] noOnesRecord = result.get( 1 );
+					assertNull( noOnesRecord[0] );
+					assertNull( noOnesRecord[1] );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey(value = "HHH-11538")
+	public void testNoImpliedJoinGeneratedForEqualityComparison(SessionFactoryScope scope) {
+		final String qry = "select r.id, cust.name " +
+				"from FinancialRecord r " +
+				"	join Customer cust on r.customer = cust" +
+				"   order by r.id";
+
+		scope.inTransaction(
+				(session) -> {
+					final SessionFactoryImplementor factory = scope.getSessionFactory();
+
+					final EntityMappingType customerEntityDescriptor = factory.getRuntimeMetamodels()
+							.getMappingMetamodel()
+							.findEntityDescriptor( Customer.class );
+
+					final QueryEngine queryEngine = factory.getQueryEngine();
+
+					final SqmStatement sqm =
+							queryEngine.getHqlTranslator().translate( qry, null );
+
+					final SqmTranslation sqmTranslation =
+							queryEngine.getSqmTranslatorFactory()
+									.createSelectTranslator(
+											(SqmSelectStatement) sqm,
+											QueryOptions.NONE,
+											DomainParameterXref.EMPTY,
+											QueryParameterBindingsImpl.EMPTY,
+											new LoadQueryInfluencers( factory ),
+											factory,
+											true
+									)
+									.translate();
+
+					final SelectStatement sqlAst = sqmTranslation.getSqlAst();
+					final List roots = sqlAst.getQuerySpec().getFromClause().getRoots();
+					assertThat( roots.size(), is( 1 ) );
+
+					final TableGroup rootTableGroup = roots.get( 0 );
+					assertThat( rootTableGroup.getTableGroupJoins().size(), is( 1 ) );
+					assertThat( rootTableGroup.getNestedTableGroupJoins().size(), is( 1 ) );
+
+					// An uninitialized lazy table group for the path in the on clause
+					final TableGroupJoin nestedTableGroupJoin = rootTableGroup.getNestedTableGroupJoins().get( 0 );
+					assertThat( nestedTableGroupJoin.getJoinedGroup(), instanceOf( LazyTableGroup.class ) );
+					assertThat( ((LazyTableGroup) nestedTableGroupJoin.getJoinedGroup()).getUnderlyingTableGroup(), is( CoreMatchers.nullValue() ) );
+
+					final TableGroupJoin tableGroupJoin = rootTableGroup.getTableGroupJoins().get( 0 );
+					assertThat( tableGroupJoin.getJoinedGroup().getModelPart(), is( customerEntityDescriptor ) );
+				}
+		);
+	}
+
+	@Test
+	public void testRightOuterEntityJoins(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					// this should get all users even if they have no financial records
+					List result = session.createQuery(
+							"select r.id, u.id, u.username " +
+									"from FinancialRecord r " +
+									"	right join User u on r.lastUpdateBy = u.username" +
+									"   order by u.id",
+							Object[].class
+					).list();
+
+					assertThat( result.size(), is( 2 ) );
+
+					Object[] steveAndAcme = result.get( 0 );
+					assertThat( steveAndAcme[ 0 ], is( 1 ) );
+					assertThat( steveAndAcme[ 2 ], is( "steve" ) );
+
+					Object[] janeAndNull = result.get( 1 );
+					assertNull( janeAndNull[ 0 ] );
+					assertThat( janeAndNull[ 2 ], is( "jane" ) );
+				}
+		);
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-16495" )
+	public void testEntityJoinWithoutPredicate(SessionFactoryScope scope) {
+		scope.inTransaction( (session) -> {
+			try {
+				// this should throw an exception since it's not a cross join
+				final List result = session.createQuery(
+						"select r.id, u.id, u.username " +
+						"from FinancialRecord r join User u",
+						Object[].class
+				).getResultList();
+				fail( "Should've thrown SemanticException" );
+			}
+			catch (Exception expected) {
+				assertThat( expected.getCause(), instanceOf( SemanticException.class ) );
+				assertThat( expected.getMessage(), CoreMatchers.containsString( "Entity join did not specify a join condition" ) );
+			}
+		} );
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-16495" )
+	public void testEntityCrossJoinWithoutPredicate(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					final List result = session.createQuery(
+							"select r.id, u.id, u.username " +
+							"from FinancialRecord r cross join User u",
+							Object[].class
+					).getResultList();
+					assertThat( result.size(), is( 4 ) );
+				}
+		);
+	}
+
+	@BeforeEach
+	public void createTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					final Customer customer = new Customer( 1, "Acme" );
+					session.persist( customer );
+					session.persist( new User( 1, "steve", customer ) );
+					session.persist( new User( 2, "jane" ) );
+					session.persist( new FinancialRecord( 1, customer, "steve" ) );
+					session.persist( new FinancialRecord( 2, customer, null ) );
+				}
+		);
+	}
+
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					session.createQuery( "delete FinancialRecord" ).executeUpdate();
+					session.createQuery( "delete User" ).executeUpdate();
+					session.createQuery( "delete Customer" ).executeUpdate();
+				}
+		);
+	}
+
+	@Entity(name = "Customer")
+	@Table(name = "`a:customer`")
+	public static class Customer {
+		private Integer id;
+		private String name;
+
+		public Customer() {
+		}
+
+		public Customer(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "FinancialRecord")
+	@Table(name = "`a:financial_record`")
+	public static class FinancialRecord {
+		private Integer id;
+		private Customer customer;
+		private String lastUpdateBy;
+
+		public FinancialRecord() {
+		}
+
+		public FinancialRecord(Integer id, Customer customer, String lastUpdateBy) {
+			this.id = id;
+			this.customer = customer;
+			this.lastUpdateBy = lastUpdateBy;
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		@ManyToOne
+		@JoinColumn
+		public Customer getCustomer() {
+			return customer;
+		}
+
+		public void setCustomer(Customer customer) {
+			this.customer = customer;
+		}
+
+		public String getLastUpdateBy() {
+			return lastUpdateBy;
+		}
+
+		public void setLastUpdateBy(String lastUpdateBy) {
+			this.lastUpdateBy = lastUpdateBy;
+		}
+	}
+
+	@Entity(name = "User")
+	@Table(name = "`a:user`")
+	public static class User {
+		private Integer id;
+		private String username;
+		private Customer customer;
+
+		public User() {
+		}
+
+		public User(Integer id, String username) {
+			this.id = id;
+			this.username = username;
+		}
+
+		public User(Integer id, String username, Customer customer) {
+			this.id = id;
+			this.username = username;
+			this.customer = customer;
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		@NaturalId
+		public String getUsername() {
+			return username;
+		}
+
+		public void setUsername(String username) {
+			this.username = username;
+		}
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		public Customer getCustomer() {
+			return customer;
+		}
+
+		public void setCustomer(Customer customer) {
+			this.customer = customer;
+		}
+	}
 
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EnumComparisonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EnumComparisonTest.java
index a829b1952d50..047411b28fe3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EnumComparisonTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EnumComparisonTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.Entity;
@@ -17,62 +21,62 @@
 @SessionFactory
 @DomainModel(annotatedClasses = EnumComparisonTest.WithEnum.class)
 public class EnumComparisonTest {
-    @Test
-    void test(SessionFactoryScope scope) {
-        scope.inTransaction(session -> {
-            session.createMutationQuery("delete WithEnum").executeUpdate();
-            session.persist(new WithEnum());
-            assertEquals(1,
-                    session.createSelectionQuery("from WithEnum where stringEnum > X").getResultList().size());
-            assertEquals(1,
-                    session.createSelectionQuery("from WithEnum where ordinalEnum > X").getResultList().size());
-            assertEquals(1,
-                    session.createSelectionQuery("from WithEnum where stringEnum > 'X'").getResultList().size());
-            assertEquals(1,
-                    session.createSelectionQuery("from WithEnum where ordinalEnum > 1").getResultList().size());
-            try {
-                session.createSelectionQuery("from WithEnum where ordinalEnum > 'X'").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {
-            }
-            try {
-                session.createSelectionQuery("from WithEnum where stringEnum > 1").getResultList();
-                fail();
-            }
-            catch (SemanticException se) {
-            }
-            session.createSelectionQuery("select max(ordinalEnum) from WithEnum").getSingleResult();
-            session.createSelectionQuery("select max(stringEnum) from WithEnum").getSingleResult();
-        });
-    }
+	@Test
+	void test(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			session.createMutationQuery("delete WithEnum").executeUpdate();
+			session.persist(new WithEnum());
+			assertEquals(1,
+					session.createSelectionQuery("from WithEnum where stringEnum > X").getResultList().size());
+			assertEquals(1,
+					session.createSelectionQuery("from WithEnum where ordinalEnum > X").getResultList().size());
+			assertEquals(1,
+					session.createSelectionQuery("from WithEnum where stringEnum > 'X'").getResultList().size());
+			assertEquals(1,
+					session.createSelectionQuery("from WithEnum where ordinalEnum > 1").getResultList().size());
+			try {
+				session.createSelectionQuery("from WithEnum where ordinalEnum > 'X'").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {
+			}
+			try {
+				session.createSelectionQuery("from WithEnum where stringEnum > 1").getResultList();
+				fail();
+			}
+			catch (SemanticException se) {
+			}
+			session.createSelectionQuery("select max(ordinalEnum) from WithEnum").getSingleResult();
+			session.createSelectionQuery("select max(stringEnum) from WithEnum").getSingleResult();
+		});
+	}
 
-    @Test
-    void testCase(SessionFactoryScope scope) {
-        scope.inTransaction(session -> {
-            session.createMutationQuery("delete WithEnum").executeUpdate();
-            session.persist(new WithEnum());
-            assertEquals(2,
-                    session.createSelectionQuery("select case stringEnum when X then 1 when Y then 2 when Z then 3 else -1 end from WithEnum", Integer.class)
-                            .getSingleResult());
-            assertEquals(3,
-                    session.createSelectionQuery("select case ordinalEnum when X then 1 when Y then 2 when Z then 3 else -1 end from WithEnum", Integer.class)
-                            .getSingleResult());
-        });
-    }
+	@Test
+	void testCase(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			session.createMutationQuery("delete WithEnum").executeUpdate();
+			session.persist(new WithEnum());
+			assertEquals(2,
+					session.createSelectionQuery("select case stringEnum when X then 1 when Y then 2 when Z then 3 else -1 end from WithEnum", Integer.class)
+							.getSingleResult());
+			assertEquals(3,
+					session.createSelectionQuery("select case ordinalEnum when X then 1 when Y then 2 when Z then 3 else -1 end from WithEnum", Integer.class)
+							.getSingleResult());
+		});
+	}
 
-    enum Enum { X, Y, Z }
+	enum Enum { X, Y, Z }
 
-    @Entity(name = "WithEnum")
-    static class WithEnum {
-        @Id
-        @GeneratedValue
-        long id;
+	@Entity(name = "WithEnum")
+	static class WithEnum {
+		@Id
+		@GeneratedValue
+		long id;
 
-        @Enumerated(EnumType.STRING)
-        Enum stringEnum = Enum.Y;
+		@Enumerated(EnumType.STRING)
+		Enum stringEnum = Enum.Y;
 
-        @Enumerated(EnumType.ORDINAL)
-        Enum ordinalEnum = Enum.Z;
-    }
+		@Enumerated(EnumType.ORDINAL)
+		Enum ordinalEnum = Enum.Z;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EscapeConvertedCharArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EscapeConvertedCharArrayTest.java
index e1e684b84b5a..fbd9e408755a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EscapeConvertedCharArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EscapeConvertedCharArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -134,4 +132,3 @@ public String convertToEntityAttribute(char[] dbData) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java
index 23ae1510bcc0..7208d2215897 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FromClauseTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FromClauseTests.java
index 7d7bce54917e..6f8ee062d72e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FromClauseTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FromClauseTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
index 84f9bb9c12ec..d12f327872af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionKeywordTest.java
index 7f0732060447..95bb947be37c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
index 9d17e322edd8..cb9bfe8c093e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -1666,30 +1664,30 @@ public void testDurationArithmetic(SessionFactoryScope scope) {
 							session.createQuery("select local date + 1 week", LocalDate.class)
 									.getSingleResult() );
 					assertEquals( LocalDate.now().plus(1, ChronoUnit.MONTHS),
-								  session.createQuery("select local date + 1 month", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select local date + 1 month", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.now().plus(1, ChronoUnit.YEARS),
-								  session.createQuery("select local date + 1 year", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select local date + 1 year", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.now().plus(3, ChronoUnit.MONTHS),
-								  session.createQuery("select local date + 1 quarter", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select local date + 1 quarter", LocalDate.class)
+										.getSingleResult() );
 					// Some explicit 'special' cases:
 					assertEquals( LocalDate.of(2024, 02, 29),
-								  session.createQuery("select {2024-01-31} + 1 month", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select {2024-01-31} + 1 month", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.of(2025, 02, 28),
-								  session.createQuery("select {2024-02-29} + 1 year", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select {2024-02-29} + 1 year", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.of(2028, 02, 29),
-								  session.createQuery("select {2024-02-29} + 4 year", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select {2024-02-29} + 4 year", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.of(2025, 03, 29),
-								  session.createQuery("select {2024-02-29} + 13 month", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select {2024-02-29} + 13 month", LocalDate.class)
+										.getSingleResult() );
 					assertEquals( LocalDate.of(2024, 02, 29),
-								  session.createQuery("select {2023-11-30} + 1 quarter", LocalDate.class)
-										  .getSingleResult() );
+								session.createQuery("select {2023-11-30} + 1 quarter", LocalDate.class)
+										.getSingleResult() );
 
 					session.createQuery("select e.theTimestamp - 21 second from EntityOfBasics e", java.util.Date.class)
 							.getSingleResult();
@@ -1714,7 +1712,7 @@ public void testDurationArithmetic(SessionFactoryScope scope) {
 	@SkipForDialect( dialectClass = TiDBDialect.class,
 			reason = "Bug in the TiDB timestampadd function (https://github.com/pingcap/tidb/issues/41052)")
 	@SkipForDialect( dialectClass = AltibaseDialect.class,
-	        reason = "exceeds timestampadd limit in Altibase")
+			reason = "exceeds timestampadd limit in Altibase")
 	public void testDurationArithmeticOverflowing(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2488,7 +2486,7 @@ public void testNullInCoalesce(SessionFactoryScope scope) {
 					s.createQuery("select coalesce(:word, null)", String.class)
 							.setParameter("word", "hello")
 							.getSingleResultOrNull());
-        });
+		});
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionsWithAnonymousTupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionsWithAnonymousTupleTest.java
index f93a19908977..e9a248afc808 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionsWithAnonymousTupleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionsWithAnonymousTupleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunnyNamesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunnyNamesTests.java
index 253e17283df9..24145101aa6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunnyNamesTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunnyNamesTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
index c151a78484e7..12e27b4db8c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
index 3262b5d04516..550e3650e000 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.TypedQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
index 73f8de9bd03b..433bec389933 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java
index 3f6c05ea84cf..ac5bd8d20c5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java
index 9f19fefc6c4f..d9fafaa96be1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
index 503a112535a9..dfff97720eca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest2.java
index 1e818fa7c749..69dbe79b3b08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitJoinInOnClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitJoinInOnClauseTest.java
index 058b79f32cfd..0909fcda161d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitJoinInOnClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitJoinInOnClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -22,81 +20,81 @@
  * @author Christian Beikov
  */
 @DomainModel( annotatedClasses = {
-        ImplicitJoinInOnClauseTest.RootEntity.class,
-        ImplicitJoinInOnClauseTest.FirstLevelReferencedEntity.class,
-        ImplicitJoinInOnClauseTest.SecondLevelReferencedEntityA.class,
-        ImplicitJoinInOnClauseTest.SecondLevelReferencedEntityB.class,
-        ImplicitJoinInOnClauseTest.ThirdLevelReferencedEntity.class,
-        ImplicitJoinInOnClauseTest.UnrelatedEntity.class
+		ImplicitJoinInOnClauseTest.RootEntity.class,
+		ImplicitJoinInOnClauseTest.FirstLevelReferencedEntity.class,
+		ImplicitJoinInOnClauseTest.SecondLevelReferencedEntityA.class,
+		ImplicitJoinInOnClauseTest.SecondLevelReferencedEntityB.class,
+		ImplicitJoinInOnClauseTest.ThirdLevelReferencedEntity.class,
+		ImplicitJoinInOnClauseTest.UnrelatedEntity.class
 })
 @SessionFactory
 @JiraKey( "HHH-17033" )
 public class ImplicitJoinInOnClauseTest {
 
-    @Test
-    public void testImplicitJoinInEntityJoinPredicate(SessionFactoryScope scope) {
-        scope.inTransaction(
-                (session) -> {
-                        // this should get financial records which have a lastUpdateBy user set
-                        List result = session.createQuery(
-                                "select r.id, flr.id, ur1.id, ur2.id, ur3.id from RootEntity r " +
-                                        "inner join r.firstLevelReference as flr " +
-                                        "left join UnrelatedEntity ur1 on ur1.id = flr.secondLevelReferenceA.id " +
-                                        "left join UnrelatedEntity ur2 on ur2.id = flr.secondLevelReferenceB.id " +
-                                        "left join UnrelatedEntity ur3 on ur3.id = flr.secondLevelReferenceB.thirdLevelReference.id",
-                                Object[].class
-                        ).list();
-                }
-        );
-    }
+	@Test
+	public void testImplicitJoinInEntityJoinPredicate(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+						// this should get financial records which have a lastUpdateBy user set
+						List result = session.createQuery(
+								"select r.id, flr.id, ur1.id, ur2.id, ur3.id from RootEntity r " +
+										"inner join r.firstLevelReference as flr " +
+										"left join UnrelatedEntity ur1 on ur1.id = flr.secondLevelReferenceA.id " +
+										"left join UnrelatedEntity ur2 on ur2.id = flr.secondLevelReferenceB.id " +
+										"left join UnrelatedEntity ur3 on ur3.id = flr.secondLevelReferenceB.thirdLevelReference.id",
+								Object[].class
+						).list();
+				}
+		);
+	}
 
 
-    @Entity(name = "RootEntity")
-    public static class RootEntity {
-        @Id
-        private Long id;
-        @ManyToOne
-        private FirstLevelReferencedEntity firstLevelReference;
+	@Entity(name = "RootEntity")
+	public static class RootEntity {
+		@Id
+		private Long id;
+		@ManyToOne
+		private FirstLevelReferencedEntity firstLevelReference;
 
-    }
+	}
 
-    @Entity(name = "FirstLevelReferencedEntity")
-    public static class FirstLevelReferencedEntity {
-        @Id
-        private Long id;
-        @ManyToOne
-        private SecondLevelReferencedEntityA secondLevelReferenceA;
-        @ManyToOne
-        private SecondLevelReferencedEntityB secondLevelReferenceB;
+	@Entity(name = "FirstLevelReferencedEntity")
+	public static class FirstLevelReferencedEntity {
+		@Id
+		private Long id;
+		@ManyToOne
+		private SecondLevelReferencedEntityA secondLevelReferenceA;
+		@ManyToOne
+		private SecondLevelReferencedEntityB secondLevelReferenceB;
 
-    }
-    @Entity(name = "SecondLevelReferencedEntityA")
-    public static class SecondLevelReferencedEntityA {
-        @Id
-        private Long id;
-        private String name;
-    }
+	}
+	@Entity(name = "SecondLevelReferencedEntityA")
+	public static class SecondLevelReferencedEntityA {
+		@Id
+		private Long id;
+		private String name;
+	}
 
-    @Entity(name = "SecondLevelReferencedEntityB")
-    public static class SecondLevelReferencedEntityB {
-        @Id
-        private Long id;
-        @ManyToOne
-        private ThirdLevelReferencedEntity thirdLevelReference;
-    }
+	@Entity(name = "SecondLevelReferencedEntityB")
+	public static class SecondLevelReferencedEntityB {
+		@Id
+		private Long id;
+		@ManyToOne
+		private ThirdLevelReferencedEntity thirdLevelReference;
+	}
 
-    @Entity(name = "ThirdLevelReferencedEntity")
-    public static class ThirdLevelReferencedEntity {
-        @Id
-        private Long id;
-        private String name;
+	@Entity(name = "ThirdLevelReferencedEntity")
+	public static class ThirdLevelReferencedEntity {
+		@Id
+		private Long id;
+		private String name;
 
-    }
-    @Entity(name = "UnrelatedEntity")
-    public static class UnrelatedEntity {
-        @Id
-        private Long id;
-        private String name;
-    }
+	}
+	@Entity(name = "UnrelatedEntity")
+	public static class UnrelatedEntity {
+		@Id
+		private Long id;
+		private String name;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
index 3993f2804284..718972c9b59a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
index 6fc71aa494f9..7ee1cd7b4c87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
index c1d0e83a3866..4d31711945a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertUpdateTests.java
index 3a7ce9d935fc..03cc52a065ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertUpdateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertUpdateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java
index 48ce60d8dc7e..eadbb9d7dc57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IntegerDivisionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IntegerDivisionTest.java
index 96f60ef21fef..4fe0caed3638 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IntegerDivisionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IntegerDivisionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -15,13 +19,13 @@
 @SessionFactory
 @ServiceRegistry(settings = @Setting(name = PORTABLE_INTEGER_DIVISION, value = "true"))
 public class IntegerDivisionTest {
-    @Test
-    public void testIntegerDivision(SessionFactoryScope scope) {
-        scope.inTransaction(s -> {
-            assertFalse( s.createQuery("select 1 where 1/2 = 0 and 4/3 = 1", Integer.class)
-                    .getResultList().isEmpty() );
-            assertEquals( 1, s.createQuery("select 4/3", Integer.class)
-                    .getSingleResult() );
-        });
-    }
+	@Test
+	public void testIntegerDivision(SessionFactoryScope scope) {
+		scope.inTransaction(s -> {
+			assertFalse( s.createQuery("select 1 where 1/2 = 0 and 4/3 = 1", Integer.class)
+					.getResultList().isEmpty() );
+			assertEquals( 1, s.createQuery("select 4/3", Integer.class)
+					.getSingleResult() );
+		});
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
index aca6c41c0dfb..0753e5cdf44f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -36,7 +34,7 @@ public class IsEmptyPredicateTest {
 	private final Integer personWithoutNicknameId = 1;
 	private final Integer personaWithSingleNicknameId = 2;
 	private final Integer personWithMultipleNicknamesId = 3;
-	
+
 	@Test
 	public void testEmptinessPredicates(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
@@ -66,15 +64,15 @@ protected void prepareTestData(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
 			Person personaWithoutNickname = new Person();
 			personaWithoutNickname.setId(personWithoutNicknameId);
-			
+
 			Person personaWithSingleNickname = new Person();
 			personaWithSingleNickname.getNicknames().add( "nickname" );
 			personaWithSingleNickname.setId(personaWithSingleNicknameId);
-			
+
 			Person personWithMultipleNicknames = new Person();
 			personWithMultipleNicknames.getNicknames().addAll( Arrays.asList( "nickName1", "nickName2" ) );
 			personWithMultipleNicknames.setId(personWithMultipleNicknamesId);
-			
+
 			session.persist( personaWithoutNickname );
 			session.persist( personaWithSingleNickname );
 			session.persist( personWithMultipleNicknames );
@@ -93,7 +91,7 @@ public static class Person {
 
 		@Id
 		private Integer id;
-		
+
 		@ElementCollection
 		private List nicknames = new ArrayList<>();
 
@@ -114,5 +112,3 @@ public void setNicknames(List nicknames) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java
index 2c4570eb1dad..157ffa92e282 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinedCollectionMaxIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinedCollectionMaxIdTest.java
index ebff0de40ca4..4ed3a256af05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinedCollectionMaxIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinedCollectionMaxIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasBaselineTests.java
index d5a87424f059..c69a9c9d1e40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasBaselineTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -10,7 +8,6 @@
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.ExpectedException;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasTests.java
index 373438a626bb..069e49313776 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaAliasTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaComplianceDisallowFQNTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaComplianceDisallowFQNTests.java
index 8e9e0f3277ad..da6472c65be7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaComplianceDisallowFQNTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaComplianceDisallowFQNTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.orm.test.query.sqm.BaseSqmUnitTest;
@@ -26,17 +30,17 @@ protected Class[] getAnnotatedClasses() {
 	public void testQuery() {
 		interpretSelect( String.format( "select p from %s p", Person.class.getName() ) );
 	}
-	
+
 	@Test
 	@ExpectedException(StrictJpaComplianceViolation.class)
 	public void testUpdate() {
 		interpretSelect( String.format( "update %s set numberOfToes = 0", Person.class.getName() ) );
 	}
-	
+
 	@Test
 	@ExpectedException(StrictJpaComplianceViolation.class)
 	public void testDelete() {
 		interpretSelect( String.format( "delete %s", Person.class.getName() ) );
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinBaselineTests.java
index f3307f0eb190..3b172ce75d1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinBaselineTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinBaselineTests.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
-import org.hibernate.jpa.spi.MutableJpaCompliance;
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinTests.java
index cab52028e76d..a11ea09c0fe1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JpaCrossJoinTests.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.SybaseASEDialect;
-import org.hibernate.jpa.spi.MutableJpaCompliance;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.domain.StandardDomainModel;
@@ -22,7 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Here, {@value AvailableSettings#JPA_QUERY_COMPLIANCE} should force the translation
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java
index db2259b25b42..7c2ab713b738 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
index 36f2ec490269..c067af6f7607 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java
index 80237875b058..d6bc46a9ff94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.query.SemanticException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LiteralTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LiteralTests.java
index 2aef7e6ceddc..45cfd06b2338 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LiteralTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LiteralTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java
index a1c48667fa72..c32c1b6a04ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 import org.hibernate.boot.model.FunctionContributions;
@@ -82,4 +79,4 @@ public void contributeFunctions(FunctionContributions functionContributions) {
 			);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
index 569e6bf30020..3b4a520b505e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MutationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MutationTests.java
index cefaf13c28e4..17d5468d5f80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MutationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MutationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
index e7ab6762605b..dc95a7471ee4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NotEqualComparisonOperatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NotEqualComparisonOperatorTest.java
index e2cebc69dde5..78313d999d49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NotEqualComparisonOperatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NotEqualComparisonOperatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OnKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OnKeywordTest.java
index d7c32ad073f1..f867dc8b6406 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OnKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OnKeywordTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
index d7787cda387a..7b1caa29649e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 import java.util.HashSet;
@@ -71,7 +69,7 @@ private void createData() {
 		stateProvince = new StateProvince();
 		stateProvince.setName( "IL" );
 
-	    zoo1 = new Zoo();
+		zoo1 = new Zoo();
 		zoo1.setName( "Zoo" );
 		Address address1 = new Address();
 		address1.setStreet( "1313 Mockingbird Lane" );
@@ -103,7 +101,7 @@ private void createData() {
 		zoo2Director2 = new Human();
 		zoo2Director2.setName( new Name( "Fat", 'A', "Cat" ) );
 		zoo2.getDirectors().put( "Head Honcho", zoo2Director1 );
-		zoo2.getDirectors().put( "Asst. Head Honcho", zoo2Director2 );		
+		zoo2.getDirectors().put( "Asst. Head Honcho", zoo2Director2 );
 
 		zoo3 = new Zoo();
 		zoo3.setName( "Zoo" );
@@ -180,7 +178,7 @@ private void cleanupData() {
 		}
 		if ( zoo2Director2 != null ) {
 			s.remove( zoo2Director2 );
-			zoo2Director2 = null;			
+			zoo2Director2 = null;
 		}
 		if ( stateProvince != null ) {
 			s.remove( stateProvince );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
index e443137f3db8..8295ba58628c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/PagingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/PagingTests.java
index d4d4a9e414ea..9e4457747a1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/PagingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/PagingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java
index 110ebe09a639..8217805f49a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java
index 2dafeb2e2545..d830dd67dc72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
index f82603a5062d..7be11403f4fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryPlanCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryPlanCachingTest.java
index ddc3a5862a28..a49901f38c67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryPlanCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryPlanCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SameTableAliasInSubqueryWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SameTableAliasInSubqueryWithEmbeddedTest.java
index b8b6f9616406..85ea40476ce2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SameTableAliasInSubqueryWithEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SameTableAliasInSubqueryWithEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
index 5a5d471d3cd2..ef1d596d7ad6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SelectClauseTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SelectClauseTests.java
index ee43f7fa0fa8..2234f9cd11c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SelectClauseTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SelectClauseTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java
index 9a7a92052f0e..1f0be90190f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
index 0bcc113f5bf2..4bf1b468abf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
index b9c259aef574..4a0e23f951ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
index c590485690ba..3940fa6268f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
index fb5a304e1dbd..a4ff25cdee9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneMultipleFetchesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneMultipleFetchesTest.java
index afc22cc4bf31..1bf5add363d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneMultipleFetchesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneMultipleFetchesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
index 1db85d9c8793..52e657078fc0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
index c849232e7018..2ee11964de78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java
index 5a73005fe2fa..e5ae135e00d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WhereClauseTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WhereClauseTests.java
index afb00aed1386..99e3c96f8488 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WhereClauseTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WhereClauseTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
index 365a16ba9087..89ccbfc45bf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
index 51cf75b90e1e..61f5b71a62f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql;
 
@@ -34,103 +32,103 @@
  */
 public class WithClauseJoinRewriteTest extends BaseCoreFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                AbstractObject.class,
-                AbstractConfigurationObject.class,
-                ConfigurationObject.class
-        };
-    }
-
-    @Test
-    @JiraKey(value = "HHH-11230")
-    public void testInheritanceReAliasing() {
-        Session s = openSession();
-        Transaction tx = s.beginTransaction();
-
-        // Just assert that the query is successful
-        List results = s.createQuery(
-                "SELECT usedBy.id, usedBy.name, COUNT(inverse.id) " +
-                "FROM " + AbstractConfigurationObject.class.getName() + " config " +
-                "INNER JOIN config.usedBy usedBy " +
-                "LEFT JOIN usedBy.uses inverse ON inverse.id = config.id " +
-                "WHERE config.id = 0 " +
-                "GROUP BY usedBy.id, usedBy.name",
-                Object[].class
-        ).getResultList();
-
-        tx.commit();
-        s.close();
-    }
-
-    @Entity
-    @Table( name = "config" )
-    @Inheritance( strategy = InheritanceType.JOINED )
-    public static abstract class AbstractConfigurationObject extends AbstractObject {
-
-        private String name;
-        private Set uses = new HashSet<>();
-        private Set usedBy = new HashSet<>();
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        @ManyToMany( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, cascade = {} )
-        public Set getUses () {
-            return uses;
-        }
-
-        public void setUses(Set uses) {
-            this.uses = uses;
-        }
-
-        @ManyToMany ( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, mappedBy = "uses", cascade = {} )
-        public Set getUsedBy () {
-            return usedBy;
-        }
-
-        public void setUsedBy(Set usedBy) {
-            this.usedBy = usedBy;
-        }
-    }
-
-    @Entity
-    @Table( name = "config_config" )
-    public static class ConfigurationObject extends AbstractConfigurationObject {
-
-    }
-
-    @MappedSuperclass
-    public static class AbstractObject {
-
-        private Long id;
-        private Long version;
-
-        @Id
-        @GeneratedValue
-        public Long getId () {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        @Version
-        @Column( nullable = false )
-        public Long getVersion () {
-            return version;
-        }
-
-        public void setVersion(Long version) {
-            this.version = version;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				AbstractObject.class,
+				AbstractConfigurationObject.class,
+				ConfigurationObject.class
+		};
+	}
+
+	@Test
+	@JiraKey(value = "HHH-11230")
+	public void testInheritanceReAliasing() {
+		Session s = openSession();
+		Transaction tx = s.beginTransaction();
+
+		// Just assert that the query is successful
+		List results = s.createQuery(
+				"SELECT usedBy.id, usedBy.name, COUNT(inverse.id) " +
+				"FROM " + AbstractConfigurationObject.class.getName() + " config " +
+				"INNER JOIN config.usedBy usedBy " +
+				"LEFT JOIN usedBy.uses inverse ON inverse.id = config.id " +
+				"WHERE config.id = 0 " +
+				"GROUP BY usedBy.id, usedBy.name",
+				Object[].class
+		).getResultList();
+
+		tx.commit();
+		s.close();
+	}
+
+	@Entity
+	@Table( name = "config" )
+	@Inheritance( strategy = InheritanceType.JOINED )
+	public static abstract class AbstractConfigurationObject extends AbstractObject {
+
+		private String name;
+		private Set uses = new HashSet<>();
+		private Set usedBy = new HashSet<>();
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@ManyToMany( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, cascade = {} )
+		public Set getUses () {
+			return uses;
+		}
+
+		public void setUses(Set uses) {
+			this.uses = uses;
+		}
+
+		@ManyToMany ( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, mappedBy = "uses", cascade = {} )
+		public Set getUsedBy () {
+			return usedBy;
+		}
+
+		public void setUsedBy(Set usedBy) {
+			this.usedBy = usedBy;
+		}
+	}
+
+	@Entity
+	@Table( name = "config_config" )
+	public static class ConfigurationObject extends AbstractConfigurationObject {
+
+	}
+
+	@MappedSuperclass
+	public static class AbstractObject {
+
+		private Long id;
+		private Long version;
+
+		@Id
+		@GeneratedValue
+		public Long getId () {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		@Version
+		@Column( nullable = false )
+		public Long getVersion () {
+			return version;
+		}
+
+		public void setVersion(Long version) {
+			this.version = version;
+		}
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupAndOrderByByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupAndOrderByByTest.java
index cb5e1bf63426..385adeb8b102 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupAndOrderByByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupAndOrderByByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.instantiation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupByAndParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupByAndParameterTest.java
index 0977e3ffc3a1..dc1427c13215 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupByAndParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/DynamicInstantiationWithJoinAndGroupByAndParameterTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.instantiation;
 
-import java.util.List;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithCollectionTest.java
index 7472bb928c9c..75061857fafd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithCollectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql.instantiation;
 
 import jakarta.persistence.CascadeType;
@@ -21,102 +25,102 @@
 
 @SessionFactory
 @DomainModel(annotatedClasses = {InstantiationWithCollectionTest.Entity.class,
-        InstantiationWithCollectionTest.ChildEntity.class})
+		InstantiationWithCollectionTest.ChildEntity.class})
 public class InstantiationWithCollectionTest {
 
 	@Test
 	void testElements(SessionFactoryScope scope) {
-        scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
 
-        Entity entity = new Entity("hello", "world");
-        scope.inTransaction(s -> s.persist(entity));
+		Entity entity = new Entity("hello", "world");
+		scope.inTransaction(s -> s.persist(entity));
 
 		List tuples =
-                // this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
+				// this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
 				scope.fromSession(s -> s.createSelectionQuery("select id, names from Entity", Object[].class).getResultList());
 		assertEquals(2, tuples.size());
 		tuples.forEach(tuple -> assertNotNull(tuple[0]));
 		tuples.forEach(tuple -> assertNotNull(tuple[1]));
 
-        List tuples2 =
-                scope.fromSession(s -> s.createSelectionQuery("select id, element(names) from Entity", Object[].class).getResultList());
-        assertEquals(2, tuples2.size());
-        tuples2.forEach(tuple -> assertNotNull(tuple[0]));
-        tuples2.forEach(tuple -> assertNotNull(tuple[1]));
+		List tuples2 =
+				scope.fromSession(s -> s.createSelectionQuery("select id, element(names) from Entity", Object[].class).getResultList());
+		assertEquals(2, tuples2.size());
+		tuples2.forEach(tuple -> assertNotNull(tuple[0]));
+		tuples2.forEach(tuple -> assertNotNull(tuple[1]));
 
-        List copies =
-                // this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
+		List copies =
+				// this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
 				scope.fromSession(s -> s.createSelectionQuery("select id, names from Entity", EntityCopy.class).getResultList());
 		assertEquals(2, copies.size());
 		copies.forEach(Assertions::assertNotNull);
 		copies.forEach(copy -> assertNotNull(copy.id));
 		copies.forEach(copy -> assertNotNull(copy.name));
 
-        List copies2 =
-                scope.fromSession(s -> s.createSelectionQuery("select id, element(names) from Entity", EntityCopy.class).getResultList());
-        assertEquals(2, copies2.size());
-        copies2.forEach(Assertions::assertNotNull);
-        copies2.forEach(copy -> assertNotNull(copy.id));
-        copies2.forEach(copy -> assertNotNull(copy.name));
+		List copies2 =
+				scope.fromSession(s -> s.createSelectionQuery("select id, element(names) from Entity", EntityCopy.class).getResultList());
+		assertEquals(2, copies2.size());
+		copies2.forEach(Assertions::assertNotNull);
+		copies2.forEach(copy -> assertNotNull(copy.id));
+		copies2.forEach(copy -> assertNotNull(copy.name));
 
-        List newCopies =
-                // this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
+		List newCopies =
+				// this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
 				scope.fromSession(s -> s.createSelectionQuery("select new EntityCopy(id, names) from Entity", EntityCopy.class).getResultList());
 		assertEquals(2, newCopies.size());
 		newCopies.forEach(Assertions::assertNotNull);
 		newCopies.forEach(copy -> assertNotNull(copy.id));
 		newCopies.forEach(copy -> assertNotNull(copy.name));
 
-        List newCopies2 =
-                scope.fromSession(s -> s.createSelectionQuery("select new EntityCopy(id, element(names)) from Entity", EntityCopy.class).getResultList());
-        assertEquals(2, newCopies.size());
-        newCopies2.forEach(Assertions::assertNotNull);
-        newCopies2.forEach(copy -> assertNotNull(copy.id));
-        newCopies2.forEach(copy -> assertNotNull(copy.name));
+		List newCopies2 =
+				scope.fromSession(s -> s.createSelectionQuery("select new EntityCopy(id, element(names)) from Entity", EntityCopy.class).getResultList());
+		assertEquals(2, newCopies.size());
+		newCopies2.forEach(Assertions::assertNotNull);
+		newCopies2.forEach(copy -> assertNotNull(copy.id));
+		newCopies2.forEach(copy -> assertNotNull(copy.name));
 	}
 
-    @Test
-    void testAssociation(SessionFactoryScope scope) {
-        scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
-
-        Entity entity = new Entity("hello", "world");
-        entity.children.add(new ChildEntity(entity, "goodbye"));
-        entity.children.add(new ChildEntity(entity, "gavin"));
-        scope.inTransaction(s -> s.persist(entity));
-
-        List tuples =
-                // this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
-                scope.fromSession(s -> s.createSelectionQuery("select id, children from Entity", Object[].class).getResultList());
-        assertEquals(2, tuples.size());
-        tuples.forEach(tuple -> assertNotNull(tuple[0]));
-        tuples.forEach(tuple -> assertNotNull(tuple[1]));
-
-        List tuples2 =
-                scope.fromSession(s -> s.createSelectionQuery("select id, element(children) from Entity", Object[].class).getResultList());
-        assertEquals(2, tuples2.size());
-        tuples2.forEach(tuple -> assertNotNull(tuple[0]));
-        tuples2.forEach(tuple -> assertNotNull(tuple[1]));
-
-        List tuples3 =
-                scope.fromSession(s -> s.createSelectionQuery("select id, element(children).name from Entity", Object[].class).getResultList());
-        assertEquals(2, tuples3.size());
-        tuples3.forEach(tuple -> assertNotNull(tuple[0]));
-        tuples3.forEach(tuple -> assertNotNull(tuple[1]));
-
-        List copies =
-                scope.fromSession(s -> s.createSelectionQuery("select id, element(children).name from Entity", EntityCopy.class).getResultList());
-        assertEquals(2, copies.size());
-        copies.forEach(Assertions::assertNotNull);
-        copies.forEach(copy -> assertNotNull(copy.id));
-        copies.forEach(copy -> assertNotNull(copy.name));
-
-        List newCopies =
-                scope.fromSession(s -> s.createSelectionQuery("select new EntityCopy(id, element(children).name) from Entity", EntityCopy.class).getResultList());
-        assertEquals(2, newCopies.size());
-        newCopies.forEach(Assertions::assertNotNull);
-        newCopies.forEach(copy -> assertNotNull(copy.id));
-        newCopies.forEach(copy -> assertNotNull(copy.name));
-    }
+	@Test
+	void testAssociation(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+
+		Entity entity = new Entity("hello", "world");
+		entity.children.add(new ChildEntity(entity, "goodbye"));
+		entity.children.add(new ChildEntity(entity, "gavin"));
+		scope.inTransaction(s -> s.persist(entity));
+
+		List tuples =
+				// this kind of query is currently not documented to work, but it does, and I guess I don't see why it's terrible
+				scope.fromSession(s -> s.createSelectionQuery("select id, children from Entity", Object[].class).getResultList());
+		assertEquals(2, tuples.size());
+		tuples.forEach(tuple -> assertNotNull(tuple[0]));
+		tuples.forEach(tuple -> assertNotNull(tuple[1]));
+
+		List tuples2 =
+				scope.fromSession(s -> s.createSelectionQuery("select id, element(children) from Entity", Object[].class).getResultList());
+		assertEquals(2, tuples2.size());
+		tuples2.forEach(tuple -> assertNotNull(tuple[0]));
+		tuples2.forEach(tuple -> assertNotNull(tuple[1]));
+
+		List tuples3 =
+				scope.fromSession(s -> s.createSelectionQuery("select id, element(children).name from Entity", Object[].class).getResultList());
+		assertEquals(2, tuples3.size());
+		tuples3.forEach(tuple -> assertNotNull(tuple[0]));
+		tuples3.forEach(tuple -> assertNotNull(tuple[1]));
+
+		List copies =
+				scope.fromSession(s -> s.createSelectionQuery("select id, element(children).name from Entity", EntityCopy.class).getResultList());
+		assertEquals(2, copies.size());
+		copies.forEach(Assertions::assertNotNull);
+		copies.forEach(copy -> assertNotNull(copy.id));
+		copies.forEach(copy -> assertNotNull(copy.name));
+
+		List newCopies =
+				scope.fromSession(s -> s.createSelectionQuery("select new EntityCopy(id, element(children).name) from Entity", EntityCopy.class).getResultList());
+		assertEquals(2, newCopies.size());
+		newCopies.forEach(Assertions::assertNotNull);
+		newCopies.forEach(copy -> assertNotNull(copy.id));
+		newCopies.forEach(copy -> assertNotNull(copy.name));
+	}
 
 	static class EntityCopy {
 		Long id;
@@ -131,35 +135,35 @@ public EntityCopy(Long id, String name) {
 	@jakarta.persistence.Entity(name="Entity")
 	static class Entity {
 		@GeneratedValue @Id
-        Long id;
+		Long id;
 		@ElementCollection
 		Set names;
-        @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
-        Set children;
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST)
+		Set children;
 
 		Entity(String... names) {
 			this.names = Set.of(names);
-            this.children = new HashSet<>();
+			this.children = new HashSet<>();
 		}
 
 		Entity() {
 			names = new HashSet<>();
-            children = new HashSet<>();
+			children = new HashSet<>();
 		}
 	}
 
 	@jakarta.persistence.Entity(name="ChildEntity")
 	static class ChildEntity {
 		@GeneratedValue @Id Long id;
-        String name;
-        @ManyToOne Entity parent;
-
-        ChildEntity(Entity parent, String name) {
-            this.parent = parent;
-            this.name = name;
-        }
-
-        ChildEntity() {
-        }
-    }
-}
\ No newline at end of file
+		String name;
+		@ManyToOne Entity parent;
+
+		ChildEntity(Entity parent, String name) {
+			this.parent = parent;
+			this.name = name;
+		}
+
+		ChildEntity() {
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java
index d1c93a9d5c6b..a8823bbfc312 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.instantiation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultiplePrimitiveConstructorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultiplePrimitiveConstructorsTest.java
index 5380d79d0f22..ad7b1a17f29f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultiplePrimitiveConstructorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultiplePrimitiveConstructorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.instantiation;
 
@@ -160,4 +158,4 @@ public void setTitle(String title) {
 			this.title = title;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultipleWrapperConstructorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultipleWrapperConstructorsTest.java
index 9ae9f08ff907..e0a8b85f15ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultipleWrapperConstructorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithMultipleWrapperConstructorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.instantiation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java
index 05ff21f6b2a1..86e8f1bf1e13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql.joinorder;
 
 import jakarta.persistence.*;
@@ -68,4 +72,4 @@ public class TaskEventLog {
 		@ManyToOne Task task;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java
index d62dba5b9ecb..28247aef8fd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.mutation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java
index fdfe4520d845..8785874279d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.mutation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java
index 14fcdac6e69e..6f6ad3e2ea3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.nullPrecedence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java
index 1472114a34bb..701635936d8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.nullPrecedence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNativelyDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNativelyDialectTest.java
index ecb512f5f84f..bb12e52c1642 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNativelyDialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNativelyDialectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.nullPrecedence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNotNativelyDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNotNativelyDialectTest.java
index 8dabc7ac7745..12a12a8dd5d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNotNativelyDialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/SupportingNotNativelyDialectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.nullPrecedence;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java
index ff84cd3f492f..a90f2cdb21fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.set;
 
@@ -40,243 +38,243 @@
 @ServiceRegistry
 @SessionFactory
 public class SetOperationTest {
-    @BeforeEach
-    public void createTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.persist( new EntityOfLists( 1, "first" ) );
-                    session.persist( new EntityOfLists( 2, "second" ) );
-                    session.persist( new EntityOfLists( 3, "third" ) );
-                    EntityWithManyToOneSelfReference first = new EntityWithManyToOneSelfReference( 1, "first", 123 );
-                    EntityWithManyToOneSelfReference second = new EntityWithManyToOneSelfReference( 2, "second", 123 );
-                    session.persist( first );
-                    first.setOther( first );
-                    session.persist( second );
-                    second.setOther( second );
-                }
-        );
-    }
+	@BeforeEach
+	public void createTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.persist( new EntityOfLists( 1, "first" ) );
+					session.persist( new EntityOfLists( 2, "second" ) );
+					session.persist( new EntityOfLists( 3, "third" ) );
+					EntityWithManyToOneSelfReference first = new EntityWithManyToOneSelfReference( 1, "first", 123 );
+					EntityWithManyToOneSelfReference second = new EntityWithManyToOneSelfReference( 2, "second", 123 );
+					session.persist( first );
+					first.setOther( first );
+					session.persist( second );
+					second.setOther( second );
+				}
+		);
+	}
 
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    // Because, why not MySQL/MariaDB... https://bugs.mysql.com/bug.php?id=7412
-                    session.createQuery( "update EntityWithManyToOneSelfReference set other = null" ).executeUpdate();
-                    session.createQuery( "delete from EntityWithManyToOneSelfReference" ).executeUpdate();
-                    session.createQuery( "delete from EntityOfLists" ).executeUpdate();
-                    session.createQuery( "delete from SimpleEntity" ).executeUpdate();
-                }
-        );
-    }
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					// Because, why not MySQL/MariaDB... https://bugs.mysql.com/bug.php?id=7412
+					session.createQuery( "update EntityWithManyToOneSelfReference set other = null" ).executeUpdate();
+					session.createQuery( "delete from EntityWithManyToOneSelfReference" ).executeUpdate();
+					session.createQuery( "delete from EntityOfLists" ).executeUpdate();
+					session.createQuery( "delete from SimpleEntity" ).executeUpdate();
+				}
+		);
+	}
 
-    @Test
-    @JiraKey( value = "HHH-14704")
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllWithManyToOne(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "from EntityWithManyToOneSelfReference e where e.id = 1 " +
-                                    "union all " +
-                                    "from EntityWithManyToOneSelfReference e where e.id = 2",
-                            EntityWithManyToOneSelfReference.class
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@Test
+	@JiraKey( value = "HHH-14704")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllWithManyToOne(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"from EntityWithManyToOneSelfReference e where e.id = 1 " +
+									"union all " +
+									"from EntityWithManyToOneSelfReference e where e.id = 2",
+							EntityWithManyToOneSelfReference.class
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 
-    @Test
-    @JiraKey( value = "HHH-14704")
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllWithManyToOneFetch(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 1 " +
-                                    "union all " +
-                                    "from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 2",
-                            EntityWithManyToOneSelfReference.class
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@Test
+	@JiraKey( value = "HHH-14704")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllWithManyToOneFetch(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 1 " +
+									"union all " +
+									"from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 2",
+							EntityWithManyToOneSelfReference.class
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllWithManyToOneFetchJustOne(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    try {
-                        session.createQuery(
-                                "from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 1 " +
-                                        "union all " +
-                                        "from EntityWithManyToOneSelfReference e where e.id = 2",
-                                EntityWithManyToOneSelfReference.class
-                        );
-                        Assertions.fail( "Expected exception to be thrown!" );
-                    }
-                    catch (Exception e) {
-                        Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
-                        Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
-                    }
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllWithManyToOneFetchJustOne(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					try {
+						session.createQuery(
+								"from EntityWithManyToOneSelfReference e join fetch e.other where e.id = 1 " +
+										"union all " +
+										"from EntityWithManyToOneSelfReference e where e.id = 2",
+								EntityWithManyToOneSelfReference.class
+						);
+						Assertions.fail( "Expected exception to be thrown!" );
+					}
+					catch (Exception e) {
+						Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
+						Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
+					}
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllWithManyToOneFetchDifferentAttributes(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    try {
-                        session.createQuery(
-                                "from EntityOfLists e join fetch e.listOfOneToMany where e.id = 1 " +
-                                        "union all " +
-                                        "from EntityOfLists e join fetch e.listOfManyToMany where e.id = 2",
-                                EntityOfLists.class
-                        );
-                        Assertions.fail( "Expected exception to be thrown!" );
-                    }
-                    catch (Exception e) {
-                        Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
-                        Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
-                    }
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllWithManyToOneFetchDifferentAttributes(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					try {
+						session.createQuery(
+								"from EntityOfLists e join fetch e.listOfOneToMany where e.id = 1 " +
+										"union all " +
+										"from EntityOfLists e join fetch e.listOfManyToMany where e.id = 2",
+								EntityOfLists.class
+						);
+						Assertions.fail( "Expected exception to be thrown!" );
+					}
+					catch (Exception e) {
+						Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
+						Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
+					}
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllWithManyToOneFetchDifferentOrder(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    try {
-                        session.createQuery(
-                                "from EntityOfLists e join fetch e.listOfOneToMany join fetch e.listOfManyToMany where e.id = 1 " +
-                                        "union all " +
-                                        "from EntityOfLists e join fetch e.listOfManyToMany join fetch e.listOfOneToMany where e.id = 2",
-                                EntityOfLists.class
-                        );
-                        Assertions.fail( "Expected exception to be thrown!" );
-                    }
-                    catch (Exception e) {
-                        Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
-                        Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
-                    }
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllWithManyToOneFetchDifferentOrder(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					try {
+						session.createQuery(
+								"from EntityOfLists e join fetch e.listOfOneToMany join fetch e.listOfManyToMany where e.id = 1 " +
+										"union all " +
+										"from EntityOfLists e join fetch e.listOfManyToMany join fetch e.listOfOneToMany where e.id = 2",
+								EntityOfLists.class
+						);
+						Assertions.fail( "Expected exception to be thrown!" );
+					}
+					catch (Exception e) {
+						Assertions.assertEquals( IllegalArgumentException.class, e.getClass() );
+						Assertions.assertEquals( SemanticException.class, e.getCause().getClass() );
+					}
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAll(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "select e from EntityOfLists e where e.id = 1 " +
-                                    "union all " +
-                                    "select e from EntityOfLists e where e.id = 2",
-                            EntityOfLists.class
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAll(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"select e from EntityOfLists e where e.id = 1 " +
+									"union all " +
+									"select e from EntityOfLists e where e.id = 2",
+							EntityOfLists.class
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllLimit(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "(select e.id, e from EntityOfLists e where e.id = 1 " +
-                                    "union all " +
-                                    "select e.id, e from EntityOfLists e where e.id = 2) " +
-                                    "order by 1 fetch first 1 row only",
-                            Tuple.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllLimit(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"(select e.id, e from EntityOfLists e where e.id = 1 " +
+									"union all " +
+									"select e.id, e from EntityOfLists e where e.id = 2) " +
+									"order by 1 fetch first 1 row only",
+							Tuple.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    public void testUnionAllLimitSubquery(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "select e.id, e from EntityOfLists e where e.id = 1 " +
-                                    "union all " +
-                                    "select e.id, e from EntityOfLists e where e.id = 2 " +
-                                    "order by 1 fetch first 1 row only",
-                            Tuple.class
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	public void testUnionAllLimitSubquery(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"select e.id, e from EntityOfLists e where e.id = 1 " +
+									"union all " +
+									"select e.id, e from EntityOfLists e where e.id = 2 " +
+									"order by 1 fetch first 1 row only",
+							Tuple.class
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    public void testUnionAllLimitNested(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "(select e.id, e from EntityOfLists e where e.id = 1 " +
-                                    "union all " +
-                                    "(select e.id, e from EntityOfLists e where e.id = 2 order by 1 fetch first 1 row only)) " +
-                                    "order by 1 fetch first 1 row only",
-                            Tuple.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	public void testUnionAllLimitNested(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"(select e.id, e from EntityOfLists e where e.id = 1 " +
+									"union all " +
+									"(select e.id, e from EntityOfLists e where e.id = 2 order by 1 fetch first 1 row only)) " +
+									"order by 1 fetch first 1 row only",
+							Tuple.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    @SkipForDialect(dialectClass = OracleDialect.class, reason = "Bug in BasicFormatterImpl causes exception during formatting of the SQL string")
-    public void testAlternatingSetOperator(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "(SELECT e.id FROM EntityOfLists e WHERE e.id = 1\n"
-                                    + "UNION\n"
-                                    + "SELECT e.id FROM EntityOfLists e WHERE e.id = 2\n"
-                                    + "UNION ALL\n"
-                                    + "SELECT e.id FROM EntityOfLists e WHERE e.id = 3)\n"
-                                    + "ORDER BY 1 DESC"
-                                    + " LIMIT 1",
-                            Integer.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	@SkipForDialect(dialectClass = OracleDialect.class, reason = "Bug in BasicFormatterImpl causes exception during formatting of the SQL string")
+	public void testAlternatingSetOperator(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"(SELECT e.id FROM EntityOfLists e WHERE e.id = 1\n"
+									+ "UNION\n"
+									+ "SELECT e.id FROM EntityOfLists e WHERE e.id = 2\n"
+									+ "UNION ALL\n"
+									+ "SELECT e.id FROM EntityOfLists e WHERE e.id = 3)\n"
+									+ "ORDER BY 1 DESC"
+									+ " LIMIT 1",
+							Integer.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    public void testUnionAllOrderByAttribute(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    List list = session.createQuery(
-                            "(SELECT e FROM EntityOfLists e WHERE e.id = 1\n"
-                                    + "UNION ALL\n"
-                                    + "SELECT e FROM EntityOfLists e WHERE e.id = 2)\n"
-                                    + "ORDER BY name DESC"
-                                    + " LIMIT 1",
-                            EntityOfLists.class
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	public void testUnionAllOrderByAttribute(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					List list = session.createQuery(
+							"(SELECT e FROM EntityOfLists e WHERE e.id = 1\n"
+									+ "UNION ALL\n"
+									+ "SELECT e FROM EntityOfLists e WHERE e.id = 2)\n"
+									+ "ORDER BY name DESC"
+									+ " LIMIT 1",
+							EntityOfLists.class
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java
index 15d5d49e857d..7a2bdd5af533 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.query.hql.size;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java
index 2ddc723f885f..e2a8ae6869f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java
@@ -1,34 +1,18 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.size;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 
 import org.hibernate.Hibernate;
-import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java
index 462dea351944..77b0c70a3cc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.query.hql.size;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java
index d026a1ef7f81..f0d79c68194a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.size;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java
index 6157149dbfb2..3845e6af2910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.size;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java
index 3d0f797bb77d..622f67637602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.size;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java
index 0bdfdc592ecd..3bfca179d6af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.size;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/thisalias/HQLThisTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/thisalias/HQLThisTest.java
index 8ff08b451ebc..e05e9c55418c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/thisalias/HQLThisTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/thisalias/HQLThisTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql.thisalias;
 
 import jakarta.persistence.Basic;
@@ -5,8 +9,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java
index 202c2dadefb1..ad7d88f9bf4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.treat;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java
index 7ef1e9c1fc6e..31111986cdd5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.treat;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinFetchTest.java
index c10633411ce0..f183c3898739 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinFetchTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql.treat;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java
index e3e20b6b4f08..2920969aab7d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.hql.treat;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatTest.java
index 6bd56cfa80a6..3d489b5b1b10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.treat;
 
@@ -129,4 +127,4 @@ public SoftwareProduct(Integer id, String name) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java
index 7672b2485be3..41dd78fc78d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.treat;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java
index 99dc144a2a5c..a1d1a50bb004 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.hql.treat;
 
 import java.util.List;
-import jakarta.persistence.DiscriminatorColumn;
-import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Inheritance;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Bid.java
index 631a56c3463f..8b1d7ef14c24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Bid.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Bid.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Bid.java 6793 2005-05-16 05:46:47Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 import java.util.Calendar;
@@ -14,7 +10,7 @@
  * @author Gavin King
  */
 public class Bid {
-	
+
 	private float amount;
 	private Item item;
 	private Calendar timestamp;
@@ -38,7 +34,7 @@ public Calendar getTimestamp() {
 	public void setTimestamp(Calendar timestamp) {
 		this.timestamp = timestamp;
 	}
-	
+
 	Bid() {}
 	public Bid(Item item, float amount) {
 		this.amount = amount;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Category.java
index 9182d3f3feb2..989ab34b5554 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Category.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Category.java 6957 2005-05-31 04:21:58Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Category {
-	
+
 	private String name;
 
 	Category() {}
@@ -21,7 +17,7 @@ public class Category {
 	public Category(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Comment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Comment.java
index 97e518c51cdd..c830146af9c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Comment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Comment.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Comment.java 6797 2005-05-16 12:08:03Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 import java.util.Calendar;
@@ -14,7 +10,7 @@
  * @author Gavin King
  */
 public class Comment {
-	
+
 	private String text;
 	private Item item;
 	private Calendar timestamp;
@@ -32,7 +28,7 @@ public Calendar getTimestamp() {
 	public void setTimestamp(Calendar timestamp) {
 		this.timestamp = timestamp;
 	}
-	
+
 	Comment() {}
 	public Comment(Item item, String comment) {
 		this.text = comment;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Group.java
index 39092545da75..456d546c6368 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Group.java 7175 2005-06-17 05:23:15Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 import java.util.HashMap;
@@ -14,7 +10,7 @@
 public class Group {
 	private String name;
 	private Map users = new HashMap();
-	
+
 	public Group(String name) {
 		this.name = name;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Item.java
index 1122c7d2f397..7a96a133bcf6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 6957 2005-05-31 04:21:58Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 import java.util.HashSet;
@@ -15,7 +11,7 @@
  * @author Gavin King
  */
 public class Item {
-	
+
 	private String description;
 	private Long id;
 	private Category category;
@@ -39,8 +35,8 @@ public void setId(Long id) {
 	}
 
 	Item() {}
-	public Item(Category cat, String desc) { 
-		description = desc; 
+	public Item(Category cat, String desc) {
+		description = desc;
 		category = cat;
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchImplicitOwnerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchImplicitOwnerTest.java
index d70c7d1311e5..5849a06f6467 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchImplicitOwnerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchImplicitOwnerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.joinfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchNestedAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchNestedAssociationsTest.java
index 82699cf60641..4ee2941047e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchNestedAssociationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchNestedAssociationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.joinfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java
index c0fe788d27b6..b186fb29ea8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.joinfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java
index c96bfb98b7d5..7bef1357b15a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.joinfetch;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/User.java
index fac1827f78f3..a16a14f986e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 7175 2005-06-17 05:23:15Z oneovthafew $
 package org.hibernate.orm.test.query.joinfetch;
 
 import java.util.HashMap;
@@ -36,5 +32,5 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java
index d8fb7f91a85b..1ed44b43b7e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.mutationquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java
index cefc7295538e..9116b23dce0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.mutationquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java
index 20f758dde491..6fc4171e24be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.mutationquery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/package-info.java
index 0bdbc0fd34c8..12da37ff2bde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/package-info.java
@@ -8,4 +8,4 @@
 /**
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.query.named;
\ No newline at end of file
+package org.hibernate.orm.test.query.named;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java
index ae2ad26ad9e8..ef01a6abd234 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.named.simple;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java
index 8993e4872851..6c157a43c731 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.named.simple;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/PersistEntityWithProxyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/PersistEntityWithProxyAssociationTest.java
index 129086db8864..493610be02fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/PersistEntityWithProxyAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/PersistEntityWithProxyAssociationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.naturalid;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/QueryWithProxyAsParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/QueryWithProxyAsParametersTest.java
index 99d025f6f48b..f75a1b957787 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/QueryWithProxyAsParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/naturalid/QueryWithProxyAsParametersTest.java
@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.naturalid;
 
-import org.hibernate.Hibernate;
 import org.hibernate.annotations.NaturalId;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/options/CacheModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/options/CacheModeTests.java
index 506db4b84d8b..c11928e9c26a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/options/CacheModeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/options/CacheModeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.options;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/order/OrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/order/OrderTest.java
index 423068683814..deefc76febed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/order/OrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/order/OrderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.order;
 
 import jakarta.persistence.Entity;
@@ -24,47 +28,47 @@
 @DomainModel(annotatedClasses = OrderTest.Book.class)
 public class OrderTest {
 
-    @Test void testAscendingDescending(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
-        SingularAttribute title = bookType.findSingularAttribute("title");
-        SingularAttribute isbn = bookType.findSingularAttribute("isbn");
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(desc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(asc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(desc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+	@Test void testAscendingDescending(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		SingularAttribute title = bookType.findSingularAttribute("title");
+		SingularAttribute isbn = bookType.findSingularAttribute("isbn");
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(desc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(asc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(desc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
 
 //            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(asc(title))
@@ -73,62 +77,62 @@ public class OrderTest {
 //                    .collect(toList());
 //            assertEquals("Hibernate in Action", titlesAsc.get(1));
 //            assertEquals("Java Persistence with Hibernate", titlesAsc.get(0));
-            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
+			titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(emptyList())
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingWithPositionalParam(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
-        SingularAttribute title = bookType.findSingularAttribute("title");
-        SingularAttribute isbn = bookType.findSingularAttribute("isbn");
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("from Book where title like ?1", Book.class)
-                    .setParameter(1, "%Hibernate%")
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("from Book where title like ?1", Book.class)
-                    .setParameter(1, "%Hibernate%")
-                    .setOrder(Order.desc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("from Book where title like ?1", Book.class)
-                    .setParameter(1, "%Hibernate%")
-                    .setOrder(List.of(asc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("from Book where title like ?1", Book.class)
-                    .setParameter(1, "%Hibernate%")
-                    .setOrder(List.of(desc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingWithPositionalParam(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		SingularAttribute title = bookType.findSingularAttribute("title");
+		SingularAttribute isbn = bookType.findSingularAttribute("isbn");
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("from Book where title like ?1", Book.class)
+					.setParameter(1, "%Hibernate%")
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("from Book where title like ?1", Book.class)
+					.setParameter(1, "%Hibernate%")
+					.setOrder(Order.desc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("from Book where title like ?1", Book.class)
+					.setParameter(1, "%Hibernate%")
+					.setOrder(List.of(asc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("from Book where title like ?1", Book.class)
+					.setParameter(1, "%Hibernate%")
+					.setOrder(List.of(desc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
 
 //            titlesAsc = session.createSelectionQuery("from Book where title like ?1 order by isbn asc", Book.class)
 //                    .setParameter(1, "%Hibernate%")
@@ -138,63 +142,63 @@ public class OrderTest {
 //                    .collect(toList());
 //            assertEquals("Hibernate in Action", titlesAsc.get(1));
 //            assertEquals("Java Persistence with Hibernate", titlesAsc.get(0));
-            titlesAsc = session.createSelectionQuery("from Book where title like ?1 order by isbn asc", Book.class)
-                    .setParameter(1, "%Hibernate%")
+			titlesAsc = session.createSelectionQuery("from Book where title like ?1 order by isbn asc", Book.class)
+					.setParameter(1, "%Hibernate%")
 //                    .setOrder(emptyList())
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingWithNamedParam(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
-        SingularAttribute title = bookType.findSingularAttribute("title");
-        SingularAttribute isbn = bookType.findSingularAttribute("isbn");
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("from Book where title like :title", Book.class)
-                    .setParameter("title", "%Hibernate%")
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("from Book where title like :title", Book.class)
-                    .setParameter("title", "%Hibernate%")
-                    .setOrder(desc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("from Book where title like :title", Book.class)
-                    .setParameter("title", "%Hibernate%")
-                    .setOrder(List.of(asc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("from Book where title like :title", Book.class)
-                    .setParameter("title", "%Hibernate%")
-                    .setOrder(List.of(desc(isbn), desc(title)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingWithNamedParam(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		SingularAttribute title = bookType.findSingularAttribute("title");
+		SingularAttribute isbn = bookType.findSingularAttribute("isbn");
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("from Book where title like :title", Book.class)
+					.setParameter("title", "%Hibernate%")
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("from Book where title like :title", Book.class)
+					.setParameter("title", "%Hibernate%")
+					.setOrder(desc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("from Book where title like :title", Book.class)
+					.setParameter("title", "%Hibernate%")
+					.setOrder(List.of(asc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("from Book where title like :title", Book.class)
+					.setParameter("title", "%Hibernate%")
+					.setOrder(List.of(desc(isbn), desc(title)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
 
 //            titlesAsc = session.createSelectionQuery("from Book where title like :title order by isbn asc", Book.class)
 //                    .setParameter("title", "%Hibernate%")
@@ -204,100 +208,100 @@ public class OrderTest {
 //                    .collect(toList());
 //            assertEquals("Hibernate in Action", titlesAsc.get(1));
 //            assertEquals("Java Persistence with Hibernate", titlesAsc.get(0));
-            titlesAsc = session.createSelectionQuery("from Book where title like :title order by isbn asc", Book.class)
-                    .setParameter("title", "%Hibernate%")
+			titlesAsc = session.createSelectionQuery("from Book where title like :title order by isbn asc", Book.class)
+					.setParameter("title", "%Hibernate%")
 //                    .setOrder(emptyList())
-                    .setOrder(asc(title))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingBySelectElement(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(asc(2))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(desc(2))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(asc(1), desc(2)))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(desc(1), desc(2)))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingCaseInsensitive(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
-        SingularAttribute title = bookType.findSingularAttribute("title");
-        SingularAttribute isbn = bookType.findSingularAttribute("isbn");
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(asc(title).ignoringCase())
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(desc(title).ignoringCase())
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(asc(isbn).ignoringCase(), desc(title).ignoringCase()))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(desc(isbn).ignoringCase(), desc(title).ignoringCase()))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+					.setOrder(asc(title))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingBySelectElement(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(asc(2))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(desc(2))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(asc(1), desc(2)))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(desc(1), desc(2)))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingCaseInsensitive(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		SingularAttribute title = bookType.findSingularAttribute("title");
+		SingularAttribute isbn = bookType.findSingularAttribute("isbn");
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(asc(title).ignoringCase())
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(desc(title).ignoringCase())
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(asc(isbn).ignoringCase(), desc(title).ignoringCase()))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(desc(isbn).ignoringCase(), desc(title).ignoringCase()))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
 
 //            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(asc(title))
@@ -306,58 +310,58 @@ public class OrderTest {
 //                    .collect(toList());
 //            assertEquals("Hibernate in Action", titlesAsc.get(1));
 //            assertEquals("Java Persistence with Hibernate", titlesAsc.get(0));
-            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
+			titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(emptyList())
-                    .setOrder(asc(title).ignoringCase())
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingCaseInsensitiveLongForm(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
-        SingularAttribute title = bookType.findSingularAttribute("title");
-        SingularAttribute isbn = bookType.findSingularAttribute("isbn");
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(by(title, ASCENDING, true))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(by(title, DESCENDING, true))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(by(isbn, ASCENDING, true), by(title, DESCENDING, true)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("from Book", Book.class)
-                    .setOrder(List.of(by(isbn, DESCENDING, true), by(title, DESCENDING, true)))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+					.setOrder(asc(title).ignoringCase())
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingCaseInsensitiveLongForm(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		EntityDomainType bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		SingularAttribute title = bookType.findSingularAttribute("title");
+		SingularAttribute isbn = bookType.findSingularAttribute("isbn");
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(by(title, ASCENDING, true))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(by(title, DESCENDING, true))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(by(isbn, ASCENDING, true), by(title, DESCENDING, true)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("from Book", Book.class)
+					.setOrder(List.of(by(isbn, DESCENDING, true), by(title, DESCENDING, true)))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
 
 //            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(asc(title))
@@ -366,110 +370,110 @@ public class OrderTest {
 //                    .collect(toList());
 //            assertEquals("Hibernate in Action", titlesAsc.get(1));
 //            assertEquals("Java Persistence with Hibernate", titlesAsc.get(0));
-            titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
+			titlesAsc = session.createSelectionQuery("from Book order by isbn asc", Book.class)
 //                    .setOrder(emptyList())
-                    .setOrder(by(title, ASCENDING, true))
-                    .getResultList()
-                    .stream().map(book -> book.title)
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingBySelectElementCaseInsensitive(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(asc(2).ignoringCase())
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(desc(2).ignoringCase())
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(asc(1).ignoringCase(), desc(2).ignoringCase()))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(desc(1).ignoringCase(), desc(2).ignoringCase()))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
-        });
-    }
-
-    @Test void testAscendingDescendingBySelectElementCaseInsensitiveLongForm(SessionFactoryScope scope) {
-        scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
-        scope.inTransaction( session -> {
-            session.persist(new Book("9781932394153", "Hibernate in Action"));
-            session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
-        });
-        scope.inSession(session -> {
-            List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(by(2, ASCENDING, true))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesAsc.get(0));
-            assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
-
-            List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(by(2, DESCENDING, true))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", titlesDesc.get(1));
-            assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
-
-            List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(by(1, ASCENDING, true), by(2, DESCENDING, true)))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnAsc.get(1));
-            assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
-
-            List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
-                    .setOrder(List.of(by(1, DESCENDING, true), by(2, DESCENDING, true)))
-                    .getResultList()
-                    .stream().map(book -> book[1])
-                    .collect(toList());
-            assertEquals("Hibernate in Action", isbnDesc.get(0));
-            assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
-        });
-    }
-
-    @Entity(name="Book")
-    static class Book {
-        @Id String isbn;
-        String title;
-
-        Book(String isbn, String title) {
-            this.isbn = isbn;
-            this.title = title;
-        }
-
-        Book() {
-        }
-    }
+					.setOrder(by(title, ASCENDING, true))
+					.getResultList()
+					.stream().map(book -> book.title)
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingBySelectElementCaseInsensitive(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(asc(2).ignoringCase())
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(desc(2).ignoringCase())
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(asc(1).ignoringCase(), desc(2).ignoringCase()))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(desc(1).ignoringCase(), desc(2).ignoringCase()))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+		});
+	}
+
+	@Test void testAscendingDescendingBySelectElementCaseInsensitiveLongForm(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createMutationQuery("delete Book").executeUpdate() );
+		scope.inTransaction( session -> {
+			session.persist(new Book("9781932394153", "Hibernate in Action"));
+			session.persist(new Book("9781617290459", "Java Persistence with Hibernate"));
+		});
+		scope.inSession(session -> {
+			List titlesAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(by(2, ASCENDING, true))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesAsc.get(0));
+			assertEquals("Java Persistence with Hibernate", titlesAsc.get(1));
+
+			List titlesDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(by(2, DESCENDING, true))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", titlesDesc.get(1));
+			assertEquals("Java Persistence with Hibernate", titlesDesc.get(0));
+
+			List isbnAsc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(by(1, ASCENDING, true), by(2, DESCENDING, true)))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnAsc.get(1));
+			assertEquals("Java Persistence with Hibernate", isbnAsc.get(0));
+
+			List isbnDesc = session.createSelectionQuery("select isbn, title from Book", Object[].class)
+					.setOrder(List.of(by(1, DESCENDING, true), by(2, DESCENDING, true)))
+					.getResultList()
+					.stream().map(book -> book[1])
+					.collect(toList());
+			assertEquals("Hibernate in Action", isbnDesc.get(0));
+			assertEquals("Java Persistence with Hibernate", isbnDesc.get(1));
+		});
+	}
+
+	@Entity(name="Book")
+	static class Book {
+		@Id String isbn;
+		String title;
+
+		Book(String isbn, String title) {
+			this.isbn = isbn;
+			this.title = title;
+		}
+
+		Book() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java
index e31cbd4bd49a..9372514f1f2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultcache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
index 909690c981a0..cfb54079a067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultcache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java
index 00a58fe7bc8b..9548bd09dbe7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultcache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java
index 878900fbca7d..5426ceac3baa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/BasicResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/BasicResultTests.java
index 9946537f04d1..ff9a69705cac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/BasicResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/BasicResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java
index 87997c2f92b0..aed4f9cfa4db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorColumn;
-import jakarta.persistence.DiscriminatorType;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityResult;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java
index 4bff2f4c476f..bacc9d52cc92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java
index af17743689ca..63bfd1026c0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
index ce563372c67d..eefd201ede10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
 import java.sql.Timestamp;
-import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -24,8 +21,6 @@
 
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java
index 991ddaeafd08..2ab9c2e4fafd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java
index 611d12a8ddae..510a1629b694 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
@@ -29,7 +27,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 @DomainModel( annotatedClasses = {
 		InheritanceTests.Parent.class,
@@ -153,4 +150,4 @@ public Child(Long id, String name, int test) {
 			this.test = test;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InstantiationResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InstantiationResultTests.java
index 52627fb26f5c..59b6a740b2bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InstantiationResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InstantiationResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
@@ -50,4 +48,4 @@ public void testSimpleInstantiationOfScalars(SessionFactoryScope scope) {
 				}
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java
index 8d23c4ea04de..9211160a49b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedRepoTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedRepoTests.java
index 24f78db147f4..965e70974528 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedRepoTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedRepoTests.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
-import java.util.List;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.internal.ResultSetMappingResolutionContext;
@@ -16,16 +13,12 @@
 import org.hibernate.query.results.ResultSetMapping;
 import org.hibernate.query.results.ResultSetMappingImpl;
 import org.hibernate.query.spi.QueryEngine;
-import org.hibernate.query.sql.spi.NativeQueryImplementor;
 
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.hamcrest.Matchers;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/ResultMappingAssociationIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/ResultMappingAssociationIdClassTest.java
index d988cb7009c3..d0d7d6509a18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/ResultMappingAssociationIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/ResultMappingAssociationIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
index 126004068fcd..78d5d67a920e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/XmlOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/XmlOverrideTests.java
index 708a8ec9de83..d43ef5a9deba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/XmlOverrideTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/XmlOverrideTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.resultmapping;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java
index b090d4b894dd..80adde93eada 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java
index 4857ecd1caf6..6f3cd08173da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto.java
index 486d04ca2b70..fe38236af8a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto2.java
index 2b9e35900d07..50fc7013e3de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Dto2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java
index 9962d3dfc3b9..d2f393536735 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
@@ -11,7 +9,6 @@
 import org.hibernate.query.criteria.JpaRoot;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java
index fe26673719ad..48843721db93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/InvalidReturnTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/InvalidReturnTests.java
index 6b9178ac5041..3056b5922c30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/InvalidReturnTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/InvalidReturnTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Queries.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Queries.java
index 379aab1cc5c9..bfe43f13fbde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Queries.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/Queries.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java
index 00dcb668797e..e56566d562f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java
index 43b835ae9918..5fb15981d2f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java
index c3f2327f37ae..22d8761e4cdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java
index ade1265789da..f719904a2bde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.returns;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScalarQueries.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScalarQueries.java
index f35e7d8b6cb1..c87439ef3a11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScalarQueries.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScalarQueries.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.returns;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
index 01b2bcc5a570..d7eee596357d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.returns;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ClassIdNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ClassIdNativeQueryTest.java
index b175ac37f61d..8d62110e1ce2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ClassIdNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ClassIdNativeQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.sql;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java
index e611448b0f23..875973be7db3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.sql;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java
index 230b297c3455..5b84c580ffb8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java
index 0527c13b7a85..112a0ac10875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddedIdNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddedIdNativeQueryTest.java
index 5e6d429d9a9b..afea7ce98e5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddedIdNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddedIdNativeQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.sql;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java
index 231ab55326cc..dab613531b9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
@@ -47,4 +45,3 @@ public void testBoundedLongStringAccess(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryAsNamedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryAsNamedTests.java
index 0a1df96cb0f4..e3f94a4b597a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryAsNamedTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryAsNamedTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryEagerAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryEagerAssociationTest.java
index 4534dd0ea240..1cea5261fca2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryEagerAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryEagerAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryMultipleEntityResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryMultipleEntityResultTest.java
index 90e91dc2d4ec..5c4a6d6c81fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryMultipleEntityResultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryMultipleEntityResultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java
index 6654d18b99a5..c84e71d6ee6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
index cc91c465cff4..98b2fd488e59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ParameterParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ParameterParserTest.java
index 714dae78f7c1..636be8cb43b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ParameterParserTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/ParameterParserTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
index 091526c91921..8732a5940f01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java
index 84687881ce13..08faf785c27b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Tests for {@link org.hibernate.query.NativeQuery}
  */
-package org.hibernate.orm.test.query.sql;
\ No newline at end of file
+package org.hibernate.orm.test.query.sql;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java
index 195d46f889a2..7256cd286c3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BaseSqmUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
index 77370c4789a0..a8ec9442a7b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm;
 
@@ -191,9 +189,9 @@ private void checkResults(SelectionQuery query, SessionImplementor session) {
 	@Entity( name = "DummyEntity" )
 	@Table( name = "DummyEntity" )
 	public static class DummyEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private DummyEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentConcreteSqmSelectQueryPlainTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentConcreteSqmSelectQueryPlainTest.java
index efdd342ef3d1..73e34942ab38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentConcreteSqmSelectQueryPlainTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentConcreteSqmSelectQueryPlainTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm;
 
@@ -37,9 +35,9 @@
 
 /**
  * (Flaky) test for {@link ConcreteSqmSelectQueryPlan#withCacheableSqmInterpretation} not checking for {@link JdbcOperationQuerySelect#dependsOnParameterBindings()}/{@link JdbcOperationQuerySelect#isCompatibleWith(org.hibernate.sql.exec.spi.JdbcParameterBindings, org.hibernate.query.spi.QueryOptions)} in double-lock checking.
- * 
+ *
  * 
    Might cause incorrect SQL to be rendered. In case my MySQL this might cause "limit null,1" statements.
- * 
+ *
  * @see https://hibernate.atlassian.net/browse/HHH-17742
  */
 @RequiresDialect(MySQLDialect.class)
@@ -53,8 +51,8 @@ protected Class[] getAnnotatedClasses() {
 	}
 
 	/**
-	 * First query will generated a "limit ?,?" SQL statement, the following ones only need "limit ?". 
-	 * Due to the race condition, the following ones reuse the cached "limit ?,?" statement, resulting in "limit null,?" being generated. 
+	 * First query will generated a "limit ?,?" SQL statement, the following ones only need "limit ?".
+	 * Due to the race condition, the following ones reuse the cached "limit ?,?" statement, resulting in "limit null,?" being generated.
 	 */
 	@Test
 	public void run() throws InterruptedException {
@@ -89,7 +87,7 @@ private List executeQuery(int index) {
 	private List executeQuery(Session session, int index) {
 		Query query = session.createQuery( QUERY_STRING, SimpleEntity.class )
 				.setMaxResults( 1 );
-		
+
 		if ( index == 0 ) {
 			query.setFirstResult( 1 );
 		} else {
@@ -100,10 +98,10 @@ private List executeQuery(Session session, int index) {
 				fail( "sleep interrupted: query " + index, ex );
 			}
 		}
-				
+
 		return query.list();
 	}
-	
+
 	@Override
 	protected Configuration constructAndConfigureConfiguration(BootstrapServiceRegistry bootstrapServiceRegistry) {
 		Configuration cfg = super.constructAndConfigureConfiguration( bootstrapServiceRegistry );
@@ -111,7 +109,7 @@ protected Configuration constructAndConfigureConfiguration(BootstrapServiceRegis
 
 		return cfg;
 	}
-	
+
 	@Entity(name = "simple")
 	public static class SimpleEntity {
 
@@ -126,14 +124,14 @@ public void setId(Integer id) {
 			this.id = id;
 		}
 	}
-	
+
 	public static class DelayingStandardSqmTranslatorFactory extends StandardSqmTranslatorFactory {
-		
+
 		@Override
 		public SqmTranslator createSelectTranslator(SqmSelectStatement sqmSelectStatement, QueryOptions queryOptions,
 				DomainParameterXref domainParameterXref, QueryParameterBindings domainParameterBindings, LoadQueryInfluencers loadQueryInfluencers,
 				SqlAstCreationContext creationContext, boolean deduplicateSelectionItems) {
-			
+
 			try {
 				Thread.sleep( 2000L ); // delay to trigger double-lock checking by concurrent queries
 			}
@@ -144,7 +142,7 @@ public SqmTranslator createSelectTranslator(SqmSelectStatement<
 			return super.createSelectTranslator( sqmSelectStatement, queryOptions, domainParameterXref, domainParameterBindings, loadQueryInfluencers, creationContext,
 					deduplicateSelectionItems );
 		}
-		
+
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentQueriesByIdsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentQueriesByIdsTest.java
index 976b921b058a..63a859d9058c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentQueriesByIdsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/ConcurrentQueriesByIdsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm;
 
@@ -69,7 +67,7 @@ private List executeQuery(Session session, int index) {
 				.setParameter(
 						"ids",
 						Arrays.asList( base + 0, base + 1, base + 2, base + 3, base + 4, base + 5,
-									   base + 6, base + 7, base + 8, base + 9
+									base + 6, base + 7, base + 8, base + 9
 						)
 				)
 				.list();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/DelegatingSqmSelectionQueryImplementorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/DelegatingSqmSelectionQueryImplementorTest.java
index 4c4b4fc633b3..84aef679fe6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/DelegatingSqmSelectionQueryImplementorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/DelegatingSqmSelectionQueryImplementorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.query.sqm;
 
 import org.hibernate.query.sqm.spi.DelegatingSqmSelectionQueryImplementor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java
index 278dd9225ee7..6364e2c6a7fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/ConstructedLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/ConstructedLookupListItem.java
index d43c81591fb1..7f8a7f5135a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/ConstructedLookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/ConstructedLookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java
index 8503976d6163..86368c7da140 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/InjectedLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/InjectedLookupListItem.java
index cd4a22ebc043..1b1900749b96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/InjectedLookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/InjectedLookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/LookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/LookupListItem.java
index 47827e14d11c..756511507332 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/LookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/LookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedCtorLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedCtorLookupListItem.java
index 5a8e4c71fe2d..64f1e66e7031 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedCtorLookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedCtorLookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java
index b0ba4de12069..e5ca5afbeb9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedLookupListItem.java
index d1e698db6ee4..a2e56a743431 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedLookupListItem.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedLookupListItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java
index 2b6d1551052e..d57f89ec151b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.domain;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/CrossJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/CrossJoinTest.java
index 003e95aa23a0..c8849823172b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/CrossJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/CrossJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java
index 8ca755b3ff3c..eb162fe60a76 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/LiteralTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/LiteralTests.java
index 5af9884b1229..bffc43e6a6f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/LiteralTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/LiteralTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java
index 8151202be53c..ba038a6dad4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java
index 7cbcc01ef8a6..5899c4394794 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/ParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java
index 89525ccadd48..20bef33a9382 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
@@ -29,152 +27,152 @@
  * @author Chris Cranford
  */
 @DomainModel(annotatedClasses = {
-        SubQueryImplicitJoinReferenceTest.TheEntity.class,
-        SubQueryImplicitJoinReferenceTest.RevisionInfoEntity.class })
+		SubQueryImplicitJoinReferenceTest.TheEntity.class,
+		SubQueryImplicitJoinReferenceTest.RevisionInfoEntity.class })
 @SessionFactory
 @JiraKey(value = "HHH-14482")
 public class SubQueryImplicitJoinReferenceTest {
 
-    @Test
-    public void performDataPreparation(SessionFactoryScope scope) {
-        // Simulate creating revision 1
-        final RevisionInfoEntity revEntity = new RevisionInfoEntity();
-        revEntity.setId( 1 );
-
-        // Simulate creating the audit record
-        final TheEntity entity = new TheEntity();
-        entity.setOriginalId( OriginalId.from( revEntity, 1 ) );
-        entity.setData( "Test" );
-
-        // Persist the entities
-        scope.inTransaction( session -> { session.persist( revEntity ); session.persist( entity ); } );
-    }
-
-    @Test
-    public void performHqlTest(SessionFactoryScope scope) {
-        // Now simulate running an audit query
-        scope.inSession( session -> {
-            session.createQuery( "select e__ FROM TheEntity e__ "
-                                         + "WHERE e__.originalId.rev.id = (select max(e2__.originalId.rev.id) FROM "
-                                         + "TheEntity e2__ WHERE " +
-                                         "e2__.originalId.rev.id <= 2 and e__.originalId.id = e2__.originalId.id)" ).list();
-        } );
-    }
-
-    @Test
-    public void performHqlIsNullTest(SessionFactoryScope scope) {
-        // Now simulate running an audit query
-        scope.inSession( session -> {
-            session.createQuery( "select e__ FROM TheEntity e__ "
-                                         + "WHERE e__.originalId.rev.id = (select max(e2__.originalId.rev.id) FROM "
-                                         + "TheEntity e2__ WHERE " +
-                                         "e2__.originalId.rev is null)" ).list();
-        } );
-    }
-
-    @Test
-    public void performHqlTest2(SessionFactoryScope scope) {
-        // Now simulate running an audit query
-        scope.inSession( session -> {
-            session.createQuery( "select e__ FROM TheEntity e__ "
-                                         + "WHERE e__.originalId.id = (select max(e2__.originalId.id) FROM "
-                                         + "TheEntity e2__ WHERE " +
-                                         "e__.originalId.id = e2__.originalId.id and e2__.originalId.rev.id <= 2)" ).list();
-        } );
-    }
-
-    @Test
-    public void performHqlTest3(SessionFactoryScope scope) {
-        // Now simulate running an audit query
-        scope.inSession( session -> {
-            session.createQuery( "select e2__.originalId.id, e2__.originalId.rev.id  FROM "
-                                         + "TheEntity e2__ WHERE " +
-                                         " e2__.originalId.rev.id <= 2" ).list();
-        } );
-    }
-
-    @Entity(name = "TheEntity")
-    public static class TheEntity {
-        @EmbeddedId
-        private OriginalId originalId;
-        private String data;
-
-        public OriginalId getOriginalId() {
-            return originalId;
-        }
-
-        public void setOriginalId(OriginalId originalId) {
-            this.originalId = originalId;
-        }
-
-        public String getData() {
-            return data;
-        }
-
-        public void setData(String data) {
-            this.data = data;
-        }
-    }
-
-    @Entity(name="RevisionInfoEntity")
-    public static class RevisionInfoEntity {
-        @Id
-        private Integer id;
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Embeddable
-    public static class OriginalId implements Serializable {
-        @ManyToOne
-        private RevisionInfoEntity rev;
-        private Integer id;
-
-        public RevisionInfoEntity getRev() {
-            return rev;
-        }
-
-        public void setRev(RevisionInfoEntity rev) {
-            this.rev = rev;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public static OriginalId from(RevisionInfoEntity rev, Integer id) {
-            OriginalId oId = new OriginalId();
-            oId.rev = rev;
-            oId.id = id;
-            return oId;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(rev, id);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if ( obj == null ) {
-                return false;
-            }
-            if ( obj.getClass() != this.getClass() ) {
-                return false;
-            }
-
-            final OriginalId other = (OriginalId) obj;
-            return Objects.equals( rev, other.rev ) && Objects.equals( id, other.id );
-        }
-    }
+	@Test
+	public void performDataPreparation(SessionFactoryScope scope) {
+		// Simulate creating revision 1
+		final RevisionInfoEntity revEntity = new RevisionInfoEntity();
+		revEntity.setId( 1 );
+
+		// Simulate creating the audit record
+		final TheEntity entity = new TheEntity();
+		entity.setOriginalId( OriginalId.from( revEntity, 1 ) );
+		entity.setData( "Test" );
+
+		// Persist the entities
+		scope.inTransaction( session -> { session.persist( revEntity ); session.persist( entity ); } );
+	}
+
+	@Test
+	public void performHqlTest(SessionFactoryScope scope) {
+		// Now simulate running an audit query
+		scope.inSession( session -> {
+			session.createQuery( "select e__ FROM TheEntity e__ "
+										+ "WHERE e__.originalId.rev.id = (select max(e2__.originalId.rev.id) FROM "
+										+ "TheEntity e2__ WHERE " +
+										"e2__.originalId.rev.id <= 2 and e__.originalId.id = e2__.originalId.id)" ).list();
+		} );
+	}
+
+	@Test
+	public void performHqlIsNullTest(SessionFactoryScope scope) {
+		// Now simulate running an audit query
+		scope.inSession( session -> {
+			session.createQuery( "select e__ FROM TheEntity e__ "
+										+ "WHERE e__.originalId.rev.id = (select max(e2__.originalId.rev.id) FROM "
+										+ "TheEntity e2__ WHERE " +
+										"e2__.originalId.rev is null)" ).list();
+		} );
+	}
+
+	@Test
+	public void performHqlTest2(SessionFactoryScope scope) {
+		// Now simulate running an audit query
+		scope.inSession( session -> {
+			session.createQuery( "select e__ FROM TheEntity e__ "
+										+ "WHERE e__.originalId.id = (select max(e2__.originalId.id) FROM "
+										+ "TheEntity e2__ WHERE " +
+										"e__.originalId.id = e2__.originalId.id and e2__.originalId.rev.id <= 2)" ).list();
+		} );
+	}
+
+	@Test
+	public void performHqlTest3(SessionFactoryScope scope) {
+		// Now simulate running an audit query
+		scope.inSession( session -> {
+			session.createQuery( "select e2__.originalId.id, e2__.originalId.rev.id  FROM "
+										+ "TheEntity e2__ WHERE " +
+										" e2__.originalId.rev.id <= 2" ).list();
+		} );
+	}
+
+	@Entity(name = "TheEntity")
+	public static class TheEntity {
+		@EmbeddedId
+		private OriginalId originalId;
+		private String data;
+
+		public OriginalId getOriginalId() {
+			return originalId;
+		}
+
+		public void setOriginalId(OriginalId originalId) {
+			this.originalId = originalId;
+		}
+
+		public String getData() {
+			return data;
+		}
+
+		public void setData(String data) {
+			this.data = data;
+		}
+	}
+
+	@Entity(name="RevisionInfoEntity")
+	public static class RevisionInfoEntity {
+		@Id
+		private Integer id;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Embeddable
+	public static class OriginalId implements Serializable {
+		@ManyToOne
+		private RevisionInfoEntity rev;
+		private Integer id;
+
+		public RevisionInfoEntity getRev() {
+			return rev;
+		}
+
+		public void setRev(RevisionInfoEntity rev) {
+			this.rev = rev;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public static OriginalId from(RevisionInfoEntity rev, Integer id) {
+			OriginalId oId = new OriginalId();
+			oId.rev = rev;
+			oId.id = id;
+			return oId;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(rev, id);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if ( obj == null ) {
+				return false;
+			}
+			if ( obj.getClass() != this.getClass() ) {
+				return false;
+			}
+
+			final OriginalId other = (OriginalId) obj;
+			return Objects.equals( rev, other.rev ) && Objects.equals( id, other.id );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java
index a247e2fa0dc1..b6b31928a19a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
index 1203300b0bfb..b4c775d1b02d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.mutation;
 
@@ -112,9 +110,9 @@ void basicUnequivocallyInvalidNamedNativeDeleteTest(SessionFactoryScope scope) {
 			resultClass = BasicMutationQueryTests.SillyEntity.class
 	)
 	public static class SillyEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private SillyEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/BasicDeletionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/BasicDeletionTests.java
index 22fcfbe452d3..4a0d7da7bb7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/BasicDeletionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/BasicDeletionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.mutation.multitable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
index 301a8cdc0ebc..c96ca4b268fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.mutation.multitable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java
index bbc924d32a76..5d219149d700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.param;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java
index 10cea7ccbf39..13ff3a164beb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.query.sqm.param;
 
@@ -35,9 +33,9 @@ void testNoPersistenceExceptionThrown(SessionFactoryScope scope) {
 		// Converting `org.hibernate.type.descriptor.java.spi.JdbcTypeRecommendationException` to JPA `PersistenceException` :
 		// Could not determine recommended JdbcType for `org.hibernate.orm.test.query.sqm.param.EmptyEntityCollectionParameterTests$ContentEntry`
 		scope.inTransaction( session ->
-									 session.createQuery( "FROM DbEntity WHERE content IN (:vals)", DbEntity.class )
-											 .setParameter( "vals", Collections.emptyList() )
-											 .list()
+									session.createQuery( "FROM DbEntity WHERE content IN (:vals)", DbEntity.class )
+											.setParameter( "vals", Collections.emptyList() )
+											.list()
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java
index f2e18741145c..3b16aa7e6def 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.querycache;
 
 import java.lang.reflect.Constructor;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java
index ac0e165f9b3c..17b3641ecd6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Address.java 7996 2005-08-22 14:49:57Z steveebersole $
 package org.hibernate.orm.test.querycache;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java
index b54dad3fd4bd..6cf85997d399 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
@@ -21,7 +19,7 @@ public class CompositeKey implements Serializable {
 
 	public CompositeKey() {
 	}
-	
+
 	public CompositeKey(int a, int b) {
 		this.a = a;
 		this.b = b;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java
index c3a69f2412e1..a46f1a0342ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Course.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.querycache;
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java
index ec94914bc205..40e64a0bb1f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java
index 5874991d5fe8..4742fe7e3ae1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java
index cefc7ecc59a6..ec8a51073d93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java
index f7a22efdc589..81a0666dcee8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCachePutResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCachePutResultTransformerTest.java
index c64c73a7457b..196886644b9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCachePutResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CriteriaQueryCachePutResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java
index 078f67cc8e8e..e06b93866a40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Enrolment.java 6970 2005-05-31 20:24:41Z oneovthafew $
 package org.hibernate.orm.test.querycache;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
index a2af4ac5dd19..1e153913e12d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java
index eb329b13c1dd..17626a04b2c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java
index 694a11a0e829..06dd7f6138f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java
index 3e45ff906dd3..9d9c6e9c2294 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheNormalResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheNormalResultTransformerTest.java
index 3b5f0a4c2d0a..da103c998e8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheNormalResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCacheNormalResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCachePutResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCachePutResultTransformerTest.java
index 9e1cf0110503..1c5f4d2026bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCachePutResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/HqlQueryCachePutResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java
index 7ce075a3e858..d851ea9070ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Item.java 9587 2006-03-09 21:38:26Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.querycache;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java
index 2d01c2e31fb0..ed9a8eb201f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheExistingEntityInstanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheExistingEntityInstanceTest.java
index 3120e66d1caf..5b8f0f80abe6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheExistingEntityInstanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheExistingEntityInstanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java
index 5155c54a0325..df0a8eb81613 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheParametersTest.java
index cec35e1defb5..34e6a73821b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheParametersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java
index 20524284c069..5e6f79bb75a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheWithFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheWithFilterTest.java
index c1550a6b0e89..9d540817897d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheWithFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheWithFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java
index c04d22df867a..c5f577ff1747 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
@@ -11,11 +9,9 @@
 import org.hibernate.CacheMode;
 import org.hibernate.cache.internal.BasicCacheKeyImplementation;
 import org.hibernate.cache.spi.CacheImplementor;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.entry.CollectionCacheEntry;
 import org.hibernate.cache.spi.support.AbstractReadWriteAccess;
 import org.hibernate.cache.spi.support.CollectionReadWriteAccess;
-import org.hibernate.cache.spi.support.DomainDataStorageAccess;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 
@@ -34,7 +30,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.SharedCacheMode;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/SingleTableInheritanceQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/SingleTableInheritanceQueryCacheTest.java
index 8c125cb38bb7..3767895daae5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/SingleTableInheritanceQueryCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/SingleTableInheritanceQueryCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java
index 16b4ef192bb5..ad6fe3090a54 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
@@ -12,22 +10,22 @@
 
 @Embeddable
 public class StringCompositeKey implements Serializable {
-	
-    private static final long serialVersionUID = 1L;
-
- private String substation;
-    
-    private String deviceType;
-    
-    private String device;
-
-    private String analog;
-    
-    // For some dialects, the sum of a primary key column lengths cannot
-    // be larger than 255 (DB2).  Restrict them to a sufficiently
-    // small size.  See HHH-8085.
-    
-    @Column( length = 50 )
+
+	private static final long serialVersionUID = 1L;
+
+private String substation;
+
+	private String deviceType;
+
+	private String device;
+
+	private String analog;
+
+	// For some dialects, the sum of a primary key column lengths cannot
+	// be larger than 255 (DB2).  Restrict them to a sufficiently
+	// small size.  See HHH-8085.
+
+	@Column( length = 50 )
 	public String getSubstation() {
 		return substation;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java
index 4e21b1b63695..dc997f13ea37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java
index 8e3b0e52ed61..1a040a81929b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Student.java 9116 2006-01-23 21:21:01Z steveebersole $
 package org.hibernate.orm.test.querycache;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java
index 2bcb24d9295c..0e71ecf138ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java
@@ -1,13 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Created on 28-Jan-2005
- *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.querycache;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java
index 62c77436d8c8..ab7cde7acdae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.queryhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java
index cf286d07d5d6..b585b1519b3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.queryhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java
index 2982f416eb0d..d2ed2a413500 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintSQLServer2012Test.java
@@ -1,9 +1,6 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.queryhint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/AssociatedDataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/AssociatedDataPoint.java
index 04ab7c211e61..167165552453 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/AssociatedDataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/AssociatedDataPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
@@ -13,9 +11,9 @@
  */
 public class AssociatedDataPoint {
 	private long id;
-	
+
 	private AssociatedDataPoint manyToOne;
-	
+
 	private List manyToMany;
 
 	public long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java
index eaae3e082348..557da0f51b99 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/DataPoint.java
index ab79827bb988..62a07a803858 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/DataPoint.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
@@ -13,17 +11,17 @@
  */
 public class DataPoint {
 	private long id;
-	
+
 	private String fooProp;
-	
+
 	private DataPointEnum fooEnum;
-	
+
 	private List fooEnumList;
-	
+
 	private List oneToMany;
-	
+
 	private List manyToMany;
-	
+
 	public static enum DataPointEnum {
 		FOO1, FOO2, FOO3;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java
index c23bb1434c89..3d6520ceef53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
@@ -18,7 +16,7 @@ public class House {
 	@Id
 	@GeneratedValue
 	private Long id;
-	
+
 	private String streetAddress;
 
 	public Long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java
index b594d698970f..f56eeaaf4d75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java
index e23e14b53ebb..b2d98af22a74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 import jakarta.persistence.Column;
@@ -17,35 +15,35 @@
 @Table(name = "PHONE")
 public class Phone implements java.io.Serializable {
 
-    private Integer id;
-    private String brandName;
-    private float price;
+	private Integer id;
+	private String brandName;
+	private float price;
 
-    public Phone() {
-    }
+	public Phone() {
+	}
 
 	@Id
-    @Column(name="ID")
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	@Column(name="ID")
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    @Column(name="BRANDNAME")
-    public String getBrandName() {
-        return brandName;
-    }
-    public void setBrandName(String bName) {
-        this.brandName = bName;
-    }
+	@Column(name="BRANDNAME")
+	public String getBrandName() {
+		return brandName;
+	}
+	public void setBrandName(String bName) {
+		this.brandName = bName;
+	}
 
-    @Column(name="PRICE")
-    public float getPrice() {
-        return price;
-    }
-    public void setPrice(float price) {
-        this.price = price;
-    }
+	@Column(name="PRICE")
+	public float getPrice() {
+		return price;
+	}
+	public void setPrice(float price) {
+		this.price = price;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
index 23db99b87702..6965c7e937e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
@@ -50,8 +48,8 @@ public class QuoteGlobalTest {
 	@Test
 	@JiraKey(value = "HHH-7890")
 	public void testQuotedUniqueConstraint(SessionFactoryScope scope) {
-        Iterator itr = scope.getMetadataImplementor().getEntityBinding(Person.class.getName())
-                .getTable().getUniqueKeys().values().iterator();
+		Iterator itr = scope.getMetadataImplementor().getEntityBinding(Person.class.getName())
+				.getTable().getUniqueKeys().values().iterator();
 		while ( itr.hasNext() ) {
 			UniqueKey uk = itr.next();
 			assertEquals( 1, uk.getColumns().size() );
@@ -106,7 +104,7 @@ public void testHbmQuoting(SessionFactoryScope scope) {
 	private void doTestHbmQuoting(Class clazz, MetadataImplementor metadataImplementor) {
 		Table table = metadataImplementor.getEntityBinding( clazz.getName() ).getTable();
 		assertTrue( table.isQuoted() );
-        Iterator itr = table.getColumns().iterator();
+		Iterator itr = table.getColumns().iterator();
 		while ( itr.hasNext() ) {
 			Column column = (Column) itr.next();
 			assertTrue( column.isQuoted() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
index 207edcd1bbfb..3de3b75b7e20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
@@ -34,7 +32,7 @@
  * @author Brett Meyer
  */
 public class QuoteTest extends BaseNonConfigCoreFunctionalTestCase {
-	
+
 	@Test
 	public void testQuoteManytoMany() {
 		String role = User.class.getName() + ".roles";
@@ -54,7 +52,7 @@ public void testQuoteManytoMany() {
 		s.getTransaction().rollback();
 		s.close();
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-8464")
 	public void testDoubleQuoteJoinColumn() {
@@ -67,7 +65,7 @@ public void testDoubleQuoteJoinColumn() {
 		s.persist( user );
 		s.getTransaction().commit();
 		s.close();
-		
+
 		s = openSession();
 		s.getTransaction().begin();
 		user = s.get( User.class, user.getId() );
@@ -79,7 +77,7 @@ public void testDoubleQuoteJoinColumn() {
 		s.getTransaction().commit();
 		s.close();
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-2988")
 	public void testUnionSubclassEntityQuoting() {
@@ -88,12 +86,12 @@ public void testUnionSubclassEntityQuoting() {
 		Container container1 = new Container();
 		Container container2 = new Container();
 		SimpleItem simpleItem = new SimpleItem();
-		
+
 		container1.items.add( container2 );
 		container1.items.add( simpleItem );
 		container2.parent = container1;
 		simpleItem.parent = container1;
-		
+
 		s.persist( simpleItem );
 		s.persist( container2 );
 		s.persist( container1 );
@@ -133,7 +131,7 @@ protected Class[] getAnnotatedClasses() {
 				SimpleItem.class
 		};
 	}
-	
+
 	@Entity( name = "Item" )
 	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 	private static abstract class Item {
@@ -144,7 +142,7 @@ private static abstract class Item {
 
 		@Column(name = "_id")
 		protected long _id;
-		
+
 		@ManyToOne(fetch = FetchType.LAZY)
 		@JoinColumn(name = "`ParentID`")
 		protected Container parent;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java
index 5036d8ac1078..8ade81febaa3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.quote;
 import java.io.Serializable;
 import jakarta.persistence.Entity;
@@ -21,8 +17,8 @@
 @Table(name = "`Role`")
 public class Role implements Serializable {
 
-   @Id
-   @GeneratedValue(strategy = GenerationType.AUTO)
-   private long id;
+@Id
+@GeneratedValue(strategy = GenerationType.AUTO)
+private long id;
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java
index 628f2d1b7a9e..0291d3ee913f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.quote;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java
index 8abb1fea5f74..a4ef9f79968a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.quote;
 
 import java.io.Serializable;
@@ -48,7 +44,7 @@ public class User implements Serializable {
 	private Long house1;
 	@Column(name = "`house`", insertable = false, updatable = false )
 	private Long house2;
-	
+
 	// test UK on FK w/ global quoting -- see HHH-8638
 	// This MUST be initialized.  Several DBs do not allow multiple null values in a unique column.
 	@ManyToOne(cascade = CascadeType.ALL)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
index bed550fedac5..df679f824b0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Container.java
index 70a74df09dcc..44f70d4813ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Container.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Course.java
index 87226c5746d4..8c2cb51dded6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Course.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Course.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Course.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.readonly;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/DataPoint.java
index beabd6a82a4d..a18b22c5d8b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/DataPoint.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/DataPoint.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: DataPoint.java 7231 2005-06-19 22:04:00Z oneovthafew $
 package org.hibernate.orm.test.readonly;
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Enrolment.java
index 5451bf18eefe..e4225e6770e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Enrolment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Enrolment.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Enrolment.java 6970 2005-05-31 20:24:41Z oneovthafew $
 package org.hibernate.orm.test.readonly;
 import java.io.Serializable;
 
@@ -55,14 +51,14 @@ public short getYear() {
 	public void setYear(short year) {
 		this.year = year;
 	}
-	
+
 	public boolean equals(Object other) {
 		if ( !(other instanceof Enrolment) ) return false;
 		Enrolment that = (Enrolment) other;
 		return studentNumber==that.studentNumber &&
 			courseCode.equals(that.courseCode);
 	}
-	
+
 	public int hashCode() {
 		return courseCode.hashCode();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Info.java
index 5417e0fa86d9..b314d16d2b1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Owner.java
index f16ce5c1960f..31506133af71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Owner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Owner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java
index aca78d1a38ac..0ab1921d66d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
index 40bda374157b..9603a2b4e7ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java
index 1f169696b324..c244d751c00f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
@@ -335,7 +333,7 @@ public void testExistingReadOnlyAfterSetSessionModifiableExisting(SessionFactory
 
 	@SuppressWarnings( {"unchecked"})
 	@Test
- 	public void testExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly(SessionFactoryScope scope) {
+	public void testExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly(SessionFactoryScope scope) {
 		Container cOrig = createContainer();
 		Set expectedInitializedObjects = new HashSet(
 				Arrays.asList(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
index f2b6f903bd9f..8eeb1b586430 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
index e6a9dd550cb8..0662a054158d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
@@ -660,4 +658,3 @@ private Session openSession(SessionFactoryScope scope) {
 		return scope.getSessionFactory().openSession();
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyUserDefinedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyUserDefinedTest.java
index 25527daab9a2..a1a85118c248 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyUserDefinedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyUserDefinedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
index 48ce7278c391..0f56867a9b9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Student.java
index 91220468f044..a5259cff9db0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Student.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/Student.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Student.java 9116 2006-01-23 21:21:01Z steveebersole $
 package org.hibernate.orm.test.readonly;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java
index 454b20c23f3d..ee29919c0f9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java
@@ -1,13 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Created on 28-Jan-2005
- *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
@@ -22,13 +15,13 @@ public class StudentDTO {
 	private String courseDescription;
 
 	public StudentDTO() { }
-	
+
 	public String getName() {
 		return studentName;
 	}
-	
+
 	public String getDescription() {
 		return courseDescription;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/TextHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/TextHolder.java
index a5af1e3ac3d5..34a8ab713f4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/TextHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/TextHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.readonly;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/VersionedNode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/VersionedNode.java
index f5c750bbce12..af0a9e2e8afb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/VersionedNode.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/VersionedNode.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
-
 package org.hibernate.orm.test.readonly;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Child.java
index 008616b01a2e..41e203a49457 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.reattachment;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java
index 9c673173e66b..56f0b02383c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.reattachment;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Parent.java
index 75b808ebc0ef..3be19b751d5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.reattachment;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java
index 24de7fd7e9bc..3d60c9694e4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.reattachment;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
index 8e4fde698bb9..aa7ce7fa9a34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.records;
 
 import java.time.LocalDate;
@@ -80,7 +84,7 @@ public boolean isSameClass(Object object, SessionFactoryImplementor sessionFacto
 			@Override
 			public Object instantiate(ValueAccess valueAccess, SessionFactoryImplementor sessionFactory) {
 				return new MyRecord( valueAccess.getValue( 2, Integer.class ), valueAccess.getValue( 1, String.class ),
-									 valueAccess.getValue( 0, LocalDate.class )
+									valueAccess.getValue( 0, LocalDate.class )
 				);
 			}
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEnbeddedIdRecordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEnbeddedIdRecordTest.java
index 99b8b890083d..43e9d019a5fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEnbeddedIdRecordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEnbeddedIdRecordTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.records;
 
 import jakarta.persistence.CascadeType;
@@ -27,47 +31,47 @@
 @DomainModel(annotatedClasses = {GenericEnbeddedIdRecordTest.MainEntity.class, GenericEnbeddedIdRecordTest.ReferencedEntity.class})
 class GenericEnbeddedIdRecordTest {
 
-    @Test
-    void testOverrideJoinColumn(SessionFactoryScope scope) {
-        scope.inTransaction(entityManager -> {
-            MainEntity mainEntity = new MainEntity();
-            ReferencedEntity referencedEntity = new ReferencedEntity();
-            mainEntity.id = new GenericEmbeddedId<>(referencedEntity);
-            referencedEntity.entities = Collections.singleton(mainEntity);
-            entityManager.persist(referencedEntity);
-            assertNotNull(mainEntity);
-        });
-    }
+	@Test
+	void testOverrideJoinColumn(SessionFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
+			MainEntity mainEntity = new MainEntity();
+			ReferencedEntity referencedEntity = new ReferencedEntity();
+			mainEntity.id = new GenericEmbeddedId<>(referencedEntity);
+			referencedEntity.entities = Collections.singleton(mainEntity);
+			entityManager.persist(referencedEntity);
+			assertNotNull(mainEntity);
+		});
+	}
 
-    @Embeddable
-    public record GenericEmbeddedId(@ManyToOne(fetch = FetchType.EAGER)
-                                       @JoinColumn(name = "REFERENCED_ENTITY_ID")
-                                       T referencedEntity) {
-    }
+	@Embeddable
+	public record GenericEmbeddedId(@ManyToOne(fetch = FetchType.EAGER)
+									@JoinColumn(name = "REFERENCED_ENTITY_ID")
+									T referencedEntity) {
+	}
 
-    @Entity
-    public static class MainEntity {
+	@Entity
+	public static class MainEntity {
 
-        @EmbeddedId
-        private GenericEmbeddedId id;
+		@EmbeddedId
+		private GenericEmbeddedId id;
 
-        @Column(name = "DESCRIPTION")
-        private String description;
+		@Column(name = "DESCRIPTION")
+		private String description;
 
-    }
+	}
 
-    @Entity
-    public static class ReferencedEntity {
+	@Entity
+	public static class ReferencedEntity {
 
-        @Id
-        @GeneratedValue(strategy = GenerationType.SEQUENCE,
-                generator = "REFERENCED_ENTITY_ID_GEN")
-        @SequenceGenerator(name = "REFERENCED_ENTITY_ID_GEN")
-        @Column(name = "REFERENCED_ENTITY_ID")
-        private Long id;
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE,
+				generator = "REFERENCED_ENTITY_ID_GEN")
+		@SequenceGenerator(name = "REFERENCED_ENTITY_ID_GEN")
+		@Column(name = "REFERENCED_ENTITY_ID")
+		private Long id;
 
-        @OneToMany(mappedBy = "id.referencedEntity", cascade = CascadeType.ALL)
-        private Collection entities;
+		@OneToMany(mappedBy = "id.referencedEntity", cascade = CascadeType.ALL)
+		private Collection entities;
 
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordEmbeddedIdTest.java
index 834d8fd97314..9be220044e0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordEmbeddedIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.records;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordPropertyTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordPropertyTestCase.java
index e90b59c4a876..82aa73032dac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordPropertyTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/MergeRecordPropertyTestCase.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.records;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/OutOfTheBoxRecordAsEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/OutOfTheBoxRecordAsEmbeddableTest.java
index 0ba929d30d7a..9630ce5f804e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/OutOfTheBoxRecordAsEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/OutOfTheBoxRecordAsEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.records;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordAsEmbeddableEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordAsEmbeddableEnhancementTest.java
index 28dad33bfc82..c8a32faffdb3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordAsEmbeddableEnhancementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordAsEmbeddableEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.records;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordEmbeddedIdGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordEmbeddedIdGeneratedValueTest.java
index e276b4585157..ec2d4189ea5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordEmbeddedIdGeneratedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordEmbeddedIdGeneratedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.records;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassAndMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassAndMapsIdTest.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassTest.java
index 24fd32464bd1..07bffc8d9cfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordIdClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.records;
 
@@ -14,7 +12,6 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;
-import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
@@ -22,7 +19,6 @@
 import jakarta.persistence.ManyToOne;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * @author Marco Belladelli
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
index 1418003647dc..2ef28e54f81f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.records;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/JPARefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/JPARefreshTest.java
index 323310d5e0ec..a9ca12832cf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/JPARefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/JPARefreshTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.refresh;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndCollections.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndCollections.java
index c23aae9d7ec9..4c11c454d244 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndCollections.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndCollections.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.refresh;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
index 6829a6b368d7..e423a0f24719 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
index f8235a25e6f1..9cff5f6fddea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshTest.java
index 7169796fee10..cead0fd041d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.refresh;
 
 import java.io.Serializable;
@@ -6,7 +10,6 @@
 import java.util.LinkedList;
 import java.util.Set;
 
-import org.hibernate.TransientObjectException;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java
index b15fec7ef06b..fa4cb1b6571d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.refresh;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java
index a7b3df974775..d9945532ca41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java
index 7037ebbf4e46..bb33b00cc90e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java
index b6b425f2815f..b1e55cc86121 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.common;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java
index 20a33e572787..f9c2d4aec779 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java
index 2c84bef97b77..240a88eb1259 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java
index e5264d4d293b..864871834a0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java
index a466fda839f0..c3d28e2e5200 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
index e489fd027eb0..288ebd38618a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java
index 22ecf40e9db2..57b71caaea38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jdbc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
index ea0ee1486426..d968b4dbb7af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jdbc.autocommit;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java
index 5f618c0af092..4788451ce5fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java
index bd54290f1ca3..59046754906b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java
index 40fc3f5475e3..fd5fa1a28430 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java
index ef5afe612d56..bcf0de69d2ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java
index 554306e1995a..f0ca7aabf91f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java
index db3560052890..249a436059c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java
index 93d970910be5..1519f325b8f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java
index bbec30764163..a0e51a4368b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
@@ -15,7 +13,6 @@
 import org.hibernate.testing.jta.TestingJtaBootstrap;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java
index 11638376b677..d111303bbcf9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resource.transaction.jta;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/Contract.java
index 0e1a3ec5fa42..251245ee1add 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/Contract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/Contract.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.resulttransformer;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerA.java
index bf7688bc8534..c12bc9f64c1b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerA.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.resulttransformer;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerB.java
index a59b3c5a8b9e..1c67f934c4b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerB.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/PartnerB.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.resulttransformer;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
index d362373dc272..b15d145cf19e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.resulttransformer;
 
@@ -78,5 +76,3 @@ public void testResultTransformerIsAppliedToScrollableResults(SessionFactoryScop
 		} );
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/Point.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/Point.java
index 1045c6959dc0..e489f5d06414 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/Point.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/Point.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Point.java 6477 2005-04-21 07:39:21Z oneovthafew $
 package org.hibernate.orm.test.rowid;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -20,7 +16,7 @@ public class Point implements Serializable {
 	private Object row;
 
 	Point() {}
-	
+
 	public Point(BigDecimal x, BigDecimal y) {
 		this.x = x;
 		this.y = y;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java
index 53af22f627a3..bd4a686a3eb6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.rowid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest2.java
index 607ab409ab61..934a788f0c34 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.rowid;
 
@@ -51,7 +49,7 @@ public void setUp(SessionFactoryScope scope) {
 									st,
 									"create table Point (\"x\" number(19,2) not null, \"y\" number(19,2) not null, description varchar2(255) )"
 							);
-                            session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st );
+							session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st );
 						}
 				)
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdType.java
index b37c2a90ec57..943adf72aae5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdType.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: RowIdType.java 6477 2005-04-21 07:39:21Z oneovthafew $
 package org.hibernate.orm.test.rowid;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdUpdateAndDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdUpdateAndDeleteTest.java
index c65309de7fac..73eda85c9e3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdUpdateAndDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdUpdateAndDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.rowid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/BaseSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/BaseSchemaGeneratorTest.java
index 4a8a85cacd35..4a056aee6597 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/BaseSchemaGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/BaseSchemaGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/CheckTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/CheckTest.java
index 09b0e4546c4a..c50c8b904c46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/CheckTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/CheckTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/ColumnDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/ColumnDefaultTest.java
index 5f4cd681eaea..e10d07238414 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/ColumnDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/ColumnDefaultTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
@@ -23,71 +21,71 @@
  */
 public class ColumnDefaultTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Person.class,
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Person.class,
+		};
+	}
 
-    @Test
-    public void test() {
+	@Test
+	public void test() {
 		//tag::schema-generation-column-default-value-persist-example[]
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Person person = new Person();
-            person.setId(1L);
-            entityManager.persist(person);
-        });
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Person person = entityManager.find(Person.class, 1L);
-            assertEquals("N/A", person.getName());
-            assertEquals(Long.valueOf(-1L), person.getClientId());
-        });
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Person person = new Person();
+			person.setId(1L);
+			entityManager.persist(person);
+		});
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Person person = entityManager.find(Person.class, 1L);
+			assertEquals("N/A", person.getName());
+			assertEquals(Long.valueOf(-1L), person.getClientId());
+		});
 		//end::schema-generation-column-default-value-persist-example[]
-    }
+	}
 
-    //tag::schema-generation-column-default-value-mapping-example[]
-    @Entity(name = "Person")
-    @DynamicInsert
-    public static class Person {
+	//tag::schema-generation-column-default-value-mapping-example[]
+	@Entity(name = "Person")
+	@DynamicInsert
+	public static class Person {
 
-        @Id
-        private Long id;
+		@Id
+		private Long id;
 
-        @ColumnDefault("'N/A'")
-        private String name;
+		@ColumnDefault("'N/A'")
+		private String name;
 
-        @ColumnDefault("-1")
-        private Long clientId;
+		@ColumnDefault("-1")
+		private Long clientId;
 
-        //Getter and setters omitted for brevity
+		//Getter and setters omitted for brevity
 
-    //end::schema-generation-column-default-value-mapping-example[]
+	//end::schema-generation-column-default-value-mapping-example[]
 
-        public Long getId() {
-            return id;
-        }
+		public Long getId() {
+			return id;
+		}
 
-        public void setId(Long id) {
-            this.id = id;
-        }
+		public void setId(Long id) {
+			this.id = id;
+		}
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public Long getClientId() {
-            return clientId;
-        }
+		public Long getClientId() {
+			return clientId;
+		}
 
-        public void setClientId(Long clientId) {
-            this.clientId = clientId;
-        }
-    //tag::schema-generation-column-default-value-mapping-example[]
-    }
-    //end::schema-generation-column-default-value-mapping-example[]
+		public void setClientId(Long clientId) {
+			this.clientId = clientId;
+		}
+	//tag::schema-generation-column-default-value-mapping-example[]
+	}
+	//end::schema-generation-column-default-value-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/H2SchemaGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/H2SchemaGenerationTest.java
index c78ccd7415d5..ee3c6f9668e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/H2SchemaGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/H2SchemaGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/IndexTest.java
index 1f2a6fa04936..cbb46c6be6ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/IndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/IndexTest.java
@@ -1,29 +1,21 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ForeignKey;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-import jakarta.persistence.UniqueConstraint;
 
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Vlad Mihalcea
@@ -31,73 +23,73 @@
 
 public class IndexTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Author.class,
-        };
-    }
-
-    @Test
-    public void test() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Author author = new Author();
-            author.setFirstName("Vlad");
-            author.setLastName("Mihalcea");
-            entityManager.persist(author);
-        });
-    }
-
-    //tag::schema-generation-columns-index-mapping-example[]
-    @Entity
-    @Table(
-        name = "author",
-        indexes =  @Index(
-            name = "idx_author_first_last_name",
-            columnList = "first_name, last_name",
-            unique = false
-       )
-   )
-    public static class Author {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @Column(name = "first_name")
-        private String firstName;
-
-        @Column(name = "last_name")
-        private String lastName;
-
-        //Getter and setters omitted for brevity
-    //end::schema-generation-columns-index-mapping-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public String getLastName() {
-            return lastName;
-        }
-
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-
-    //tag::schema-generation-columns-index-mapping-example[]
-    }
-    //end::schema-generation-columns-index-mapping-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Author.class,
+		};
+	}
+
+	@Test
+	public void test() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Author author = new Author();
+			author.setFirstName("Vlad");
+			author.setLastName("Mihalcea");
+			entityManager.persist(author);
+		});
+	}
+
+	//tag::schema-generation-columns-index-mapping-example[]
+	@Entity
+	@Table(
+		name = "author",
+		indexes =  @Index(
+			name = "idx_author_first_last_name",
+			columnList = "first_name, last_name",
+			unique = false
+	)
+)
+	public static class Author {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Column(name = "first_name")
+		private String firstName;
+
+		@Column(name = "last_name")
+		private String lastName;
+
+		//Getter and setters omitted for brevity
+	//end::schema-generation-columns-index-mapping-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+	//tag::schema-generation-columns-index-mapping-example[]
+	}
+	//end::schema-generation-columns-index-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/PostgreSQLSchemaGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/PostgreSQLSchemaGenerationTest.java
index d363a14591e1..a56faaa9dc8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/PostgreSQLSchemaGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/PostgreSQLSchemaGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/SubclassIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/SubclassIndexTest.java
index 19ea3b56398d..1e12698903b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/SubclassIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/SubclassIndexTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schema;
 
 import jakarta.persistence.Entity;
@@ -6,12 +10,9 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderColumn;
 import jakarta.persistence.Table;
-import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/UniqueConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/UniqueConstraintTest.java
index 9e0c0e27044d..a817e236378b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schema/UniqueConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schema/UniqueConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schema;
 
@@ -32,144 +30,144 @@
 
 public class UniqueConstraintTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Book.class,
-            Author.class,
-        };
-    }
-
-    @Test
-    public void test() {
-        //tag::schema-generation-columns-unique-constraint-persist-example[]
-        Author _author = doInJPA(this::entityManagerFactory, entityManager -> {
-            Author author = new Author();
-            author.setFirstName("Vlad");
-            author.setLastName("Mihalcea");
-            entityManager.persist(author);
-
-            Book book = new Book();
-            book.setTitle("High-Performance Java Persistence");
-            book.setAuthor(author);
-            entityManager.persist(book);
-
-            return author;
-        });
-
-        try {
-            doInJPA(this::entityManagerFactory, entityManager -> {
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Book.class,
+			Author.class,
+		};
+	}
+
+	@Test
+	public void test() {
+		//tag::schema-generation-columns-unique-constraint-persist-example[]
+		Author _author = doInJPA(this::entityManagerFactory, entityManager -> {
+			Author author = new Author();
+			author.setFirstName("Vlad");
+			author.setLastName("Mihalcea");
+			entityManager.persist(author);
+
+			Book book = new Book();
+			book.setTitle("High-Performance Java Persistence");
+			book.setAuthor(author);
+			entityManager.persist(book);
+
+			return author;
+		});
+
+		try {
+			doInJPA(this::entityManagerFactory, entityManager -> {
 				Book book = new Book();
 				book.setTitle("High-Performance Java Persistence");
 				book.setAuthor(_author);
 				entityManager.persist(book);
 			});
-        }
-        catch (Exception expected) {
-            assertNotNull(ExceptionUtil.findCause(expected, ConstraintViolationException.class));
-        }
-        //end::schema-generation-columns-unique-constraint-persist-example[]
-    }
-
-    //tag::schema-generation-columns-unique-constraint-mapping-example[]
-    @Entity
-    @Table(
-        name = "book",
-        uniqueConstraints =  @UniqueConstraint(
-            name = "uk_book_title_author",
-            columnNames = {
-                "title",
-                "author_id"
-            }
-       )
-   )
-    public static class Book {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String title;
-
-        @ManyToOne(fetch = FetchType.LAZY)
-        @JoinColumn(
-            name = "author_id",
-            foreignKey = @ForeignKey(name = "fk_book_author_id")
-       )
-        private Author author;
-
-        //Getter and setters omitted for brevity
-    //end::schema-generation-columns-unique-constraint-mapping-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public Author getAuthor() {
-            return author;
-        }
-
-        public void setAuthor(Author author) {
-            this.author = author;
-        }
-
-    //tag::schema-generation-columns-unique-constraint-mapping-example[]
-    }
-
-    @Entity
-    @Table(name = "author")
-    public static class Author {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        @Column(name = "first_name")
-        private String firstName;
-
-        @Column(name = "last_name")
-        private String lastName;
-
-        //Getter and setters omitted for brevity
-    //end::schema-generation-columns-unique-constraint-mapping-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public String getLastName() {
-            return lastName;
-        }
-
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-
-    //tag::schema-generation-columns-unique-constraint-mapping-example[]
-    }
-    //end::schema-generation-columns-unique-constraint-mapping-example[]
+		}
+		catch (Exception expected) {
+			assertNotNull(ExceptionUtil.findCause(expected, ConstraintViolationException.class));
+		}
+		//end::schema-generation-columns-unique-constraint-persist-example[]
+	}
+
+	//tag::schema-generation-columns-unique-constraint-mapping-example[]
+	@Entity
+	@Table(
+		name = "book",
+		uniqueConstraints =  @UniqueConstraint(
+			name = "uk_book_title_author",
+			columnNames = {
+				"title",
+				"author_id"
+			}
+	)
+)
+	public static class Book {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String title;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(
+			name = "author_id",
+			foreignKey = @ForeignKey(name = "fk_book_author_id")
+	)
+		private Author author;
+
+		//Getter and setters omitted for brevity
+	//end::schema-generation-columns-unique-constraint-mapping-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getTitle() {
+			return title;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public Author getAuthor() {
+			return author;
+		}
+
+		public void setAuthor(Author author) {
+			this.author = author;
+		}
+
+	//tag::schema-generation-columns-unique-constraint-mapping-example[]
+	}
+
+	@Entity
+	@Table(name = "author")
+	public static class Author {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Column(name = "first_name")
+		private String firstName;
+
+		@Column(name = "last_name")
+		private String lastName;
+
+		//Getter and setters omitted for brevity
+	//end::schema-generation-columns-unique-constraint-mapping-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+	//tag::schema-generation-columns-unique-constraint-mapping-example[]
+	}
+	//end::schema-generation-columns-unique-constraint-mapping-example[]
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java
index dda82e3594aa..f1e554f839ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemafilter;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java
index 7f2623638469..aafc679702a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemafilter;
 
 import java.util.EnumMap;
@@ -61,4 +65,4 @@ public void prepare() {
 	public void release() {
 		// nothing to do
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterProviderTest.java
index 28a89898121d..bda5a21b3f10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterProviderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterProviderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemafilter;
 
 import java.sql.SQLException;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java
index ba27fd904015..893b89f8bd2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemafilter;
 
 import java.util.Arrays;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java
index fc0289419f4f..e28684757ed9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemafilter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerDefaultSchemaTest.java
index 934431f2d618..3099810443e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerDefaultSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerDefaultSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemamanager;
 
@@ -87,4 +85,3 @@ static class Author {
 		public Book favoriteBook;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerExplicitSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerExplicitSchemaTest.java
index 194be38b0b4c..acbef3d30760 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerExplicitSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerExplicitSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemamanager;
 
@@ -93,4 +91,3 @@ static class Author {
 		public Book favoriteBook;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerLoadScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerLoadScriptTest.java
index e96776ee11eb..3dc93c9d9e56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerLoadScriptTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerLoadScriptTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemamanager;
 
@@ -34,7 +32,7 @@
 @DomainModel(annotatedClasses = {SchemaManagerLoadScriptTest.Book.class, SchemaManagerLoadScriptTest.Author.class})
 @SessionFactory(exportSchema = false)
 @ServiceRegistry(settings = @Setting(name = JAKARTA_HBM2DDL_LOAD_SCRIPT_SOURCE,
-			                    	value = "org/hibernate/orm/test/schemamanager/data.sql"))
+									value = "org/hibernate/orm/test/schemamanager/data.sql"))
 @RequiresDialectFeature(feature= DialectFeatureChecks.SupportsTruncateTable.class)
 public class SchemaManagerLoadScriptTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckColumnDefinitionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckColumnDefinitionTests.java
index 891d8fa78d82..9e6fc69a84c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckColumnDefinitionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckColumnDefinitionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schematools;
 
@@ -15,9 +13,7 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.orm.test.tool.schema.ExecutionOptionsTestImpl;
@@ -33,8 +29,6 @@
 import org.hibernate.tool.schema.spi.ScriptTargetOutput;
 import org.hibernate.tool.schema.spi.SourceDescriptor;
 import org.hibernate.tool.schema.spi.TargetDescriptor;
-import org.hibernate.type.NumericBooleanConverter;
-import org.hibernate.type.YesNoConverter;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
@@ -43,7 +37,6 @@
 
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -142,9 +135,9 @@ public SchemaManagementTool getFallbackSchemaManagementTool(Map
 	@Entity( name = "SimpleEntity" )
 	@Table( name = "SimpleEntity" )
 	public static class SimpleEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Column(columnDefinition = "enum ('SOURCE','CLASS','RUNTIME')")
 		@Enumerated(EnumType.STRING)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckTests.java
index 09d591f00db3..64d0f134ec8b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/EnumCheckTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schematools;
 
@@ -16,7 +14,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
@@ -144,9 +141,9 @@ public SchemaManagementTool getFallbackSchemaManagementTool(Map
 	@Entity( name = "SimpleEntity" )
 	@Table( name = "SimpleEntity" )
 	public static class SimpleEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Enumerated(EnumType.STRING)
 		RetentionPolicy retentionPolicy;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/FallbackSchemaManagementToolTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/FallbackSchemaManagementToolTests.java
index 03b8b308047f..e8bb22cc7e17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/FallbackSchemaManagementToolTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/FallbackSchemaManagementToolTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schematools;
 
@@ -14,7 +12,6 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
@@ -137,9 +134,9 @@ public SchemaManagementTool getFallbackSchemaManagementTool(Map
 	@Entity( name = "SimpleEntity" )
 	@Table( name = "SimpleEntity" )
 	public static class SimpleEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private SimpleEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
index 07e45e00b95b..0c95d148c3d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schematools;
 
 import java.io.Serializable;
@@ -104,8 +108,8 @@ public void getPrimaryKey() throws Exception {
 			List pkColumnNames = new ArrayList<>();
 			primaryKey.getColumns().forEach( columnInformation -> {
 				pkColumnNames.add( columnInformation.getColumnIdentifier()
-										   .getCanonicalName()
-										   .toLowerCase( Locale.ROOT ) );
+										.getCanonicalName()
+										.toLowerCase( Locale.ROOT ) );
 			} );
 
 			assertThat( pkColumnNames.size() ).isEqualTo( 2 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java
index cc94508c2b73..a5908fdfd401 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schematools;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java
index 9e69bf6ca5e1..9975eacf1655 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
index 00fb601d7b23..42b5c3ed372b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
index 1f3e9289ed61..b9d496eeab37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CheckConstraintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CheckConstraintsTest.java
index 7fad89251bbf..63ad3d146a16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CheckConstraintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CheckConstraintsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java
index 158ec8147d27..5134b83f2154 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java
index 13efed8c46c2..bae9574bc5e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java
index e15f6a2ac5ca..c8b795f91471 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.util.EnumSet;
-import java.util.Properties;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -16,10 +13,8 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 import org.hibernate.tool.hbm2ddl.SchemaValidator;
 import org.hibernate.tool.schema.TargetType;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CreateCharDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CreateCharDiscriminatorTest.java
index 602b3c486fd8..f3fbef25bdc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CreateCharDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CreateCharDiscriminatorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.util.Map;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java
index 2f08a877fcf5..5b9f4c8f69a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -23,7 +21,6 @@
 import org.hibernate.boot.model.relational.SimpleAuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.Index;
 import org.hibernate.mapping.PrimaryKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java
index 22de192c073c..bd2c7b0e344f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java
index 46bd8539dca3..8d0076e3ad23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.util.EnumSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java
index ae21901034c4..557a0b9b1ae4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java
index 292ae7e3a0a3..06fc6b7b5cac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import static org.junit.Assert.assertFalse;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java
index ac059985a2a9..053ada7808c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java
index ea0d8596aed9..7509b586b3ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LobSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LobSchemaUpdateTest.java
index 5d16928145d0..67bf4aa37d79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LobSchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LobSchemaUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
@@ -5,7 +9,6 @@
 import java.nio.file.Files;
 import java.util.EnumSet;
 
-import org.hibernate.annotations.Nationalized;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LocalDateTimeAndEnumSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LocalDateTimeAndEnumSchemaUpdateTest.java
index ff8f67e76413..055f288798f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LocalDateTimeAndEnumSchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/LocalDateTimeAndEnumSchemaUpdateTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
index 116e54380528..505baec520a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -85,7 +83,7 @@ public void testSimpleColumnAddition() {
 		);
 
 		assertEquals( 0, v2schemaUpdate.getExceptions().size() );
-		
+
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), v2metadata );
 
 	}
@@ -132,7 +130,7 @@ public void testSimpleColumnTypeChange() {
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), v2metadata );
 
 	}
-	
+
 //	/**
 //	 * 3_Version.hbm.xml contains a named unique constraint and an un-named
 //	 * unique constraint (will receive a randomly-generated name).  Create
@@ -247,4 +245,3 @@ public static class PersonInfo {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java
index 15e0e9f8d729..52977064e8f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaCreationTest.java
index 99083ec1c9d4..0dc362ba42b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaCreationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaValidationTest.java
index d2dd05051c3c..a592b4a3bda2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MySQLLobSchemaValidationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
index ea7fe00470de..9f732e26662c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -155,10 +153,10 @@ public void test() {
 
 			final List sqlLines = Files.readAllLines( output.toPath(), Charset.defaultCharset() );
 			assertEquals( 2 ,
-						  sqlLines
-						  .stream()
-						  .filter( s -> s.equalsIgnoreCase( "create sequence SEQ_TEST start with 1 increment by 1;" ) )
-						  .count()
+						sqlLines
+						.stream()
+						.filter( s -> s.equalsIgnoreCase( "create sequence SEQ_TEST start with 1 increment by 1;" ) )
+						.count()
 			);
 		}
 		catch (IOException e) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java
index be9b423c2161..166f235b601c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java
index a869589ba225..5e170d0707ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java
index 194c1b077e1f..8f35d2998521 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java
index 76a3ca7082dc..e092cf61441a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java
index f158f0d6b3aa..22f23d5aeca5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java
index ab1bf0176c44..786b86274099 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java
index 6010e847e6ce..377e9cd9992c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -38,22 +36,22 @@
  * @author Gail Badner
  */
 public class SchemaExportTest extends BaseUnitTestCase {
-    private boolean doesDialectSupportDropTableIfExist() {
+	private boolean doesDialectSupportDropTableIfExist() {
 		final Dialect dialect = metadata.getDatabase().getDialect();
 		return dialect.supportsIfExistsAfterTableName() || dialect.supportsIfExistsBeforeTableName();
-    }
+	}
 
 	protected ServiceRegistry serviceRegistry;
-    protected MetadataImplementor metadata;
+	protected MetadataImplementor metadata;
 
 	@Before
 	public void setUp() {
 		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
-        metadata = (MetadataImplementor) new MetadataSources( serviceRegistry )
-                .addResource( "org/hibernate/orm/test/schemaupdate/mapping.hbm.xml" )
-                .buildMetadata();
+		metadata = (MetadataImplementor) new MetadataSources( serviceRegistry )
+				.addResource( "org/hibernate/orm/test/schemaupdate/mapping.hbm.xml" )
+				.buildMetadata();
 		metadata.orderColumns( false );
-        metadata.validate();
+		metadata.validate();
 
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE, TargetType.STDOUT ), metadata );
 	}
@@ -64,37 +62,37 @@ public void tearDown() {
 		serviceRegistry = null;
 	}
 
-    @Test
-    public void testCreateAndDropOnlyType() {
+	@Test
+	public void testCreateAndDropOnlyType() {
 		final SchemaExport schemaExport = new SchemaExport();
 
-        // create w/o dropping first; (OK because tables don't exist yet
-        schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.CREATE, metadata );
-        assertEquals( 0, schemaExport.getExceptions().size() );
+		// create w/o dropping first; (OK because tables don't exist yet
+		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.CREATE, metadata );
+		assertEquals( 0, schemaExport.getExceptions().size() );
 
-        // create w/o dropping again; should cause an exception because the tables exist already
+		// create w/o dropping again; should cause an exception because the tables exist already
 		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.CREATE, metadata );
-        assertEquals( 1, schemaExport.getExceptions().size() );
+		assertEquals( 1, schemaExport.getExceptions().size() );
 
-        // drop tables only
+		// drop tables only
 		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.DROP, metadata );
-        assertEquals( 0, schemaExport.getExceptions().size() );
-    }
+		assertEquals( 0, schemaExport.getExceptions().size() );
+	}
 
-    @Test
-    public void testBothType() {
+	@Test
+	public void testBothType() {
 		final SchemaExport schemaExport = new SchemaExport();
 
-        // drop before create (nothing to drop yeT)
-        schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.DROP, metadata );
-        if ( doesDialectSupportDropTableIfExist() ) {
-            assertEquals( 0, schemaExport.getExceptions().size() );
-        }
-        else {
-            assertEquals( 1, schemaExport.getExceptions().size() );
-        }
+		// drop before create (nothing to drop yeT)
+		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.DROP, metadata );
+		if ( doesDialectSupportDropTableIfExist() ) {
+			assertEquals( 0, schemaExport.getExceptions().size() );
+		}
+		else {
+			assertEquals( 1, schemaExport.getExceptions().size() );
+		}
 
-        // drop before create again (this time drops the tables before re-creating)
+		// drop before create again (this time drops the tables before re-creating)
 		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.BOTH, metadata );
 		int exceptionCount = schemaExport.getExceptions().size();
 		if ( doesDialectSupportDropTableIfExist() ) {
@@ -103,47 +101,47 @@ public void testBothType() {
 
 		// drop tables
 		schemaExport.execute( EnumSet.of( TargetType.DATABASE ), SchemaExport.Action.DROP, metadata );
-        assertEquals( 0, schemaExport.getExceptions().size() );
-    }
+		assertEquals( 0, schemaExport.getExceptions().size() );
+	}
 
-    @Test
-    public void testGenerateDdlToFile() {
+	@Test
+	public void testGenerateDdlToFile() {
 		final SchemaExport schemaExport = new SchemaExport();
 
-        File outFile = new File("schema.ddl");
-        schemaExport.setOutputFile( outFile.getPath() );
+		File outFile = new File("schema.ddl");
+		schemaExport.setOutputFile( outFile.getPath() );
 
-        // do not script to console or export to database
-        schemaExport.execute( EnumSet.of( TargetType.SCRIPT ), SchemaExport.Action.DROP, metadata );
-        if ( doesDialectSupportDropTableIfExist() && schemaExport.getExceptions().size() > 0 ) {
-            assertEquals( 2, schemaExport.getExceptions().size() );
-        }
-        assertTrue( outFile.exists() );
+		// do not script to console or export to database
+		schemaExport.execute( EnumSet.of( TargetType.SCRIPT ), SchemaExport.Action.DROP, metadata );
+		if ( doesDialectSupportDropTableIfExist() && schemaExport.getExceptions().size() > 0 ) {
+			assertEquals( 2, schemaExport.getExceptions().size() );
+		}
+		assertTrue( outFile.exists() );
 
-        //check file is not empty
-        assertTrue( outFile.length() > 0 );
-        outFile.delete();
-    }
+		//check file is not empty
+		assertTrue( outFile.length() > 0 );
+		outFile.delete();
+	}
 
-    @Test
-    public void testCreateAndDrop() {
+	@Test
+	public void testCreateAndDrop() {
 		final SchemaExport schemaExport = new SchemaExport();
 
-        // should drop before creating, but tables don't exist yet
-        schemaExport.create( EnumSet.of( TargetType.DATABASE ), metadata );
+		// should drop before creating, but tables don't exist yet
+		schemaExport.create( EnumSet.of( TargetType.DATABASE ), metadata );
 		if ( doesDialectSupportDropTableIfExist() ) {
 			assertEquals( 0, schemaExport.getExceptions().size() );
 		}
 		else {
 			assertEquals( 1, schemaExport.getExceptions().size() );
 		}
-        // call create again; it should drop tables before re-creating
+		// call create again; it should drop tables before re-creating
 		schemaExport.create( EnumSet.of( TargetType.DATABASE ), metadata );
-        assertEquals( 0, schemaExport.getExceptions().size() );
-        // drop the tables
+		assertEquals( 0, schemaExport.getExceptions().size() );
+		// drop the tables
 		schemaExport.drop( EnumSet.of( TargetType.DATABASE ), metadata );
-        assertEquals( 0, schemaExport.getExceptions().size() );
-    }
+		assertEquals( 0, schemaExport.getExceptions().size() );
+	}
 
 	@Test
 	@JiraKey(value = "HHH-10678")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java
index f199d418fa59..87c74b70b509 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java
index 3b982fb7aa28..5f7501140fdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java
index 5ccf35d9f0b5..e28c97282022 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java
index 73b4eb168a66..7014fac71dd0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
index 77684e9631d6..2c6c4d3c2741 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateArrayPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateArrayPropertiesTest.java
index 7f7cb289d475..4d6f440898bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateArrayPropertiesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateArrayPropertiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java
index aa7b14f82bcc..055efc1de5e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java
index bd67ec501040..50b86c774611 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java
index a4fc1fb2f189..2e16a3558447 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -58,7 +56,7 @@ public void testSchemaUpdateScriptGeneration() throws Exception {
 					.setDelimiter( ";" )
 					.setFormat( true )
 					.execute( EnumSet.of( TargetType.SCRIPT ), metadata );
-			
+
 			String fileContent = new String( Files.readAllBytes( output.toPath() ) );
 			Pattern fileContentPattern = Pattern.compile( "create( (column|row))? table test_entity" );
 			Matcher fileContentMatcher = fileContentPattern.matcher( fileContent.toLowerCase() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
index 6b389079c61b..40c6d65e4ae2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java
index f2dbb4412ae8..948e23bb0d65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -30,7 +28,6 @@
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java
index 252a65114c9a..aa0d0da1778e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java
index 6bdf214fa6bd..3b4cf0ae3876 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -31,9 +29,7 @@
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java
index 3fb49dea38a4..515262d738c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java
index e3cc959d7fb7..03e1e238523d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -240,8 +238,8 @@ public static class Match {
 		String match;
 
 		@ElementCollection
- 		@CollectionTable(catalog = "hibernate_orm_test_collation", schema = "dbo")
- 		private Map timeline = new TreeMap<>();
+		@CollectionTable(catalog = "hibernate_orm_test_collation", schema = "dbo")
+		private Map timeline = new TreeMap<>();
 	}
 
 	@Entity(name = "InheritanceRootEntity")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java
index d6e06c83f90c..988e1ee77f46 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java
index fae10d7e4862..1b7f58308b67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
index e2c973fcd3c0..b5fc6da51d0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -233,8 +231,8 @@ public static class Match {
 		String match;
 
 		@ElementCollection
- 		@CollectionTable
- 		private Map timeline = new TreeMap<>();
+		@CollectionTable
+		private Map timeline = new TreeMap<>();
 	}
 
 	@Entity(name = "InheritanceRootEntity")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
index b566fd3224ca..4802400cd52e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java
index 660fb04cf105..8b9f3bcf74de 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java
index d339a532a348..921fa1063038 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java
index 5f787f77ea40..6d37f501f1c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java
index 3ed4ff003192..1848f46a76e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
index 7fae5232006b..24e96a22521b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java
index 3d18503a5917..76c974a76ab7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java
index 71f1082e3e1d..62c17865aa1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java
index 8b5d04aafd02..9bc20902d6ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TimeZoneColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TimeZoneColumnTest.java
index 00f2f2ae5346..bb826efc1b18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TimeZoneColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TimeZoneColumnTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate;
 
 import java.io.File;
@@ -136,4 +140,3 @@ public static class TestEntity {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java
index 90e01108001a..01bd78f4c013 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java
index 7d51a6c3766d..49d11a9e6c68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate;
 
@@ -13,7 +11,7 @@ public class Version {
 	String name;
 	String description;
 	int versionNumber;
-	
+
 	public long getId() {
 		return id;
 	}
@@ -23,15 +21,15 @@ public void setId(long id) {
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String getDescription() {
 		return description;
 	}
-	
+
 	public void setDescription(String description) {
 		this.description = description;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/Another.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/Another.java
index 740b5e811a53..09804fa9ce8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/Another.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/Another.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.column;
 
 public interface Another {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/AnotherTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/AnotherTestEntity.java
index 5feec007f7e2..b4bc6fbbee62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/AnotherTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/AnotherTestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.column;
 
 import jakarta.persistence.Column;
@@ -29,4 +33,4 @@ public String getFirstName() {
 	public void setFirstName(String firstName) {
 		this.firstName = firstName;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/ColumnCheckConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/ColumnCheckConstraintTest.java
index 78673c6c2f3d..5d20e940bdfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/ColumnCheckConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/ColumnCheckConstraintTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.column;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/TestEntity.java
index acb2489baba9..9d10b372bc20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/column/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.column;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/Another.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/Another.java
index 2dbe10292908..f7df3abfa187 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/Another.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/Another.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.table;
 
 public interface Another {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/AnotherTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/AnotherTestEntity.java
index e5b53b4bf8fd..8f3bdef05ddc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/AnotherTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/AnotherTestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.table;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/EntityWithSecondaryTables.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/EntityWithSecondaryTables.java
index 4051f4e0756f..f04c6bf4e23d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/EntityWithSecondaryTables.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/EntityWithSecondaryTables.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.table;
 
 import java.util.List;
@@ -172,4 +176,3 @@ public void setAnother(Another another) {
 		this.another = another;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TableCheckConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TableCheckConstraintTest.java
index e99831e1c1c3..3a5424a63a98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TableCheckConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TableCheckConstraintTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.table;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TestEntity.java
index 28aeda99c212..01158e82830b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/checkconstraint/table/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.checkconstraint.table;
 
 import jakarta.persistence.CheckConstraint;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/AnotherTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/AnotherTestEntity.java
index 607e260dd651..0c329ed2f2dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/AnotherTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/AnotherTestEntity.java
@@ -1,9 +1,10 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.columnoptions;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
 import jakarta.persistence.PrimaryKeyJoinColumn;
 import jakarta.persistence.PrimaryKeyJoinColumns;
 import jakarta.persistence.Table;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/ColumnOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/ColumnOptionsTest.java
index 00d9668cb8e5..684c745eb1ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/ColumnOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/ColumnOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.columnoptions;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/TestEntity.java
index fd8729bd28f2..a33b907952b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/columnoptions/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.columnoptions;
 
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java
index f4ad26e6a8a3..792667439f3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.derivedid;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Customer.java
index a19acae2e1c6..e0f6994f82fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Customer.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/CustomerInventory.java
index 9f76425f52f4..e5d07122ba58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/CustomerInventory.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/CustomerInventory.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
 public class CustomerInventory {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java
index fc7455c62510..df5d2c8b31cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java
index d6acdd740405..a5bf1ea1de90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java
index f9230416af74..0b0cbd4993fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
@@ -107,9 +105,9 @@ public void oneToManyWithJoinTableTest() throws Exception {
 
 		/*
 			The generated SQL for the foreign keys should be:
-            alter table PERSON_PHONE add constraint PERSON_ID_FK foreign key (PERSON_ID) references PERSON
-            alter table PERSON_PHONE add constraint PHONE_ID_FK foreign key (PHONE_ID) references PHONE
-        */
+			alter table PERSON_PHONE add constraint PERSON_ID_FK foreign key (PERSON_ID) references PERSON
+			alter table PERSON_PHONE add constraint PHONE_ID_FK foreign key (PHONE_ID) references PHONE
+		*/
 		checkAlterTableStatement( new AlterTableStatement(
 				ssr,
 				"PERSON_PHONE",
@@ -131,11 +129,11 @@ alter table PERSON_PHONE add constraint PHONE_ID_FK foreign key (PHONE_ID) refer
 	public void manyToManyTest() throws Exception {
 		createSchema( new Class[] {Project.class, Employee.class} );
 
-                /*
+				/*
 				The generated SQL for the foreign keys should be:
-                alter table EMPLOYEE_PROJECT add constraint FK_EMPLOYEE foreign key (EMPLOYEE_ID) references EMPLOYEE
-                alter table EMPLOYEE_PROJECT add constraint FK_PROJECT foreign key (PROJECT_ID) references PROJECT
-                */
+				alter table EMPLOYEE_PROJECT add constraint FK_EMPLOYEE foreign key (EMPLOYEE_ID) references EMPLOYEE
+				alter table EMPLOYEE_PROJECT add constraint FK_PROJECT foreign key (PROJECT_ID) references PROJECT
+				*/
 		checkAlterTableStatement( new AlterTableStatement(
 				ssr,
 				"EMPLOYEE_PROJECT",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java
index 0cf864b5b33a..7368f279734f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeysCreationForXMLMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeysCreationForXMLMappingTest.java
index f22915208c69..7b8234486174 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeysCreationForXMLMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeysCreationForXMLMappingTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java
index d369f1568c78..ae0d738a81bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
@@ -22,4 +20,3 @@ public class Group implements Serializable {
 	@Column(name = "GROUP_ID")
 	private Long id;
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java
index c911404d73eb..3cf427f54bed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java
index 6c1d55b385f4..e5efb27c0d4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java
index 338ecc8aada0..958720012c96 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java
index 2dac8819e17c..ccf5f8041312 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java
index 3179339232e8..f4ba71d88e9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java
index b0693d44e9d3..af26b7e68883 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java
index e4ad2876d128..c8e275a08b7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java
index 28a6a1336387..c3a8c1935d83 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java
index 5c82950cc937..495bc7e425eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java
index 9415818dab8f..4b664e43dc37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java
index 8d79dbddddc4..f7bcf95780f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.definition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java
index 06696e1f9ac0..cedb09f20ea4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.definition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java
index 720361a9a173..a39490c8c214 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.definition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java
index 35b1527ca885..2cebe5784cae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.definition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
index 5d367c126e7a..31f1dd44273c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.definition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java
index 4426f90bf04c..11f452f57831 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idbag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
index da5bc994b2fa..0e9fd39b3dbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idbag;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java
index fabeeacc18d6..509978bf61c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
index 26a535de29c4..b2ac21b19f1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java
index 7cd31e5628a1..b97598b3df7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java
index 8cbf3e856189..a5e4cd97dffa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java
index f05e9ed20e2b..bb3d4ae1322f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TestEntity.java
index 4367d658f967..3e405d3cd03b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.idgenerator;
 
 public class TestEntity {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java
index c63709e64399..0c5c020a0329 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.index;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java
index 345e2ebacc44..8af6b7689dc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.index;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesOrderTest.java
index f3f6285d2915..3ac072c0dd12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesOrderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.index;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java
index 484dca8fe56c..f1743fb44c1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java
index 41f1668d48ca..3946b1ae0fc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java
index 3933360bfd48..01e8bb718b49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java
index 29b8f6889841..c24b64c7f3f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java
index 78021bc381f7..e5466e817e70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java
index f18dcdbab553..f214a352b7d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java
index 974bc301c25d..13591a61016e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java
index d74c7ad0d15f..f3f196e4f5d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java
index 41011db65c00..f75c86062b77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java
index 193c59667866..00db5306e811 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java
index 078477e98be4..fbcf38ff641f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
index d38bdbe69da1..23c95f3221f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java
index 9a76eedd79bd..539ad83accad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java
index 3c8648b704c7..5cfb923e79fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.manytomany;
 
@@ -24,4 +22,3 @@ public void setId(Long id) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java
index 03da98df9d4b..75b6ebf08d0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.manytomany;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
index b4abd832c5cd..abbccad97067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.options;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/SecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/SecondaryTableTest.java
index 879a6f7cd769..fd14a78aefdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/SecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/SecondaryTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.secondarytable;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/TestEntity.java
index 595dedebc0fd..da475bbc6d7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/secondarytable/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.secondarytable;
 
 public class TestEntity {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
index 33d875e474ed..9b515b0ed6d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.sequencegenerator;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/TestEntity.java
index 9867326e7a87..8f8aa4d50e7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.sequencegenerator;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/JpaTableCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/JpaTableCommentTest.java
index 9d432bab7a75..45310f2eef1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/JpaTableCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/JpaTableCommentTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.tablecomment;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/TestEntity.java
index f8e419071db6..d7890db6d1ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tablecomment/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.tablecomment;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java
index 04a83805cd5c..4b4a9c08e1d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.tableoptions;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TestEntity.java
index d8b8ca333aff..337271af9812 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.tableoptions;
 
 import java.util.List;
@@ -10,7 +14,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.Index;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.SecondaryTable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
index 00d2a3b36f88..90207d9ea530 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/MultiUniqueConstraintNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/MultiUniqueConstraintNameTest.java
index 078cceeeef70..a18894088328 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/MultiUniqueConstraintNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/MultiUniqueConstraintNameTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java
index ad8882ed37f2..40293bdd01c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
index b69b64315a57..6c96bdd1aac2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
index d98d7bcea3a3..11d771f1cce1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
index db9709cce210..e03cde383b5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintNameTest.java
index de0e073cd4f3..6b317d4ff674 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintNameTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemaupdate.uniqueconstraint;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/BooleanAsTinyintValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/BooleanAsTinyintValidationTests.java
index 18c0c0a86b37..0d251c8f6df0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/BooleanAsTinyintValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/BooleanAsTinyintValidationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
index 675738abdf98..9e0a613ed608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemavalidation;
 
 import java.time.Duration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java
index d565acd45bde..0b7fe83a7e38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ExistingVarcharEnumColumnValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ExistingVarcharEnumColumnValidationTest.java
index 5dd860767ecb..8793ec600b30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ExistingVarcharEnumColumnValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ExistingVarcharEnumColumnValidationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemavalidation;
 
 import org.hibernate.boot.MetadataSources;
@@ -21,11 +25,9 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
-import static jakarta.persistence.GenerationType.IDENTITY;
 
 @JiraKey("HHH-17908")
 @RequiresDialect( H2Dialect.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/H2ExistingEnumColumnValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/H2ExistingEnumColumnValidationTest.java
index 740e925e7d5c..85d20ed05b4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/H2ExistingEnumColumnValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/H2ExistingEnumColumnValidationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemavalidation;
 
 import org.hibernate.boot.MetadataSources;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java
index de40fec9e96e..7f7db938817f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java
index ee7460d7e70b..295a2698c67d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java
index 84afe6b39c91..bd8e1a028718 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java
index f74fb0425e63..ed3fe83da818 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/MySqlExistingEnumColumnValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/MySqlExistingEnumColumnValidationTest.java
index 3bfbbecc0aba..979725599545 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/MySqlExistingEnumColumnValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/MySqlExistingEnumColumnValidationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.schemavalidation;
 
 import org.hibernate.boot.MetadataSources;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
index f8d336b1a33c..84cce1c59a03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java
index 1609a8556fdd..eb5373a771b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
index 306fa6c13dd8..65c3e9e20eec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java
index 3486618815e9..ad2cc6466dea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.schemavalidation.matchingtablenames;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/Record.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/Record.java
index 16da95714ea0..8918f39fd511 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/Record.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/Record.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.secondarytable;
 
 import org.hibernate.annotations.SecondaryRow;
@@ -18,10 +22,9 @@
 @SecondaryRow(table = "Optional", optional = true)
 @SequenceGenerator(name="RecordSeq", sequenceName = "RecordId", allocationSize = 1)
 public class Record {
-    @Id @GeneratedValue(generator = "RecordSeq")  long id;
-    String name;
-    @Column(table = "NonOptional") String text;
-    @Column(table = "NonOptional") boolean enabled;
-    @Column(table = "Optional", name="`comment`") String comment;
+	@Id @GeneratedValue(generator = "RecordSeq")  long id;
+	String name;
+	@Column(table = "NonOptional") String text;
+	@Column(table = "NonOptional") boolean enabled;
+	@Column(table = "Optional", name="`comment`") String comment;
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java
index 8c750ae76f31..15e195e1415f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.secondarytable;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SpecialRecord.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SpecialRecord.java
index 98294840ab11..7cf80eb5fbe3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SpecialRecord.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SpecialRecord.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.secondarytable;
 
 import java.time.Instant;
@@ -12,6 +16,6 @@
 @SecondaryTable(name = "`View`")
 @SecondaryRow(table = "`View`", owned = false)
 public class SpecialRecord extends Record {
-    @Column(table = "`View`", name="`timestamp`")
-    Instant timestamp;
+	@Column(table = "`View`", name="`timestamp`")
+	Instant timestamp;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeyEmbeddedIdEnanchedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeyEmbeddedIdEnanchedTest.java
index 3d8031c757b3..aa394f4df9c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeyEmbeddedIdEnanchedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeyEmbeddedIdEnanchedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.serialization;
 
 import java.io.ByteArrayInputStream;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java
index 2ac00e2fe33d..db54f179f957 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.serialization;
 
 import java.io.ByteArrayInputStream;
@@ -36,93 +40,93 @@
  */
 @BaseUnitTest
 public class CacheKeySerializationTest {
-   private SessionFactoryImplementor getSessionFactory(String cacheKeysFactory) {
-      Configuration configuration = new Configuration()
-            .setProperty(Environment.USE_SECOND_LEVEL_CACHE, true)
-            .setProperty(Environment.CACHE_REGION_FACTORY, CachingRegionFactory.class)
-            .setProperty(Environment.DEFAULT_CACHE_CONCURRENCY_STRATEGY, CacheConcurrencyStrategy.TRANSACTIONAL)
-            .setProperty(Environment.JPA_SHARED_CACHE_MODE, SharedCacheMode.ALL)
-            .setProperty(Environment.HBM2DDL_AUTO, Action.ACTION_CREATE_THEN_DROP);
-      ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() );
-      if (cacheKeysFactory != null) {
-         configuration.setProperty(Environment.CACHE_KEYS_FACTORY, cacheKeysFactory);
-      }
-      configuration.addAnnotatedClass( WithSimpleId.class );
-      configuration.addAnnotatedClass( WithEmbeddedId.class );
-      return (SessionFactoryImplementor) configuration.buildSessionFactory();
-   }
-
-   @Test
-   @JiraKey(value = "HHH-11202")
-   public void testSimpleCacheKeySimpleId() throws Exception {
-      testId( SimpleCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L );
-   }
-
-   @Test
-   @JiraKey(value = "HHH-11202")
-   public void testSimpleCacheKeyEmbeddedId() throws Exception {
-      testId( SimpleCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) );
-   }
-
-   @Test
-   @JiraKey(value = "HHH-11202")
-   public void testDefaultCacheKeySimpleId() throws Exception {
-      testId( DefaultCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L  );
-   }
-
-   @Test
-   @JiraKey(value = "HHH-11202")
-   public void testDefaultCacheKeyEmbeddedId() throws Exception {
-      testId( DefaultCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) );
-   }
-
-   private void testId(CacheKeysFactory cacheKeysFactory, String entityName, Object id) throws Exception {
-      final SessionFactoryImplementor sessionFactory = getSessionFactory(cacheKeysFactory.getClass().getName());
-      final EntityPersister persister = sessionFactory.getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(entityName);
-      final Object key = cacheKeysFactory.createEntityKey(
-            id,
-            persister,
-            sessionFactory,
-            null
-      );
-
-      final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      final ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject( key );
-
-      final ObjectInputStream ois = new ObjectInputStream( new ByteArrayInputStream( baos.toByteArray() ) );
-      final Object keyClone = ois.readObject();
-
-      try {
-         assertEquals( key, keyClone );
-         assertEquals( keyClone, key );
-
-         assertEquals( key.hashCode(), keyClone.hashCode() );
-
-         final Object idClone;
-         if ( cacheKeysFactory == SimpleCacheKeysFactory.INSTANCE ) {
-            idClone = cacheKeysFactory.getEntityId( keyClone );
-         }
-         else {
-            // DefaultCacheKeysFactory#getEntityId will return a disassembled version
-            try (Session session = sessionFactory.openSession()) {
-               idClone = persister.getIdentifierType().assemble(
-                       (Serializable) cacheKeysFactory.getEntityId( keyClone ),
-                       (SharedSessionContractImplementor) session,
-                       null
-               );
-            }
-         }
-
-         assertEquals( id.hashCode(), idClone.hashCode() );
-         assertEquals( id, idClone );
-         assertEquals( idClone, id );
-         assertTrue( persister.getIdentifierType().isEqual( id, idClone, sessionFactory ) );
-         assertTrue( persister.getIdentifierType().isEqual( idClone, id, sessionFactory ) );
-         sessionFactory.close();
-      }
-      finally {
-         sessionFactory.close();
-      }
-   }
+private SessionFactoryImplementor getSessionFactory(String cacheKeysFactory) {
+	Configuration configuration = new Configuration()
+			.setProperty(Environment.USE_SECOND_LEVEL_CACHE, true)
+			.setProperty(Environment.CACHE_REGION_FACTORY, CachingRegionFactory.class)
+			.setProperty(Environment.DEFAULT_CACHE_CONCURRENCY_STRATEGY, CacheConcurrencyStrategy.TRANSACTIONAL)
+			.setProperty(Environment.JPA_SHARED_CACHE_MODE, SharedCacheMode.ALL)
+			.setProperty(Environment.HBM2DDL_AUTO, Action.ACTION_CREATE_THEN_DROP);
+	ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() );
+	if (cacheKeysFactory != null) {
+		configuration.setProperty(Environment.CACHE_KEYS_FACTORY, cacheKeysFactory);
+	}
+	configuration.addAnnotatedClass( WithSimpleId.class );
+	configuration.addAnnotatedClass( WithEmbeddedId.class );
+	return (SessionFactoryImplementor) configuration.buildSessionFactory();
+}
+
+@Test
+@JiraKey(value = "HHH-11202")
+public void testSimpleCacheKeySimpleId() throws Exception {
+	testId( SimpleCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L );
+}
+
+@Test
+@JiraKey(value = "HHH-11202")
+public void testSimpleCacheKeyEmbeddedId() throws Exception {
+	testId( SimpleCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) );
+}
+
+@Test
+@JiraKey(value = "HHH-11202")
+public void testDefaultCacheKeySimpleId() throws Exception {
+	testId( DefaultCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L  );
+}
+
+@Test
+@JiraKey(value = "HHH-11202")
+public void testDefaultCacheKeyEmbeddedId() throws Exception {
+	testId( DefaultCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) );
+}
+
+private void testId(CacheKeysFactory cacheKeysFactory, String entityName, Object id) throws Exception {
+	final SessionFactoryImplementor sessionFactory = getSessionFactory(cacheKeysFactory.getClass().getName());
+	final EntityPersister persister = sessionFactory.getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(entityName);
+	final Object key = cacheKeysFactory.createEntityKey(
+			id,
+			persister,
+			sessionFactory,
+			null
+	);
+
+	final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	final ObjectOutputStream oos = new ObjectOutputStream(baos);
+	oos.writeObject( key );
+
+	final ObjectInputStream ois = new ObjectInputStream( new ByteArrayInputStream( baos.toByteArray() ) );
+	final Object keyClone = ois.readObject();
+
+	try {
+		assertEquals( key, keyClone );
+		assertEquals( keyClone, key );
+
+		assertEquals( key.hashCode(), keyClone.hashCode() );
+
+		final Object idClone;
+		if ( cacheKeysFactory == SimpleCacheKeysFactory.INSTANCE ) {
+			idClone = cacheKeysFactory.getEntityId( keyClone );
+		}
+		else {
+			// DefaultCacheKeysFactory#getEntityId will return a disassembled version
+			try (Session session = sessionFactory.openSession()) {
+			idClone = persister.getIdentifierType().assemble(
+					(Serializable) cacheKeysFactory.getEntityId( keyClone ),
+					(SharedSessionContractImplementor) session,
+					null
+			);
+			}
+		}
+
+		assertEquals( id.hashCode(), idClone.hashCode() );
+		assertEquals( id, idClone );
+		assertEquals( idClone, id );
+		assertTrue( persister.getIdentifierType().isEqual( id, idClone, sessionFactory ) );
+		assertTrue( persister.getIdentifierType().isEqual( idClone, id, sessionFactory ) );
+		sessionFactory.close();
+	}
+	finally {
+		sessionFactory.close();
+	}
+}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java
index 8909f403d62b..1432f9077bf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java
index f308dc29b5cd..cfd7b808819f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java
index 8d094e1143f6..ae771cbb3348 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
@@ -11,7 +9,6 @@
 import java.util.Map;
 
 import org.hibernate.Hibernate;
-import org.hibernate.LockMode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.proxy.AbstractLazyInitializer;
@@ -180,4 +177,4 @@ public void testProxyInitializationWithoutTXAfterDeserialization(SessionFactoryS
 		assertTrue( Hibernate.isInitialized( deserializedParent ) );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/ProxySerializationNoSessionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/ProxySerializationNoSessionFactoryTest.java
index cf768d5cdd05..cdd8815e1e87 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/ProxySerializationNoSessionFactoryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/ProxySerializationNoSessionFactoryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/SessionFactorySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/SessionFactorySerializationTest.java
index 928003bec194..0b35bb28c394 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/SessionFactorySerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/SessionFactorySerializationTest.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
 
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
 
 import org.junit.Test;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java
index b6926010f893..835208f8a61c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization;
 
@@ -23,24 +21,24 @@
  * @author Brett Meyer
  */
 public class TypedValueSerializationTest {
-	
+
 	@Test
 	@JiraKey(value = "HHH-9024")
 	public void testTypedValueSerialization() throws Exception {
 		final Type mockType = mock(Type.class);
 		final String value = "foo";
 		final TypedValue typedValue = new TypedValue(mockType, value);
-		
+
 		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(typedValue);
-        
-        final ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
-        final TypedValue typedValueClone = (TypedValue) ois.readObject();
-        
-        assertEquals(typedValue.hashCode(), typedValueClone.hashCode());
-        assertEquals(typedValue.toString(), typedValueClone.toString());
-        assertEquals(typedValue.getValue(), typedValueClone.getValue());
+		final ObjectOutputStream oos = new ObjectOutputStream(baos);
+		oos.writeObject(typedValue);
+
+		final ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+		final TypedValue typedValueClone = (TypedValue) ois.readObject();
+
+		assertEquals(typedValue.hashCode(), typedValueClone.hashCode());
+		assertEquals(typedValue.toString(), typedValueClone.toString());
+		assertEquals(typedValue.getValue(), typedValueClone.getValue());
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java
index 53bd660edb58..29b8927398a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecord.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecord.java
index b87377e9719a..0bf11ea8b82d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecord.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecord.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.serialization.entity;
 
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecordId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecordId.java
index b77bd0294998..3fc56a88496a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecordId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/BuildRecordId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.serialization.entity;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/PK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/PK.java
index aa57545df081..3e47bbf82a28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/PK.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/PK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithEmbeddedId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithEmbeddedId.java
index 79c6476cd4f6..e67c82b2d0bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithEmbeddedId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithEmbeddedId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.serialization.entity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithSimpleId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithSimpleId.java
index 1ef211767e33..7869b14eae4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithSimpleId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/WithSimpleId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.serialization.entity;
 
 import jakarta.persistence.Cacheable;
@@ -13,6 +17,6 @@
 @Entity
 @Cacheable
 public class WithSimpleId {
-   @Id
-   private Long id;
+@Id
+private Long id;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java
index 7b37e747346d..c02184e3bcf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.service;
 
@@ -20,8 +18,6 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.IntegratorService;
 import org.hibernate.internal.util.ConfigHelper;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -30,49 +26,47 @@
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 
 /**
  * @author Artem V. Navrotskiy
  * @author Emmanuel Bernard
  */
 public class ClassLoaderServiceImplTest {
-    /**
-     * Test for bug: HHH-7084
-     */
-    @Test
-    public void testSystemClassLoaderNotOverriding() throws IOException, ClassNotFoundException {
-        Class testClass = Entity.class;
-
-        // Check that class is accessible by SystemClassLoader.
-        ClassLoader.getSystemClassLoader().loadClass(testClass.getName());
-
-        // Create ClassLoader with overridden class.
-        TestClassLoader anotherLoader = new TestClassLoader();
-        anotherLoader.overrideClass(testClass);
-        Class anotherClass = anotherLoader.loadClass(testClass.getName());
-        Assert.assertNotSame( testClass, anotherClass );
-
-        // Check ClassLoaderServiceImpl().classForName() returns correct class (not from current ClassLoader).
-        ClassLoaderServiceImpl loaderService = new ClassLoaderServiceImpl(anotherLoader);
-        Class objectClass = loaderService.classForName(testClass.getName());
-        Assert.assertSame("Should not return class loaded from the parent classloader of ClassLoaderServiceImpl",
+	/**
+	 * Test for bug: HHH-7084
+	 */
+	@Test
+	public void testSystemClassLoaderNotOverriding() throws IOException, ClassNotFoundException {
+		Class testClass = Entity.class;
+
+		// Check that class is accessible by SystemClassLoader.
+		ClassLoader.getSystemClassLoader().loadClass(testClass.getName());
+
+		// Create ClassLoader with overridden class.
+		TestClassLoader anotherLoader = new TestClassLoader();
+		anotherLoader.overrideClass(testClass);
+		Class anotherClass = anotherLoader.loadClass(testClass.getName());
+		Assert.assertNotSame( testClass, anotherClass );
+
+		// Check ClassLoaderServiceImpl().classForName() returns correct class (not from current ClassLoader).
+		ClassLoaderServiceImpl loaderService = new ClassLoaderServiceImpl(anotherLoader);
+		Class objectClass = loaderService.classForName(testClass.getName());
+		Assert.assertSame("Should not return class loaded from the parent classloader of ClassLoaderServiceImpl",
 				objectClass, anotherClass);
-    }
-    
-    /**
-     * HHH-8363 discovered multiple leaks within CLS.  Most notably, it wasn't getting GC'd due to holding
-     * references to ServiceLoaders.  Ensure that the addition of Stoppable functionality cleans up properly.
-     * 
-     * TODO: Is there a way to test that the ServiceLoader was actually reset?
-     */
-    @Test
-    @JiraKey(value = "HHH-8363")
-    public void testStoppableClassLoaderService() {
-    	final BootstrapServiceRegistryBuilder bootstrapBuilder = new BootstrapServiceRegistryBuilder();
-    	bootstrapBuilder.applyClassLoader( new TestClassLoader() );
-    	final ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder( bootstrapBuilder.build() ).build();
+	}
+
+	/**
+	 * HHH-8363 discovered multiple leaks within CLS.  Most notably, it wasn't getting GC'd due to holding
+	 * references to ServiceLoaders.  Ensure that the addition of Stoppable functionality cleans up properly.
+	 *
+	 * TODO: Is there a way to test that the ServiceLoader was actually reset?
+	 */
+	@Test
+	@JiraKey(value = "HHH-8363")
+	public void testStoppableClassLoaderService() {
+		final BootstrapServiceRegistryBuilder bootstrapBuilder = new BootstrapServiceRegistryBuilder();
+		bootstrapBuilder.applyClassLoader( new TestClassLoader() );
+		final ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder( bootstrapBuilder.build() ).build();
 
 		final TypeContributor contributor1 = getTypeContributorServices( serviceRegistry );
 		assertThat( contributor1 ).isNotNull();
@@ -82,17 +76,17 @@ public void testStoppableClassLoaderService() {
 
 		assertThat( contributor1 ).isSameAs( contributor2 );
 
-    	StandardServiceRegistryBuilder.destroy( serviceRegistry );
-    	
-    	try {
+		StandardServiceRegistryBuilder.destroy( serviceRegistry );
+
+		try {
 			getTypeContributorServices( serviceRegistry );
-    		Assert.fail("Should have thrown an HibernateException -- the ClassLoaderService instance was closed.");
-    	}
-    	catch (HibernateException e) {
+			Assert.fail("Should have thrown an HibernateException -- the ClassLoaderService instance was closed.");
+		}
+		catch (HibernateException e) {
 			Assert.assertEquals( "The ClassLoaderService cannot be reused (this instance was stopped already)",
 					e.getMessage() );
-    	}
-    }
+		}
+	}
 
 	private TypeContributor getTypeContributorServices(ServiceRegistry serviceRegistry) {
 		final ClassLoaderService classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
@@ -102,63 +96,63 @@ private TypeContributor getTypeContributorServices(ServiceRegistry serviceRegist
 	}
 
 	private static class TestClassLoader extends ClassLoader {
-    	
-    	/**
-    	 * testStoppableClassLoaderService() needs a custom JDK service implementation.  Rather than using a real one
-    	 * on the test classpath, force it in here.
-    	 */
-    	@Override
-        protected Enumeration findResources(String name) throws IOException {
-    		if (name.equals( "META-INF/services/org.hibernate.boot.model.TypeContributor" )) {
-    			final URL serviceUrl = ConfigHelper.findAsResource(
+
+		/**
+		 * testStoppableClassLoaderService() needs a custom JDK service implementation.  Rather than using a real one
+		 * on the test classpath, force it in here.
+		 */
+		@Override
+		protected Enumeration findResources(String name) throws IOException {
+			if (name.equals( "META-INF/services/org.hibernate.boot.model.TypeContributor" )) {
+				final URL serviceUrl = ConfigHelper.findAsResource(
 						"org/hibernate/orm/test/service/org.hibernate.boot.model.TypeContributor" );
-    			return new Enumeration() {
-        			boolean hasMore = true;
-        			
-    				@Override
-    				public boolean hasMoreElements() {
-    					return hasMore;
-    				}
-
-    				@Override
-    				public URL nextElement() {
-    					hasMore = false;
-    					return serviceUrl;
-    				}
-    			};
-    		}
-    		else {
-    			return java.util.Collections.enumeration( java.util.Collections.emptyList() );
-    		}
-        }
-    	
-        /**
-         * Reloading class from binary file.
-         *
-         * @param originalClass Original class.
-         * @throws IOException .
-         */
-        public void overrideClass(final Class originalClass) throws IOException {
-            String originalPath = "/" + originalClass.getName().replaceAll("\\.", "/") + ".class";
-            InputStream inputStream = originalClass.getResourceAsStream(originalPath);
-            Assert.assertNotNull(inputStream);
-            try {
-                byte[] data = toByteArray( inputStream );
-                defineClass(originalClass.getName(), data, 0, data.length);
-            } finally {
-                inputStream.close();
-            }
-        }
+				return new Enumeration() {
+					boolean hasMore = true;
+
+					@Override
+					public boolean hasMoreElements() {
+						return hasMore;
+					}
+
+					@Override
+					public URL nextElement() {
+						hasMore = false;
+						return serviceUrl;
+					}
+				};
+			}
+			else {
+				return java.util.Collections.enumeration( java.util.Collections.emptyList() );
+			}
+		}
+
+		/**
+		 * Reloading class from binary file.
+		 *
+		 * @param originalClass Original class.
+		 * @throws IOException .
+		 */
+		public void overrideClass(final Class originalClass) throws IOException {
+			String originalPath = "/" + originalClass.getName().replaceAll("\\.", "/") + ".class";
+			InputStream inputStream = originalClass.getResourceAsStream(originalPath);
+			Assert.assertNotNull(inputStream);
+			try {
+				byte[] data = toByteArray( inputStream );
+				defineClass(originalClass.getName(), data, 0, data.length);
+			} finally {
+				inputStream.close();
+			}
+		}
 
 		private byte[] toByteArray(InputStream inputStream) throws IOException {
 			ByteArrayOutputStream out = new ByteArrayOutputStream();
 			int read;
 			byte[] slice = new byte[2000];
 			while ( (read = inputStream.read(slice, 0, slice.length) ) != -1) {
-			  out.write( slice, 0, read );
+			out.write( slice, 0, read );
 			}
 			out.flush();
 			return out.toByteArray();
 		}
-    }
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java
index 41405d6171f0..36f3f8b24c0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.service;
 
 import java.lang.reflect.Field;
 import java.util.Properties;
 
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.H2Dialect;
@@ -20,7 +17,6 @@
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.env.ConnectionProviderBuilder;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Assume;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceContributorTest.java
index ba96e8a67d4f..07a5b108e884 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.service;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java
index fec69b564aaa..56d18a362d7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.service;
 
 import java.util.Map;
@@ -9,7 +13,6 @@
 import java.util.concurrent.FutureTask;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.service.NullServiceException;
 import org.hibernate.service.Service;
 import org.hibernate.service.ServiceRegistry;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/JndiServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/JndiServiceImplTest.java
index 65a717d53ceb..80a03b27bf8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/JndiServiceImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/JndiServiceImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.service.internal;
 
@@ -39,8 +37,8 @@ public void javaLookupIsAttempted() {
 		//The "java" scheme is allowed to be used; it will also fail as we didn't setup a full JNDI context
 		//in this test, but we can verify it's been attempted by checking the error message.
 		final JndiException javaLookupException = assertThrows( JndiException.class,
-																	 () -> jndiService.locate(
-																			 "java:comp/env/jdbc/MyDatasource" )
+																	() -> jndiService.locate(
+																			"java:comp/env/jdbc/MyDatasource" )
 		);
 		assertEquals( "Error parsing JNDI name [java:comp/env/jdbc/MyDatasource]", javaLookupException.getMessage() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/ServiceRegistryClosingCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/ServiceRegistryClosingCascadeTest.java
index c37b265d0add..f1e8b2b7ff90 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/ServiceRegistryClosingCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/internal/ServiceRegistryClosingCascadeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.service.internal;
 
@@ -10,7 +8,6 @@
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
 import org.hibernate.cfg.Configuration;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java
index 89d1afe07625..d971aee45581 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.session;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java
index 43d8ac1cc7d7..8d3e1222f926 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.set;
 
@@ -36,158 +34,158 @@
 @ServiceRegistry
 @SessionFactory
 public class SetOperationJpaCriteriaTest {
-    @BeforeEach
-    public void createTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.persist( new EntityOfLists( 1, "first" ) );
-                    session.persist( new EntityOfLists( 2, "second" ) );
-                    session.persist( new EntityOfLists( 3, "third" ) );
-                }
-        );
-    }
-
-    @AfterEach
-    public void dropTestData(SessionFactoryScope scope) {
-        scope.inTransaction(
-                session -> {
-                    session.createQuery( "delete from EntityOfLists" ).executeUpdate();
-                    session.createQuery( "delete from SimpleEntity" ).executeUpdate();
-                }
-        );
-    }
-
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAll(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
-
-                    JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root1 = query1.from( EntityOfLists.class );
-                    query1.where( cb.equal( root1.get( "id" ), 1 ) );
-
-                    JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root2 = query2.from( EntityOfLists.class );
-                    query2.where( cb.equal( root2.get( "id" ), 2 ) );
-
-                    List list = session.createQuery(
-                            cb.unionAll( query1, query2 )
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
-
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    public void testUnionAllLimit(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
-
-                    JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root1 = query1.from( EntityOfLists.class );
-                    query1.where( cb.equal( root1.get( "id" ), 1 ) );
-
-                    JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root2 = query2.from( EntityOfLists.class );
-                    query2.where( cb.equal( root2.get( "id" ), 2 ) );
-
-                    List list = session.createQuery(
-                            cb.unionAll( query1, query2 )
-                                .orderBy( cb.asc( cb.literal( 1 ) ) )
-                                .fetch( 1 )
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
-
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    public void testUnionAllLimitSubquery(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
-
-                    JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root1 = query1.from( EntityOfLists.class );
-                    query1.where( cb.equal( root1.get( "id" ), 1 ) );
-
-                    JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root2 = query2.from( EntityOfLists.class );
-                    query2.where( cb.equal( root2.get( "id" ), 2 ) );
-
-                    List list = session.createQuery(
-                            cb.unionAll(
-                                    query1,
-                                    query2.orderBy( cb.asc( cb.literal( 1 ) ) )
-                                            .fetch( 1 )
-                            )
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
-
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    public void testUnionAllLimitNested(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
-
-                    JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root1 = query1.from( EntityOfLists.class );
-                    query1.where( cb.equal( root1.get( "id" ), 1 ) );
-
-                    JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root2 = query2.from( EntityOfLists.class );
-                    query2.where( cb.equal( root2.get( "id" ), 2 ) );
-
-                    List list = session.createQuery(
-                            cb.unionAll(
-                                    query1,
-                                    query2.orderBy( cb.asc( cb.literal( 1 ) ) )
-                                            .fetch( 1 )
-                            ).orderBy( cb.asc( cb.literal( 1 ) ) )
-                                    .fetch( 1 )
-                    ).list();
-                    assertThat( list.size(), is( 1 ) );
-                }
-        );
-    }
-
-    @Test
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
-    @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
-    @Jira( "https://hibernate.atlassian.net/browse/HHH-16754" )
-    public void testUnionAllSubqueryOrderByPath(SessionFactoryScope scope) {
-        scope.inSession(
-                session -> {
-                    HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
-
-                    JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root1 = query1.from( EntityOfLists.class );
-                    query1.where( cb.equal( root1.get( "id" ), 1 ) );
-
-                    JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
-                    JpaRoot root2 = query2.from( EntityOfLists.class );
-                    query2.where( cb.equal( root2.get( "id" ), 2 ) );
-
-                    List list = session.createQuery(
-                            cb.unionAll(
-                                    query1,
-                                    query2.orderBy( cb.asc( root2.get("name") ) )
-                                            .fetch( 1 )
-                            )
-                    ).list();
-                    assertThat( list.size(), is( 2 ) );
-                }
-        );
-    }
+	@BeforeEach
+	public void createTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.persist( new EntityOfLists( 1, "first" ) );
+					session.persist( new EntityOfLists( 2, "second" ) );
+					session.persist( new EntityOfLists( 3, "third" ) );
+				}
+		);
+	}
+
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "delete from EntityOfLists" ).executeUpdate();
+					session.createQuery( "delete from SimpleEntity" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAll(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+
+					JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root1 = query1.from( EntityOfLists.class );
+					query1.where( cb.equal( root1.get( "id" ), 1 ) );
+
+					JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root2 = query2.from( EntityOfLists.class );
+					query2.where( cb.equal( root2.get( "id" ), 2 ) );
+
+					List list = session.createQuery(
+							cb.unionAll( query1, query2 )
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	public void testUnionAllLimit(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+
+					JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root1 = query1.from( EntityOfLists.class );
+					query1.where( cb.equal( root1.get( "id" ), 1 ) );
+
+					JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root2 = query2.from( EntityOfLists.class );
+					query2.where( cb.equal( root2.get( "id" ), 2 ) );
+
+					List list = session.createQuery(
+							cb.unionAll( query1, query2 )
+								.orderBy( cb.asc( cb.literal( 1 ) ) )
+								.fetch( 1 )
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	public void testUnionAllLimitSubquery(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+
+					JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root1 = query1.from( EntityOfLists.class );
+					query1.where( cb.equal( root1.get( "id" ), 1 ) );
+
+					JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root2 = query2.from( EntityOfLists.class );
+					query2.where( cb.equal( root2.get( "id" ), 2 ) );
+
+					List list = session.createQuery(
+							cb.unionAll(
+									query1,
+									query2.orderBy( cb.asc( cb.literal( 1 ) ) )
+											.fetch( 1 )
+							)
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	public void testUnionAllLimitNested(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+
+					JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root1 = query1.from( EntityOfLists.class );
+					query1.where( cb.equal( root1.get( "id" ), 1 ) );
+
+					JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root2 = query2.from( EntityOfLists.class );
+					query2.where( cb.equal( root2.get( "id" ), 2 ) );
+
+					List list = session.createQuery(
+							cb.unionAll(
+									query1,
+									query2.orderBy( cb.asc( cb.literal( 1 ) ) )
+											.fetch( 1 )
+							).orderBy( cb.asc( cb.literal( 1 ) ) )
+									.fetch( 1 )
+					).list();
+					assertThat( list.size(), is( 1 ) );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInSubquery.class)
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-16754" )
+	public void testUnionAllSubqueryOrderByPath(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+
+					JpaCriteriaQuery query1 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root1 = query1.from( EntityOfLists.class );
+					query1.where( cb.equal( root1.get( "id" ), 1 ) );
+
+					JpaCriteriaQuery query2 = cb.createQuery( EntityOfLists.class );
+					JpaRoot root2 = query2.from( EntityOfLists.class );
+					query2.where( cb.equal( root2.get( "id" ), 2 ) );
+
+					List list = session.createQuery(
+							cb.unionAll(
+									query1,
+									query2.orderBy( cb.asc( root2.get("name") ) )
+											.fetch( 1 )
+							)
+					).list();
+					assertThat( list.size(), is( 2 ) );
+				}
+		);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java
index 8bf3c7718b23..d12e52de71bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sharedSession;
 
@@ -58,9 +56,9 @@ public void testSharedTransactionContextSessionClosing(SessionFactoryScope scope
 //		secondSession.createCriteria( IrrelevantEntity.class ).list();
 
 		//the list should have registered and then released a JDBC resource
-        assertFalse(
+		assertFalse(
 				((SessionImplementor) secondSession)
-                        .getJdbcCoordinator().getLogicalConnection().getResourceRegistry()
+						.getJdbcCoordinator().getLogicalConnection().getResourceRegistry()
 						.hasRegisteredResources()
 		);
 
@@ -188,14 +186,14 @@ public void testSharedTransactionContextFlushBeforeCompletion(SessionFactoryScop
 		session.getTransaction().commit();
 		session.close();
 	}
-	
+
 	@Test
 	@JiraKey( value = "HHH-7239" )
 	public void testChildSessionCallsAfterTransactionAction(SessionFactoryScope scope) throws Exception {
 		Session session = scope.getSessionFactory().openSession();
 
 		final String postCommitMessage = "post commit was called";
-		
+
 		EventListenerRegistry eventListenerRegistry = scope.getSessionFactory().getServiceRegistry().getService(EventListenerRegistry.class);
 		//register a post commit listener
 		eventListenerRegistry.appendListeners(
@@ -231,7 +229,7 @@ public boolean requiresPostCommitHandling(EntityPersister persister) {
 		secondSession.persist( irrelevantEntitySecondarySession );
 
 		session.getTransaction().commit();
-		
+
 		//both entities should have their names updated to the postCommitMessage value
 		assertEquals(postCommitMessage, irrelevantEntityMainSession.getName());
 		assertEquals(postCommitMessage, irrelevantEntitySecondarySession.getName());
@@ -241,19 +239,19 @@ public boolean requiresPostCommitHandling(EntityPersister persister) {
 	@JiraKey( value = "HHH-7239" )
 	public void testChildSessionTwoTransactions(SessionFactoryScope scope) throws Exception {
 		Session session = scope.getSessionFactory().openSession();
-		
+
 		session.getTransaction().begin();
-		
+
 		//open secondary session with managed options
 		Session secondarySession = session.sessionWithOptions()
 				.connection()
 //				.flushBeforeCompletion( true )
 				.autoClose( true )
 				.openSession();
-		
+
 		//the secondary session should be automatically closed after the commit
 		session.getTransaction().commit();
-		
+
 		assertFalse( secondarySession.isOpen() );
 
 		//should be able to create a new transaction and carry on using the original session
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/CollectionOfSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/CollectionOfSoftDeleteTests.java
index b24b51a1564d..4fecbb659e02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/CollectionOfSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/CollectionOfSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/HHH17511Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/HHH17511Test.java
index c5a90fdfbc2a..ca36783e4946 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/HHH17511Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/HHH17511Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java
index 7a9300b0bb19..1e4d10ff3ac1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingTests.java
index 100f040475e9..d4807784fdeb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingVerifier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingVerifier.java
index 3af44e04cb1a..2dc29a60ba36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingVerifier.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/MappingVerifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleEntity.java
index 8ee96ee5c63b..1ab610c84b84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleSoftDeleteTests.java
index 359fb0e33b10..29662aaaee5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SimpleSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteColumnConfigTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteColumnConfigTests.java
index 3adc294b2d01..538b3a5287ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteColumnConfigTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteColumnConfigTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteMappedColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteMappedColumnTest.java
index d4c1c08cff72..adbe9e3315c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteMappedColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/SoftDeleteMappedColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ToOneTests.java
index 280c81a6cbb6..b699d600e972 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ToOneTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ToOneTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ValidationTests.java
index e75cfe0a3d89..df7248f51bfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ValidationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwned.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwned.java
index 9d303444c6cb..dd31f185856d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwned.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner.java
index 156e23ec0e64..827e70a1a5aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner2.java
index 2d64ea3115fc..edd8a13991d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/CollectionOwner2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
index 8fb4fbf049e7..7a08f77f18cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/InvalidCollectionOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/InvalidCollectionOwner.java
index 18af519ede50..83e40d26c2a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/InvalidCollectionOwner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/InvalidCollectionOwner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
@@ -15,7 +13,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/MappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/MappingTests.java
index cccfb4c28214..db7a58db1e8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/MappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/MappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/UsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/UsageTests.java
index 136c7a16a46e..b2a96c15f3e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/UsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/UsageTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/ValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/ValidationTests.java
index e71b59b14be0..e9b1c2059a29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/ValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/ValidationTests.java
@@ -1,19 +1,15 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.collections;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.metamodel.UnsupportedMappingException;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/ConvertedSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/ConvertedSoftDeleteTests.java
index 1f25e51a13c3..ad10a626a757 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/ConvertedSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/ConvertedSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/TheEntity.java
index 8ca0e0d767fc..7d0852c8219a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.converter;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/package-info.java
index c35073f153ae..63a762f63d07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/package-info.java
@@ -10,4 +10,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.orm.test.softdelete.converter;
\ No newline at end of file
+package org.hibernate.orm.test.softdelete.converter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/ReversedSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/ReversedSoftDeleteTests.java
index a6d395626797..c0543bb55abc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/ReversedSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/ReversedSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.converter.reversed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity.java
index 5df531090c02..51dd5a1b83cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.converter.reversed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity2.java
index e4c140c8175e..5801526d15e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/converter/reversed/TheEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.converter.reversed;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/AnEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/AnEntity.java
index 1e792343c6e0..df9e43f2ddd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/AnEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/AnEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.pkg;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/PackageLevelSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/PackageLevelSoftDeleteTests.java
index 09705d19e0d6..9d98348bc72d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/PackageLevelSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/PackageLevelSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.pkg;
 
@@ -10,7 +8,6 @@
 import org.hibernate.orm.test.softdelete.MappingVerifier;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/package-info.java
index 0b35c2584618..b8b90cef1e43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg/package-info.java
@@ -15,4 +15,4 @@
 package org.hibernate.orm.test.softdelete.pkg;
 
 import org.hibernate.annotations.SoftDelete;
-import org.hibernate.type.YesNoConverter;
\ No newline at end of file
+import org.hibernate.type.YesNoConverter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/AnEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/AnEntity.java
index 25355fecca11..e456943ed37c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/AnEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/AnEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.pkg2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/CustomTrueFalseConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/CustomTrueFalseConverter.java
index 2d8ba28719b8..4a1a2315e335 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/CustomTrueFalseConverter.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/CustomTrueFalseConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.pkg2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/PackageLevelSoftDeleteTests2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/PackageLevelSoftDeleteTests2.java
index e1357f6a2417..f32c6b81b9cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/PackageLevelSoftDeleteTests2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/pkg2/PackageLevelSoftDeleteTests2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.pkg2;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedRoot.java
index 87c5ed632778..da4922213c3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedRoot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedRoot.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.secondary;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSub.java
index 8c40900432fa..f89521275478 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSub.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSub.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.secondary;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSubclassSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSubclassSoftDeleteTests.java
index 5a54cd0b18cf..35c383b6a74e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSubclassSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/JoinedSubclassSoftDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.secondary;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/MappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/MappingTests.java
index b25e7202fc1e..9957b886df57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/MappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/secondary/MappingTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.softdelete.secondary;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java
index c04efd48c9ae..e8c79d756f0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sorted;
 
@@ -280,4 +278,3 @@ public Search(String searchString) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/StringCaseInsensitiveComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/StringCaseInsensitiveComparator.java
index ab1fa907ddb8..ac69aa90fb94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/StringCaseInsensitiveComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/StringCaseInsensitiveComparator.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sorted;
 
 import java.util.Comparator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java
index 171b030467dc..ea56ed2a9b04 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sorted.map;
 
 import java.util.Iterator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java
index 8401c8905c0e..4ef05c716064 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sorted.map;
 
 import java.util.Iterator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java
index 594d69d01f88..07ca3536f95d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sorted.set;
 
 import java.util.Comparator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java
index bed82eb083e6..b6b3510a2ff9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sorted.set;
 
 import java.util.SortedSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/spi/path/NavigablePathTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/spi/path/NavigablePathTests.java
index 8aede50abe46..1beed8b9257d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/spi/path/NavigablePathTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/spi/path/NavigablePathTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.spi.path;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Captain.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Captain.java
index 3d83bb701bd7..caca66c7e08e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Captain.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Captain.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.sql;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
@@ -18,20 +14,20 @@
 @Entity
 public class Captain {
 
-    @EmbeddedId
-    private Identity id;
+	@EmbeddedId
+	private Identity id;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::sql-composite-key-entity-associations_named-query-example[]
 
-    public Identity getId() {
-        return id;
-    }
+	public Identity getId() {
+		return id;
+	}
 
-    public void setId(Identity id) {
-        this.id = id;
-    }
+	public void setId(Identity id) {
+		this.id = id;
+	}
 //tag::sql-composite-key-entity-associations_named-query-example[]
 }
 //end::sql-composite-key-entity-associations_named-query-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java
index d4c8ec7e6239..b41355c8ac29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -69,10 +67,10 @@ public void init() {
 			session.doWork(connection -> {
 				try(Statement statement = connection.createStatement();) {
 					statement.executeUpdate(String.format( "ALTER TABLE person %s valid %s",
-														   getDialect().getAddColumnString(),
+														getDialect().getAddColumnString(),
 							ddlTypeRegistry.getTypeName( Types.BOOLEAN, getDialect())));
 					statement.executeUpdate(String.format( "ALTER TABLE Person_phones %s valid %s",
-														   getDialect().getAddColumnString(),
+														getDialect().getAddColumnString(),
 							ddlTypeRegistry.getTypeName( Types.BOOLEAN, getDialect())));
 				}
 			});
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLSecondaryTableTest.java
index 23c03a042241..5fa52b66ef5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLSecondaryTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -39,122 +37,122 @@
 @RequiresDialect(PostgreSQLDialect.class)
 public class CustomSQLSecondaryTableTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Person.class
-        };
-    }
-
-    @Before
-    public void init() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
-            session.doWork(connection -> {
-                try(Statement statement = connection.createStatement();) {
-                    statement.executeUpdate("ALTER TABLE person ADD COLUMN valid boolean");
-                    statement.executeUpdate("ALTER TABLE person_details ADD COLUMN valid boolean");
-                }
-            });
-        });
-    }
-
-    @Test
-    public void test_sql_custom_crud() {
-
-        Person _person = doInJPA(this::entityManagerFactory, entityManager -> {
-            Person person = new Person();
-            person.setName("John Doe");
-            entityManager.persist(person);
-            person.setImage(new byte[] {1, 2, 3});
-            return person;
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Long postId = _person.getId();
-            Person person = entityManager.find(Person.class, postId);
-            assertArrayEquals(new byte[] {1, 2, 3}, person.getImage());
-            entityManager.remove(person);
-        });
-
-        doInJPA(this::entityManagerFactory, entityManager -> {
-            Long postId = _person.getId();
-            Person person = entityManager.find(Person.class, postId);
-            assertNull(person);
-        });
-    }
-
-
-    //tag::sql-custom-crud-secondary-table-example[]
-    @Entity(name = "Person")
-    @Table(name = "person")
-    @SecondaryTable(name = "person_details",
-            pkJoinColumns = @PrimaryKeyJoinColumn(name = "person_id"))
-    @SQLInsert(
-        sql = "INSERT INTO person (name, id, valid) VALUES (?, ?, true) "
-   )
-    @SQLDelete(
-        sql = "UPDATE person SET valid = false WHERE id = ? "
-    )
-    @SQLInsert(
-        table = "person_details",
-        sql = "INSERT INTO person_details (image, person_id, valid) VALUES (?, ?, true) ",
-        check = ResultCheckStyle.COUNT
-    )
-    @SQLDelete(
-        table = "person_details",
-        sql = "UPDATE person_details SET valid = false WHERE person_id = ? "
-    )
-
-    @SQLSelect(
-        sql = "SELECT " +
-                "    p.id, " +
-                "    p.name, " +
-                "    pd.image  " +
-                "FROM person p  " +
-                "LEFT OUTER JOIN person_details pd ON p.id = pd.person_id  " +
-                "WHERE p.id = ? AND p.valid = true AND pd.valid = true"
-    )
-    public static class Person {
-
-        @Id
-        @GeneratedValue
-        private Long id;
-
-        private String name;
-
-        @Column(name = "image", table = "person_details")
-        private byte[] image;
-
-        //Getters and setters are omitted for brevity
-
-    //end::sql-custom-crud-secondary-table-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public byte[] getImage() {
-            return image;
-        }
-
-        public void setImage(byte[] image) {
-            this.image = image;
-        }
-    //tag::sql-custom-crud-secondary-table-example[]
-    }
-    //end::sql-custom-crud-secondary-table-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Person.class
+		};
+	}
+
+	@Before
+	public void init() {
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
+			session.doWork(connection -> {
+				try(Statement statement = connection.createStatement();) {
+					statement.executeUpdate("ALTER TABLE person ADD COLUMN valid boolean");
+					statement.executeUpdate("ALTER TABLE person_details ADD COLUMN valid boolean");
+				}
+			});
+		});
+	}
+
+	@Test
+	public void test_sql_custom_crud() {
+
+		Person _person = doInJPA(this::entityManagerFactory, entityManager -> {
+			Person person = new Person();
+			person.setName("John Doe");
+			entityManager.persist(person);
+			person.setImage(new byte[] {1, 2, 3});
+			return person;
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Long postId = _person.getId();
+			Person person = entityManager.find(Person.class, postId);
+			assertArrayEquals(new byte[] {1, 2, 3}, person.getImage());
+			entityManager.remove(person);
+		});
+
+		doInJPA(this::entityManagerFactory, entityManager -> {
+			Long postId = _person.getId();
+			Person person = entityManager.find(Person.class, postId);
+			assertNull(person);
+		});
+	}
+
+
+	//tag::sql-custom-crud-secondary-table-example[]
+	@Entity(name = "Person")
+	@Table(name = "person")
+	@SecondaryTable(name = "person_details",
+			pkJoinColumns = @PrimaryKeyJoinColumn(name = "person_id"))
+	@SQLInsert(
+		sql = "INSERT INTO person (name, id, valid) VALUES (?, ?, true) "
+)
+	@SQLDelete(
+		sql = "UPDATE person SET valid = false WHERE id = ? "
+	)
+	@SQLInsert(
+		table = "person_details",
+		sql = "INSERT INTO person_details (image, person_id, valid) VALUES (?, ?, true) ",
+		check = ResultCheckStyle.COUNT
+	)
+	@SQLDelete(
+		table = "person_details",
+		sql = "UPDATE person_details SET valid = false WHERE person_id = ? "
+	)
+
+	@SQLSelect(
+		sql = "SELECT " +
+				"    p.id, " +
+				"    p.name, " +
+				"    pd.image  " +
+				"FROM person p  " +
+				"LEFT OUTER JOIN person_details pd ON p.id = pd.person_id  " +
+				"WHERE p.id = ? AND p.valid = true AND pd.valid = true"
+	)
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		@Column(name = "image", table = "person_details")
+		private byte[] image;
+
+		//Getters and setters are omitted for brevity
+
+	//end::sql-custom-crud-secondary-table-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public byte[] getImage() {
+			return image;
+		}
+
+		public void setImage(byte[] image) {
+			this.image = image;
+		}
+	//tag::sql-custom-crud-secondary-table-example[]
+	}
+	//end::sql-custom-crud-secondary-table-example[]
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLTest.java
index a930e305e92d..d08fae581e8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -17,7 +15,6 @@
 import jakarta.persistence.Id;
 
 import org.hibernate.Session;
-import org.hibernate.annotations.ResultCheckStyle;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLDeleteAll;
 import org.hibernate.annotations.SQLInsert;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Dimensions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Dimensions.java
index b5d17d0a95a3..4b7030ba1cd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Dimensions.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Dimensions.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.sql;
 import jakarta.persistence.Embeddable;
 
@@ -17,29 +13,29 @@
 @Embeddable
 public class Dimensions {
 
-    private int length;
+	private int length;
 
-    private int width;
+	private int width;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::sql-composite-key-entity-associations_named-query-example[]
 
-    public int getLength() {
-        return length;
-    }
+	public int getLength() {
+		return length;
+	}
 
-    public void setLength(int length) {
-        this.length = length;
-    }
+	public void setLength(int length) {
+		this.length = length;
+	}
 
-    public int getWidth() {
-        return width;
-    }
+	public int getWidth() {
+		return width;
+	}
 
-    public void setWidth(int width) {
-        this.width = width;
-    }
+	public void setWidth(int width) {
+		this.width = width;
+	}
 //tag::sql-composite-key-entity-associations_named-query-example[]
 }
 //end::sql-composite-key-entity-associations_named-query-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Identity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Identity.java
index 281cde38fbc9..2e923eb6e17a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Identity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/Identity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.sql;
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
@@ -18,48 +14,48 @@
 @Embeddable
 public class Identity implements Serializable {
 
-    private String firstname;
+	private String firstname;
 
-    private String lastname;
+	private String lastname;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::sql-composite-key-entity-associations_named-query-example[]
 
-    public String getFirstname() {
-        return firstname;
-    }
+	public String getFirstname() {
+		return firstname;
+	}
 
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
 
-    public String getLastname() {
-        return lastname;
-    }
+	public String getLastname() {
+		return lastname;
+	}
 
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
 
 //tag::sql-composite-key-entity-associations_named-query-example[]
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-        final Identity identity = (Identity) o;
+		final Identity identity = (Identity) o;
 
-        if (!firstname.equals(identity.firstname)) return false;
-        if (!lastname.equals(identity.lastname)) return false;
+		if (!firstname.equals(identity.firstname)) return false;
+		if (!lastname.equals(identity.lastname)) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public int hashCode() {
-        int result;
-        result = firstname.hashCode();
-        result = 29 * result + lastname.hashCode();
-        return result;
-    }
+	public int hashCode() {
+		int result;
+		result = firstname.hashCode();
+		result = 29 * result + lastname.hashCode();
+		return result;
+	}
 }
 //end::sql-composite-key-entity-associations_named-query-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java
index 97dbf5d07e37..cc10201c9528 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -312,7 +310,7 @@ public void testStoredProcedureInOutParameterAndResultList(EntityManagerFactoryS
 			//end::sql-jpa-call-sp-inout-with-result-list-mysql-example[]
 			// now let's see how the JDBC ResultSet is extracted
 			// this test should fail as of Hibernate 6.4.1, each item in the result set is an array: [Phone, Long]
-            assertInstanceOf(Phone.class, supposedToBePhone.get(0));
+			assertInstanceOf(Phone.class, supposedToBePhone.get(0));
 		} );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleCustomSQLWithStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleCustomSQLWithStoredProcedureTest.java
index a1a92c00445a..d79117268c07 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleCustomSQLWithStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleCustomSQLWithStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java
index b353225f63bc..158b52c356f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -46,193 +44,193 @@
  */
 @RequiresDialect(value = OracleDialect.class)
 @Jpa(
-        annotatedClasses = {
-                Person.class,
-                Partner.class,
-                Phone.class,
-                Call.class,
-                Payment.class,
-                Account.class
-        }
+		annotatedClasses = {
+				Person.class,
+				Partner.class,
+				Phone.class,
+				Call.class,
+				Payment.class,
+				Account.class
+		}
 )
 public class OracleStoredProcedureTest {
 
-    @BeforeAll
-    public void init(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
-            session.doWork(connection -> {
-                try (Statement statement = connection.createStatement()) {
-                    statement.executeUpdate(
-                        "CREATE OR REPLACE PROCEDURE sp_count_phones ( " +
-                        "   personId IN NUMBER,  " +
-                        "   phoneCount OUT NUMBER)  " +
-                        "AS  " +
-                        "BEGIN  " +
-                        "    SELECT COUNT(*) INTO phoneCount  " +
-                        "    FROM phone  " +
-                        "    WHERE person_id = personId; " +
-                        "END;"
-                    );
-                    //tag::sql-sp-ref-cursor-oracle-example[]
-                    statement.executeUpdate(
-                        "CREATE OR REPLACE PROCEDURE sp_person_phones (" +
-                        "   personId IN NUMBER, " +
-                        "   personPhones OUT SYS_REFCURSOR) " +
-                        "AS  " +
-                        "BEGIN " +
-                        "    OPEN personPhones FOR " +
-                        "    SELECT *" +
-                        "    FROM phone " +
-                        "    WHERE person_id = personId; " +
-                        "END;"
-                    );
-                    //end::sql-sp-ref-cursor-oracle-example[]
-                    statement.executeUpdate(
-                        "CREATE OR REPLACE FUNCTION fn_count_phones (" +
-                        "    personId IN NUMBER) " +
-                        "    RETURN NUMBER " +
-                        "IS " +
-                        "    phoneCount NUMBER; " +
-                        "BEGIN " +
-                        "    SELECT COUNT(*) INTO phoneCount " +
-                        "    FROM phone " +
-                        "    WHERE person_id = personId; " +
-                        "    RETURN(phoneCount); " +
-                        "END;"
-                    );
-                }
+	@BeforeAll
+	public void init(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
+			session.doWork(connection -> {
+				try (Statement statement = connection.createStatement()) {
+					statement.executeUpdate(
+						"CREATE OR REPLACE PROCEDURE sp_count_phones ( " +
+						"   personId IN NUMBER,  " +
+						"   phoneCount OUT NUMBER)  " +
+						"AS  " +
+						"BEGIN  " +
+						"    SELECT COUNT(*) INTO phoneCount  " +
+						"    FROM phone  " +
+						"    WHERE person_id = personId; " +
+						"END;"
+					);
+					//tag::sql-sp-ref-cursor-oracle-example[]
+					statement.executeUpdate(
+						"CREATE OR REPLACE PROCEDURE sp_person_phones (" +
+						"   personId IN NUMBER, " +
+						"   personPhones OUT SYS_REFCURSOR) " +
+						"AS  " +
+						"BEGIN " +
+						"    OPEN personPhones FOR " +
+						"    SELECT *" +
+						"    FROM phone " +
+						"    WHERE person_id = personId; " +
+						"END;"
+					);
+					//end::sql-sp-ref-cursor-oracle-example[]
+					statement.executeUpdate(
+						"CREATE OR REPLACE FUNCTION fn_count_phones (" +
+						"    personId IN NUMBER) " +
+						"    RETURN NUMBER " +
+						"IS " +
+						"    phoneCount NUMBER; " +
+						"BEGIN " +
+						"    SELECT COUNT(*) INTO phoneCount " +
+						"    FROM phone " +
+						"    WHERE person_id = personId; " +
+						"    RETURN(phoneCount); " +
+						"END;"
+					);
+				}
 			});
-        });
-        scope.inTransaction( entityManager -> {
-            Person person1 = new Person("John Doe");
-            person1.setNickName("JD");
-            person1.setAddress("Earth");
-            person1.setCreatedOn(LocalDateTime.of(2000, 1, 1, 0, 0, 0)) ;
-            person1.getAddresses().put(AddressType.HOME, "Home address");
-            person1.getAddresses().put(AddressType.OFFICE, "Office address");
-
-            entityManager.persist(person1);
-
-            Phone phone1 = new Phone("123-456-7890");
-            phone1.setId(1L);
-            phone1.setType(PhoneType.MOBILE);
-
-            person1.addPhone(phone1);
-
-            Phone phone2 = new Phone("098_765-4321");
-            phone2.setId(2L);
-            phone2.setType(PhoneType.LAND_LINE);
-
-            person1.addPhone(phone2);
-        });
-    }
-
-    @AfterAll
-    public void destroy(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
-            session.doWork(connection -> {
-                try(Statement statement = connection.createStatement()) {
-                    statement.executeUpdate("DROP PROCEDURE sp_count_phones");
-                }
-                catch (SQLException ignore) {
-                }
-            });
-        });
-        scope.inTransaction( entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
-            session.doWork(connection -> {
-                try(Statement statement = connection.createStatement()) {
-                    statement.executeUpdate("DROP PROCEDURE sp_person_phones");
-                }
-                catch (SQLException ignore) {
-                }
-            });
-        });
-        scope.inTransaction( entityManager -> {
-            Session session = entityManager.unwrap(Session.class);
-            session.doWork(connection -> {
-                try(Statement statement = connection.createStatement()) {
-                    statement.executeUpdate("DROP FUNCTION fn_count_phones");
-                }
-                catch (SQLException ignore) {
-                }
-            });
-        });
-    }
-
-    @Test
-    public void testStoredProcedureOutParameter(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            StoredProcedureQuery query = entityManager.createStoredProcedureQuery("sp_count_phones");
-            query.registerStoredProcedureParameter(1, Long.class, ParameterMode.IN);
-            query.registerStoredProcedureParameter(2, Long.class, ParameterMode.OUT);
-
-            query.setParameter(1, 1L);
-
-            query.execute();
-            Long phoneCount = (Long) query.getOutputParameterValue(2);
-            assertEquals(2l, phoneCount);
-        });
-    }
-
-    @Test
-    public void testStoredProcedureRefCursor(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            //tag::sql-jpa-call-sp-ref-cursor-oracle-example[]
-            StoredProcedureQuery query = entityManager.createStoredProcedureQuery("sp_person_phones");
-            query.registerStoredProcedureParameter(1, Long.class, ParameterMode.IN);
-            query.registerStoredProcedureParameter(2, Class.class, ParameterMode.REF_CURSOR);
-            query.setParameter(1, 1L);
-
-            query.execute();
-            List postComments = query.getResultList();
-            //end::sql-jpa-call-sp-ref-cursor-oracle-example[]
-            assertNotNull(postComments);
-        });
-    }
-
-    @Test
-    public void testStoredProcedureRefCursorUsingNamedQuery(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            //tag::sql-jpa-call-sp-ref-cursor-oracle-named-query-example[]
-            List postComments = entityManager
-            .createNamedStoredProcedureQuery("sp_person_phones")
-            .setParameter("personId", 1L)
-            .getResultList();
-            //end::sql-jpa-call-sp-ref-cursor-oracle-named-query-example[]
-
-            assertNotNull(postComments);
-        });
-    }
-
-    @Test
-    public void testHibernateProcedureCallRefCursor(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            //tag::sql-hibernate-call-sp-ref-cursor-oracle-example[]
-            Session session = entityManager.unwrap(Session.class);
-            
-            ProcedureCall call = session.createStoredProcedureCall("sp_person_phones");
-            ProcedureParameter parameter = call.registerParameter(1, Long.class, ParameterMode.IN);
-            call.setParameter(parameter, 1L);
-            call.registerParameter(2, Class.class, ParameterMode.REF_CURSOR);
-
-            Output output = call.getOutputs().getCurrent();
-            List postComments = ((ResultSetOutput) output).getResultList();
-            assertEquals(2, postComments.size());
-            //end::sql-hibernate-call-sp-ref-cursor-oracle-example[]
-        });
-    }
-
-    @Test
-    public void testStoredProcedureReturnValue(EntityManagerFactoryScope scope) {
-        scope.inTransaction( entityManager -> {
-            BigDecimal phoneCount = (BigDecimal) entityManager
-                    .createNativeQuery( "SELECT fn_count_phones(:personId) FROM DUAL" )
-                    .setParameter( "personId", 1 )
-                    .getSingleResult();
-            assertEquals( BigDecimal.valueOf( 2L ), phoneCount );
-        } );
-    }
+		});
+		scope.inTransaction( entityManager -> {
+			Person person1 = new Person("John Doe");
+			person1.setNickName("JD");
+			person1.setAddress("Earth");
+			person1.setCreatedOn(LocalDateTime.of(2000, 1, 1, 0, 0, 0)) ;
+			person1.getAddresses().put(AddressType.HOME, "Home address");
+			person1.getAddresses().put(AddressType.OFFICE, "Office address");
+
+			entityManager.persist(person1);
+
+			Phone phone1 = new Phone("123-456-7890");
+			phone1.setId(1L);
+			phone1.setType(PhoneType.MOBILE);
+
+			person1.addPhone(phone1);
+
+			Phone phone2 = new Phone("098_765-4321");
+			phone2.setId(2L);
+			phone2.setType(PhoneType.LAND_LINE);
+
+			person1.addPhone(phone2);
+		});
+	}
+
+	@AfterAll
+	public void destroy(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
+			session.doWork(connection -> {
+				try(Statement statement = connection.createStatement()) {
+					statement.executeUpdate("DROP PROCEDURE sp_count_phones");
+				}
+				catch (SQLException ignore) {
+				}
+			});
+		});
+		scope.inTransaction( entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
+			session.doWork(connection -> {
+				try(Statement statement = connection.createStatement()) {
+					statement.executeUpdate("DROP PROCEDURE sp_person_phones");
+				}
+				catch (SQLException ignore) {
+				}
+			});
+		});
+		scope.inTransaction( entityManager -> {
+			Session session = entityManager.unwrap(Session.class);
+			session.doWork(connection -> {
+				try(Statement statement = connection.createStatement()) {
+					statement.executeUpdate("DROP FUNCTION fn_count_phones");
+				}
+				catch (SQLException ignore) {
+				}
+			});
+		});
+	}
+
+	@Test
+	public void testStoredProcedureOutParameter(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			StoredProcedureQuery query = entityManager.createStoredProcedureQuery("sp_count_phones");
+			query.registerStoredProcedureParameter(1, Long.class, ParameterMode.IN);
+			query.registerStoredProcedureParameter(2, Long.class, ParameterMode.OUT);
+
+			query.setParameter(1, 1L);
+
+			query.execute();
+			Long phoneCount = (Long) query.getOutputParameterValue(2);
+			assertEquals(2l, phoneCount);
+		});
+	}
+
+	@Test
+	public void testStoredProcedureRefCursor(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			//tag::sql-jpa-call-sp-ref-cursor-oracle-example[]
+			StoredProcedureQuery query = entityManager.createStoredProcedureQuery("sp_person_phones");
+			query.registerStoredProcedureParameter(1, Long.class, ParameterMode.IN);
+			query.registerStoredProcedureParameter(2, Class.class, ParameterMode.REF_CURSOR);
+			query.setParameter(1, 1L);
+
+			query.execute();
+			List postComments = query.getResultList();
+			//end::sql-jpa-call-sp-ref-cursor-oracle-example[]
+			assertNotNull(postComments);
+		});
+	}
+
+	@Test
+	public void testStoredProcedureRefCursorUsingNamedQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			//tag::sql-jpa-call-sp-ref-cursor-oracle-named-query-example[]
+			List postComments = entityManager
+			.createNamedStoredProcedureQuery("sp_person_phones")
+			.setParameter("personId", 1L)
+			.getResultList();
+			//end::sql-jpa-call-sp-ref-cursor-oracle-named-query-example[]
+
+			assertNotNull(postComments);
+		});
+	}
+
+	@Test
+	public void testHibernateProcedureCallRefCursor(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			//tag::sql-hibernate-call-sp-ref-cursor-oracle-example[]
+			Session session = entityManager.unwrap(Session.class);
+
+			ProcedureCall call = session.createStoredProcedureCall("sp_person_phones");
+			ProcedureParameter parameter = call.registerParameter(1, Long.class, ParameterMode.IN);
+			call.setParameter(parameter, 1L);
+			call.registerParameter(2, Class.class, ParameterMode.REF_CURSOR);
+
+			Output output = call.getOutputs().getCurrent();
+			List postComments = ((ResultSetOutput) output).getResultList();
+			assertEquals(2, postComments.size());
+			//end::sql-hibernate-call-sp-ref-cursor-oracle-example[]
+		});
+	}
+
+	@Test
+	public void testStoredProcedureReturnValue(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			BigDecimal phoneCount = (BigDecimal) entityManager
+					.createNativeQuery( "SELECT fn_count_phones(:personId) FROM DUAL" )
+					.setParameter( "personId", 1 )
+					.getSingleResult();
+			assertEquals( BigDecimal.valueOf( 2L ), phoneCount );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/PersonSummaryDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/PersonSummaryDTO.java
index d5e51168c2da..09a8f8aa25a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/PersonSummaryDTO.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/PersonSummaryDTO.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -12,26 +10,26 @@
 //tag::sql-hibernate-dto-query-example[]
 public class PersonSummaryDTO {
 
-    private Number id;
+	private Number id;
 
-    private String name;
+	private String name;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
-    public Number getId() {
-        return id;
-    }
+	public Number getId() {
+		return id;
+	}
 
-    public void setId(Number id) {
-        this.id = id;
-    }
+	public void setId(Number id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }
 //end::sql-hibernate-dto-query-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java
index a1245b8510f2..e9a1c09e67cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -67,10 +65,10 @@ public void init() {
 			session.doWork(connection -> {
 				try(Statement statement = connection.createStatement();) {
 					statement.executeUpdate(String.format( "ALTER TABLE person %s valid %s",
-														   getDialect().getAddColumnString(),
+														getDialect().getAddColumnString(),
 							ddlTypeRegistry.getTypeName( Types.BOOLEAN, getDialect())));
 					statement.executeUpdate(String.format( "ALTER TABLE Person_phones %s valid %s",
-														   getDialect().getAddColumnString(),
+														getDialect().getAddColumnString(),
 							ddlTypeRegistry.getTypeName( Types.BOOLEAN, getDialect())));
 				}
 			});
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
index 4f815fd759eb..5533bbefab13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -35,7 +33,6 @@
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -57,7 +54,7 @@ protected Class[] getAnnotatedClasses() {
 		return new Class[] {
 			Person.class,
 			Partner.class,
-            Phone.class,
+			Phone.class,
 			Call.class,
 			Account.class,
 			CreditCardPayment.class,
@@ -183,7 +180,7 @@ public void test_sql_jpa_custom_column_selection_scalar_query_example() {
 	@Test
 	public void test_sql_hibernate_query_scalar_example() {
 
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::sql-hibernate-all-columns-scalar-query-example[]
 			List persons = session.createNativeQuery(
@@ -215,7 +212,7 @@ public void test_sql_hibernate_custom_column_selection_scalar_query_example() {
 
 	@Test
 	public void test_sql_hibernate_query_scalar_explicit_result_set_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::sql-hibernate-scalar-query-explicit-result-set-example[]
 			List persons = session.createNativeQuery(
@@ -256,7 +253,7 @@ public void test_sql_hibernate_query_scalar_partial_explicit_result_set_example(
 
 	@Test
 	public void test_sql_jpa_entity_query_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::sql-jpa-entity-query-example[]
 			List persons = entityManager.createNativeQuery(
 				"SELECT * FROM Person", Person.class)
@@ -268,7 +265,7 @@ public void test_sql_jpa_entity_query_example() {
 
 	@Test
 	public void test_sql_hibernate_entity_query_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::sql-hibernate-entity-query-example[]
 			List persons = session.createNativeQuery(
@@ -281,7 +278,7 @@ public void test_sql_hibernate_entity_query_example() {
 
 	@Test
 	public void test_sql_jpa_entity_query_explicit_result_set_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::sql-jpa-entity-query-explicit-result-set-example[]
 			List persons = entityManager.createNativeQuery(
 				"SELECT id, name, nick_name, address, created_on, version " +
@@ -294,7 +291,7 @@ public void test_sql_jpa_entity_query_explicit_result_set_example() {
 
 	@Test
 	public void test_sql_hibernate_entity_query_explicit_result_set_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::sql-hibernate-entity-query-explicit-result-set-example[]
 			List persons = session.createNativeQuery(
@@ -308,7 +305,7 @@ public void test_sql_hibernate_entity_query_explicit_result_set_example() {
 
 	@Test
 	public void test_sql_jpa_entity_associations_query_many_to_one_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::sql-jpa-entity-associations-query-many-to-one-example[]
 			List phones = entityManager.createNativeQuery(
 				"SELECT id, phone_number, phone_type, person_id " +
@@ -321,7 +318,7 @@ public void test_sql_jpa_entity_associations_query_many_to_one_example() {
 
 	@Test
 	public void test_sql_hibernate_entity_associations_query_many_to_one_example() {
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		doInJPA(this::entityManagerFactory, entityManager -> {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::sql-hibernate-entity-associations-query-many-to-one-example[]
 			List phones = session.createNativeQuery(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
index 6854adf03cbc..836a133d7875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
 package org.hibernate.orm.test.sql;
 
 import jakarta.persistence.ColumnResult;
@@ -27,100 +23,100 @@
 //tag::sql-composite-key-entity-associations_named-query-example[]
 @Entity
 @NamedNativeQueries({
-    @NamedNativeQuery(name = "find_all_spaceships",
-        query =
-            "SELECT " +
-            "   name as \"name\", " +
-            "   model, " +
-            "   speed, " +
-            "   lname as lastn, " +
-            "   fname as firstn, " +
-            "   length, " +
-            "   width, " +
-            "   length * width as surface, " +
-            "   length * width * 10 as volume " +
-            "FROM SpaceShip",
-        resultSetMapping = "spaceship"
-   )
+	@NamedNativeQuery(name = "find_all_spaceships",
+		query =
+			"SELECT " +
+			"   name as \"name\", " +
+			"   model, " +
+			"   speed, " +
+			"   lname as lastn, " +
+			"   fname as firstn, " +
+			"   length, " +
+			"   width, " +
+			"   length * width as surface, " +
+			"   length * width * 10 as volume " +
+			"FROM SpaceShip",
+		resultSetMapping = "spaceship"
+)
 })
 @SqlResultSetMapping(
-    name = "spaceship",
-    entities = @EntityResult(
-        entityClass = SpaceShip.class,
-        fields = {
-            @FieldResult(name = "name", column = "name"),
-            @FieldResult(name = "model", column = "model"),
-            @FieldResult(name = "speed", column = "speed"),
-            @FieldResult(name = "captain.id.lastname", column = "lastn"),
-            @FieldResult(name = "captain.id.firstname", column = "firstn"),
-            @FieldResult(name = "dimensions.length", column = "length"),
-            @FieldResult(name = "dimensions.width", column = "width"),
-        }
-   ),
-    columns = {
-        @ColumnResult(name = "surface"),
-        @ColumnResult(name = "volume")
-    }
+	name = "spaceship",
+	entities = @EntityResult(
+		entityClass = SpaceShip.class,
+		fields = {
+			@FieldResult(name = "name", column = "name"),
+			@FieldResult(name = "model", column = "model"),
+			@FieldResult(name = "speed", column = "speed"),
+			@FieldResult(name = "captain.id.lastname", column = "lastn"),
+			@FieldResult(name = "captain.id.firstname", column = "firstn"),
+			@FieldResult(name = "dimensions.length", column = "length"),
+			@FieldResult(name = "dimensions.width", column = "width"),
+		}
+),
+	columns = {
+		@ColumnResult(name = "surface"),
+		@ColumnResult(name = "volume")
+	}
 )
 public class SpaceShip {
 
-    @Id
-    private String name;
+	@Id
+	private String name;
 
-    private String model;
+	private String model;
 
-    private double speed;
+	private double speed;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "fname", referencedColumnName = "firstname")
-    @JoinColumn(name = "lname", referencedColumnName = "lastname")
-    private Captain captain;
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "fname", referencedColumnName = "firstname")
+	@JoinColumn(name = "lname", referencedColumnName = "lastname")
+	private Captain captain;
 
-    private Dimensions dimensions;
+	private Dimensions dimensions;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 
 //end::sql-composite-key-entity-associations_named-query-example[]
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public String getModel() {
-        return model;
-    }
+	public String getModel() {
+		return model;
+	}
 
-    public void setModel(String model) {
-        this.model = model;
-    }
+	public void setModel(String model) {
+		this.model = model;
+	}
 
-    public double getSpeed() {
-        return speed;
-    }
+	public double getSpeed() {
+		return speed;
+	}
 
-    public void setSpeed(double speed) {
-        this.speed = speed;
-    }
+	public void setSpeed(double speed) {
+		this.speed = speed;
+	}
 
-    public Captain getCaptain() {
-        return captain;
-    }
+	public Captain getCaptain() {
+		return captain;
+	}
 
-    public void setCaptain(Captain captain) {
-        this.captain = captain;
-    }
+	public void setCaptain(Captain captain) {
+		this.captain = captain;
+	}
 
-    public Dimensions getDimensions() {
-        return dimensions;
-    }
+	public Dimensions getDimensions() {
+		return dimensions;
+	}
 
-    public void setDimensions(Dimensions dimensions) {
-        this.dimensions = dimensions;
-    }
+	public void setDimensions(Dimensions dimensions) {
+		this.dimensions = dimensions;
+	}
 //tag::sql-composite-key-entity-associations_named-query-example[]
 }
 //end::sql-composite-key-entity-associations_named-query-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java
index af40d5032342..9ee87977070d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
@@ -86,11 +84,11 @@ public void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "VersionedEntity" )
 	@Table( name = "entity_table" )
 	public static class VersionedEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 		@Version
 		private Integer version;
-	    @Basic
+		@Basic
 		private String name;
 
 		protected VersionedEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/TemplateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/TemplateTest.java
index 49993008b323..0c2d236a495a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/TemplateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/TemplateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java
index e9787dbfc452..f5df4bd9fb7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.ast;
 
@@ -205,9 +203,9 @@ public String createMarker(int position, JdbcType jdbcType) {
 	)
 	@Filter( name = "region" )
 	public static class EntityWithFilters {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Basic
 		private String region;
@@ -246,9 +244,9 @@ public void setRegion(String region) {
 	@Entity( name = "EntityWithVersion" )
 	@Table( name = "versioned_entity" )
 	public static class EntityWithVersion {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Version
 		private int version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java
index ae0e980d0745..fdbcb812b356 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.ast;
 
@@ -29,7 +27,6 @@
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
-import org.hibernate.sql.results.graph.InitializerParent;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.graph.basic.BasicResultAssembler;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java
index f3fbdde71411..41ad40385bfe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstHelper.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.ast;
 
 import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.sqm.internal.QuerySqmImpl;
 import org.hibernate.query.sqm.sql.SqmTranslation;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
index 15f7f7112e44..26dd08fdf490 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.autodiscovery;
 
@@ -132,8 +130,8 @@ public void execute(Connection connection) throws SQLException {
 							Assert.assertFalse( "bad dialect.getColumnAliasExtractor impl", column1Alias.equals( column2Alias ) );
 						}
 						finally {
-                            sessionImplementor.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, ps );
-                            sessionImplementor.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( ps );
+							sessionImplementor.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, ps );
+							sessionImplementor.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( ps );
 						}
 					}
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java
index 36f4ed10f891..a872c7c902aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.autodiscovery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java
index b2f9585f1b91..4ff80712f9ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.autodiscovery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java
index 33194c5889a1..698049193385 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.autodiscovery;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ExceptionCheckingEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ExceptionCheckingEntity.java
index 41b7336490e5..79da42cf5fdd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ExceptionCheckingEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ExceptionCheckingEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.check;
 
@@ -34,4 +32,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/OracleCheckStyleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/OracleCheckStyleTest.java
index 43395d0ebd08..51e8b273ed9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/OracleCheckStyleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/OracleCheckStyleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.check;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ParamCheckingEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ParamCheckingEntity.java
index dc2bb074f03d..3e03d136a46d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ParamCheckingEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ParamCheckingEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.check;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java
index 5e8b00d052de..3bab367e5d0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.check;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java
index 0bf7be6ba64f..3d91e0d5ace4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java
index 1365accf8bf7..ff9faebb2546 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java
index 1e8f1b6c3c21..f245d7df9f3b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java
index 274cc662d6a1..748d4d4b4124 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java
index 7b9aadfc1e4b..e5c76ed2cc26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java
index 78ffcb80d734..ddb6e2e9efdb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
index 32f467ffc665..45de2bb7053f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java
index 4d6118938e6b..d72efb73adcc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java
index 11bd655dc755..a96d31a17114 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java
index ec051d7067b4..d8ee99db89c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java
index 1bacc963fe72..10c6b9cff588 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java
index f1551580686e..f5d3869e8294 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java
index 0aa477f08741..de23bbed6001 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.manytoone;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java
index d0173480deea..f4542ae1319a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone;
 
@@ -246,4 +244,3 @@ public void testRemove(SessionFactoryScope scope){
 
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java
index 3c3f255983c3..596ef3c3676e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
index e697d686c0be..35033f2a932d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java
index 356a9141000c..46b9e5831e42 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java
index 5d405a9545fe..71125e448d01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java
index cc4b223cf21f..a7e71598d9b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java
index c7a716d9792c..e1815fb1bef7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java
index 774370fb5a8e..8d700829687d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java
index ada80aba2d0e..cae64f9937c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.exec.onetoone.bidirectional;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java
index d60b15f44613..a001e304b479 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.function;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Dimension.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Dimension.java
index 405c80c52016..d70158820270 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Dimension.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Dimension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Employment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Employment.java
index 18d8ce7cac38..5d6a31c0549b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Employment.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Employment.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employment.java 11486 2007-05-08 21:57:24Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.sql.hand;
 import java.util.Date;
 
@@ -20,7 +16,7 @@ public class Employment {
 	private Date endDate;
 	private String regionCode;
 	private MonetaryAmount salary;
-	
+
 	public Employment() {}
 
 	public Employment(Person employee, Organization employer, String regionCode) {
@@ -102,11 +98,11 @@ public String getRegionCode() {
 	public void setRegionCode(String regionCode) {
 		this.regionCode = regionCode;
 	}
-	
+
 	public MonetaryAmount getSalary() {
 		return salary;
 	}
-	
+
 	public void setSalary(MonetaryAmount salary) {
 		this.salary = salary;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Group.java
index fb17a5febb1a..424cd55c0288 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Group.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/ImageHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/ImageHolder.java
index 6bc738166a31..663c3ee3dcf3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/ImageHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/ImageHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmount.java
index 6c206d5c1be7..b7965e5fa7fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmount.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 import java.io.Serializable;
@@ -56,7 +54,7 @@ public int hashCode() {
 
 	public String toString() {
 		return "Value: '" + getValue() + "', " +
-		        "Currency: '" + getCurrency() + "'";
+				"Currency: '" + getCurrency() + "'";
 	}
 
 	public int compareTo(Object o) {
@@ -71,11 +69,11 @@ public int compareTo(Object o) {
 
 	public static MonetaryAmount fromString(String amount, String currencyCode) {
 		return new MonetaryAmount(new BigDecimal(amount),
-								  Currency.getInstance(currencyCode));
+								Currency.getInstance(currencyCode));
 	}
 
 	public static MonetaryAmount convert(MonetaryAmount amount,
-										 Currency toConcurrency) {
+										Currency toConcurrency) {
 		// TODO: This requires some conversion magic and is therefore broken
 		return new MonetaryAmount(amount.getValue(), toConcurrency);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmountUserType.java
index 98d5c6b74849..41ea194b5344 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmountUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmountUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Order.java
index 2e06bd4e7ad8..c63c13d7de6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Order.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Order.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 import java.io.Serializable;
 
 public class Order {
-	
+
 	static public class OrderId implements Serializable {
 		String orgid;
 		String ordernumber;
@@ -24,20 +22,20 @@ public String getOrgid() {
 		public void setOrgid(String orgid) {
 			this.orgid = orgid;
 		}
-		
-		
+
+
 	}
-	
+
 	OrderId orderId;
-	
+
 	Product product;
 
 	Person person;
-	
+
 	public Person getPerson() {
 		return person;
 	}
-	
+
 	public void setPerson(Person person) {
 		this.person = person;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Organization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Organization.java
index 168237497fc1..e98547d81b88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Organization.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Organization.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Organization.java 11486 2007-05-08 21:57:24Z steve.ebersole@jboss.com $
 package org.hibernate.orm.test.sql.hand;
 import java.util.Collection;
 import java.util.HashSet;
@@ -61,5 +57,5 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Person.java
index 453cddb9c06f..74d25df4a435 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Product.java
index 8e1ad52f0773..784817525f67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 import java.io.Serializable;
@@ -10,7 +8,7 @@
 import java.util.Set;
 
 public class Product {
-	
+
 	static public class ProductId implements Serializable {
 		String orgid;
 		String productnumber;
@@ -26,29 +24,29 @@ public String getOrgid() {
 		public void setOrgid(String orgid) {
 			this.orgid = orgid;
 		}
-		
-		
+
+
 	}
-	
+
 	ProductId productId;
-	
+
 	String name;
 
 	Person person;
-	
+
 	Set orders = new HashSet();
-	
+
 	public Set getOrders() {
 		return orders;
 	}
-	
+
 	public void setOrders(Set orders) {
 		this.orders = orders;
 	}
 	public Person getPerson() {
 		return person;
 	}
-	
+
 	public void setPerson(Person person) {
 		this.person = person;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/SpaceShip.java
index 5b4dd5c5d2ce..07eac4d78905 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/SpaceShip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/SpaceShip.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.sql.hand;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Speech.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Speech.java
index bc81e1adc013..1b08f7a20498 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Speech.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Speech.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: $
 package org.hibernate.orm.test.sql.hand;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/TextHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/TextHolder.java
index 4bb4e2801cf0..e53e715e8d3b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/TextHolder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/TextHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java
index 3db6dc97100f..8c955f69251c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java
index 68519fbf63d7..308e9dc970ef 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/DB2CustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/DB2CustomSQLTest.java
index da51f004daba..25675aeac964 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/DB2CustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/DB2CustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom.db2;
 
@@ -13,7 +11,7 @@
 
 /**
  * Custom SQL tests for DB2
- * 
+ *
  * @author Max Rydahl Andersen
  */
 @RequiresDialect( DB2Dialect.class )
@@ -22,4 +20,3 @@ public String[] getMappings() {
 		return new String[] { "sql/hand/custom/db2/Mappings.hbm.xml" };
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java
index 0e17e0dddb85..e0c23d1f571e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom.mysql;
 
@@ -25,4 +23,3 @@ public String[] getMappings() {
 		return new String[] { "sql/hand/custom/mysql/Mappings.hbm.xml" };
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/OracleCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
index d5e6cba632fc..265746e31770 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom.oracle;
 
@@ -13,7 +11,7 @@
 
 /**
  * Custom SQL tests for Oracle
- * 
+ *
  * @author Gavin King
  */
 @RequiresDialect( OracleDialect.class )
@@ -22,4 +20,3 @@ public String[] getMappings() {
 		return new String[] { "sql/hand/custom/oracle/Mappings.hbm.xml", "sql/hand/custom/oracle/StoredProcedures.hbm.xml" };
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java
index 6324e53d013c..cb9ab828174c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom.sqlserver;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java
index e784c0833758..718617888c40 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.custom.sybase;
 
@@ -13,7 +11,7 @@
 
 /**
  * Custom SQL tests for Sybase dialects
- * 
+ *
  * @author Gavin King
  */
 @RequiresDialect(SybaseDialect.class)
@@ -22,4 +20,3 @@ public String[] getMappings() {
 		return new String[] { "sql/hand/custom/sybase/Mappings.hbm.xml" };
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
index 1143203ea12f..b1aa65932121 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.identity;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java
index e556f91cd118..8af5856dc0c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.query;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
index 0cfa6acfdc7a..57620cdfe1b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.quotedidentifiers;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Person.java
index 9a26f3542b8b..252cd9444574 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.hand.quotedidentifiers;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
index 2f512703a763..4ebcb057db47 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.partition;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
index a8ba554e8373..d2f32c949005 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.partition;
 
@@ -70,12 +68,12 @@ public void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "PartitionedEntity" )
 	@Table( name = "entity_table" )
 	public static class PartitionedEntity {
-	    @Id
-	    private Integer id;
+		@Id
+		private Integer id;
 		@PartitionKey
 		@Column(name = "tenant_id", updatable = false)
 		private Integer tenantId;
-	    @Basic
+		@Basic
 		private String name;
 
 		protected PartitionedEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java
index fe510ded7117..eae931be2160 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.refcursor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/NumValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/NumValue.java
index 40890d21697b..d94271c2530c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/NumValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/NumValue.java
@@ -1,21 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.refcursor;
 
 import java.io.Serializable;
-import java.sql.ResultSet;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedStoredProcedureQuery;
-import jakarta.persistence.ParameterMode;
 import jakarta.persistence.QueryHint;
-import jakarta.persistence.StoredProcedureParameter;
 import jakarta.persistence.Table;
 
 @Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/AbstractResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/AbstractResultTests.java
index 1d7789481f0d..da11575ea7eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/AbstractResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/AbstractResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/BasicResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/BasicResultTests.java
index 753f17fd8098..fcc346582ec6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/BasicResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/BasicResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/EmbeddableResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/EmbeddableResultTests.java
index 293a01dac20a..de650c4bee19 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/EmbeddableResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/EmbeddableResultTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java
index 72f69a08a0e0..ee3735457272 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.results;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java
index ed91b056c220..cf1e1a68501d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.sql.results.graph.embeddable.internal;
 
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java
index 959aaef0403e..722bc5e481ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.storedproc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java
index 1df5d7fb5d04..7ec65dbbc89f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.storedproc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/ResultMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/ResultMappingTest.java
index cc8ffac314af..5c4bb4cc81aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/ResultMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/ResultMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.storedproc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java
index f01f2efdc1b3..8b9a5cb22f91 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.storedproc;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureTest.java
index ed77a3537875..cd26326e07ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.storedproc;
 
-import java.sql.CallableStatement;
 import java.util.List;
 
 import org.hibernate.boot.MetadataBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
index a56336a29d29..85a32eadc92c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.sql.syncSpace;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentQueryStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentQueryStatisticsTest.java
index c526b3fdfab7..aeff3cd24e31 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentQueryStatisticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentQueryStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stat.internal;
 
@@ -42,4 +40,4 @@ public void testStats() {
 		assertEquals( 11, stats.getExecutionAvgTime() );
 		assertEquals( 11.5, stats.getExecutionAvgTimeAsDouble(), 0.1 );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentStatisticsTest.java
index 5289fd82bbf7..56147db219c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentStatisticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/ConcurrentStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stat.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java
index b8cf4a590396..ef026ea17b72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stat.internal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java
index 9cae2cc5d1dc..7916864e7df3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stat.internal;
 
@@ -14,7 +12,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertNull;
 
 @JiraKey(value = "HHH-13645")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Contact.java
index abfe6b3b8a0d..bf87f03f681a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Contact.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Contact.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
 
 /**
- * 
+ *
  * @author stliu
  */
 public class Contact {
@@ -26,5 +24,5 @@ public void setOrg( Org org ) {
 		this.org = org;
 	}
 	private Org org;
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Country.java
index 01e910342d2d..3a3a1785a45e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java
index df01996b3d28..af83fc98dc55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Document.java 8057 2005-08-31 23:19:53Z oneovthafew $
 package org.hibernate.orm.test.stateless;
 import java.util.Date;
 
@@ -13,13 +9,13 @@
  * @author Gavin King
  */
 public class Document {
-	
+
 	private String text;
 	private String name;
 	private Date lastModified;
 
 	Document() {}
-	
+
 	public Document(String text, String name) {
 		this.text = text;
 		this.name = name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
index 0ffd842daf26..de5a513b174e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.ElementCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetAllTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetAllTest.java
index cb8355c7622f..65608942033b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetAllTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetAllTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
@@ -15,29 +19,29 @@
 @SessionFactory
 @DomainModel(annotatedClasses = GetAllTest.Record.class)
 public class GetAllTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inStatelessTransaction(s-> {
-            s.insert(new Record(123L,"hello earth"));
-            s.insert(new Record(456L,"hello mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            List all = s.getAll(Record.class, List.of(456L, 123L, 2L));
-            assertEquals("hello mars",all.get(0).message);
-            assertEquals("hello earth",all.get(1).message);
-            assertNull(all.get(2));
-        });
-    }
-    @Entity
-    static class Record {
-        @Id Long id;
-        String message;
+	@Test void test(SessionFactoryScope scope) {
+		scope.inStatelessTransaction(s-> {
+			s.insert(new Record(123L,"hello earth"));
+			s.insert(new Record(456L,"hello mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			List all = s.getAll(Record.class, List.of(456L, 123L, 2L));
+			assertEquals("hello mars",all.get(0).message);
+			assertEquals("hello earth",all.get(1).message);
+			assertNull(all.get(2));
+		});
+	}
+	@Entity
+	static class Record {
+		@Id Long id;
+		String message;
 
-        Record(Long id, String message) {
-            this.id = id;
-            this.message = message;
-        }
+		Record(Long id, String message) {
+			this.id = id;
+			this.message = message;
+		}
 
-        Record() {
-        }
-    }
+		Record() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Org.java
index b6e6c24d68af..f767a3c4146a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Org.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Org.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Paper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Paper.java
index 42290ef64421..9deaf6e0a4bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Paper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Paper.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Paper.java 8048 2005-08-30 21:27:17Z epbernard $
 package org.hibernate.orm.test.stateless;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
index 5e12bda08272..6d4a3cf46a28 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCollectionsTest.java
index 8db534a6f863..89631f744f08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCollectionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCollectionsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.ElementCollection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java
index 4a06db12b8b8..54842febed06 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java
index edd407400c9f..9cae7cdc9aa9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java
index e358b9dedd42..88b7de6fe3d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java
index 3e0c7bb4a1fd..cf66e017f2f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java
index e6749c296b22..16495fd9d415 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionStatisticsTest.java
index 5ed772d9ecc5..4480fe7891a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionStatisticsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionStatisticsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
index b86813a8302a..3b4cffc5fed1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless;
 
@@ -215,4 +213,3 @@ public void testRefresh(SessionFactoryScope scope) {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionVersioningTest.java
index d7c5d90730fd..15171bec438d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionVersioningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionVersioningTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
index 86dbbbd91376..6afc1aeec5d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
@@ -12,34 +16,34 @@
 @SessionFactory
 @DomainModel(annotatedClasses = UpsertTest.Record.class)
 public class UpsertTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,"hello earth"));
-            s.upsert(new Record(456L,"hello mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("hello earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,"goodbye earth"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("goodbye earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-    }
-    @Entity
-    static class Record {
-        @Id Long id;
-        String message;
+	@Test void test(SessionFactoryScope scope) {
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,"hello earth"));
+			s.upsert(new Record(456L,"hello mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals("hello earth",s.get(Record.class,123L).message);
+			assertEquals("hello mars",s.get(Record.class,456L).message);
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,"goodbye earth"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals("goodbye earth",s.get(Record.class,123L).message);
+			assertEquals("hello mars",s.get(Record.class,456L).message);
+		});
+	}
+	@Entity
+	static class Record {
+		@Id Long id;
+		String message;
 
-        Record(Long id, String message) {
-            this.id = id;
-            this.message = message;
-        }
+		Record(Long id, String message) {
+			this.id = id;
+			this.message = message;
+		}
 
-        Record() {
-        }
-    }
+		Record() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertVersionedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertVersionedTest.java
index 07921e8e92d1..4523a5b01737 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertVersionedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertVersionedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless;
 
 import jakarta.persistence.Entity;
@@ -13,43 +17,43 @@
 @SessionFactory
 @DomainModel(annotatedClasses = UpsertVersionedTest.Record.class)
 public class UpsertVersionedTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,null,"hello earth"));
-            s.upsert(new Record(456L,2L,"hello mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("hello earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,0L,"goodbye earth"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("goodbye earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(456L,3L,"goodbye mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("goodbye earth",s.get(Record.class,123L).message);
-            assertEquals("goodbye mars",s.get(Record.class,456L).message);
-        });
-    }
-    @Entity(name = "Record")
-    static class Record {
-        @Id Long id;
-        @Version Long version;
-        String message;
+	@Test void test(SessionFactoryScope scope) {
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,null,"hello earth"));
+			s.upsert(new Record(456L,2L,"hello mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals("hello earth",s.get(Record.class,123L).message);
+			assertEquals("hello mars",s.get(Record.class,456L).message);
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,0L,"goodbye earth"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals("goodbye earth",s.get(Record.class,123L).message);
+			assertEquals("hello mars",s.get(Record.class,456L).message);
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(456L,3L,"goodbye mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals("goodbye earth",s.get(Record.class,123L).message);
+			assertEquals("goodbye mars",s.get(Record.class,456L).message);
+		});
+	}
+	@Entity(name = "Record")
+	static class Record {
+		@Id Long id;
+		@Version Long version;
+		String message;
 
-        Record(Long id, Long version, String message) {
-            this.id = id;
-            this.version = version;
-            this.message = message;
-        }
+		Record(Long id, Long version, String message) {
+			this.id = id;
+			this.version = version;
+			this.message = message;
+		}
 
-        Record() {
-        }
-    }
+		Record() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java
index a654052b8e67..606bc28f0daf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java
index 4ca230ec58b9..272214834bcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Resource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Resource.java
index d6bca9eb37a0..e8c79f40e44c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Resource.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Resource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java
index ff8002bed4db..3811e99466ad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Task.java
index 0e8875eb183a..1382ed473bd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Task.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Task.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 import java.util.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/TestingNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/TestingNamingStrategy.java
index 175926f8bad8..5d1abbe3bf09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/TestingNamingStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/TestingNamingStrategy.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stateless.fetching;
 
 import java.util.Locale;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/User.java
index 3abf2f583bd5..bd617c5f9480 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java
index e8204325b5a2..a039ce0cb89b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.fetching;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/Message.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/Message.java
index 8361a54fc891..786a1e7af538 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/Message.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/Message.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.insert;
 
@@ -11,31 +9,31 @@
  */
 public class Message {
 
-    private String id;
-    private String subject;
-    private String content;
+	private String id;
+	private String subject;
+	private String content;
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(String id) {
-        this.id = id;
-    }
+	public void setId(String id) {
+		this.id = id;
+	}
 
-    public String getSubject() {
-        return subject;
-    }
+	public String getSubject() {
+		return subject;
+	}
 
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
+	public void setSubject(String subject) {
+		this.subject = subject;
+	}
 
-    public String getContent() {
-        return content;
-    }
+	public String getContent() {
+		return content;
+	}
 
-    public void setContent(String content) {
-        this.content = content;
-    }
+	public void setContent(String content) {
+		this.content = content;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/MessageRecipient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/MessageRecipient.java
index ae3db75b8bbc..e6e839201a8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/MessageRecipient.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/MessageRecipient.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.insert;
 
@@ -11,31 +9,31 @@
  */
 public class MessageRecipient {
 
-    private String id;
-    private String email;
-    private Message message;
+	private String id;
+	private String email;
+	private Message message;
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(String id) {
-        this.id = id;
-    }
+	public void setId(String id) {
+		this.id = id;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    public Message getMessage() {
-        return message;
-    }
+	public Message getMessage() {
+		return message;
+	}
 
-    public void setMessage(Message message) {
-        this.message = message;
-    }
+	public void setMessage(Message message) {
+		this.message = message;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java
index 034fb9c07224..81363e2740f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stateless.insert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Continent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Continent.java
index 62cdfe0fbc33..8dee4647a15d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Continent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Continent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Continent.java 6736 2005-05-09 16:09:38Z epbernard $
 package org.hibernate.orm.test.stats;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Country.java
index 5d4545fcb5d9..4210dc9adf9f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Country.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Country.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Country.java 6736 2005-05-09 16:09:38Z epbernard $
 package org.hibernate.orm.test.stats;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/CriteriaStatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/CriteriaStatTest.java
index b3aa558d4797..2c41c168758e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/CriteriaStatTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/CriteriaStatTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/ExplicitQueryStatsMaxSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/ExplicitQueryStatsMaxSizeTest.java
index d88bf4a108d1..034ba574d37c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/ExplicitQueryStatsMaxSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/ExplicitQueryStatsMaxSizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Locality.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Locality.java
index 406c83ef0f39..fe69c34dca27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Locality.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Locality.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Province.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Province.java
index 5e8c2db38e1c..a95610979834 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Province.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/Province.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/QueryStatsMaxSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/QueryStatsMaxSizeTest.java
index 1a305c82e8f0..edcda6f1def3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/QueryStatsMaxSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/QueryStatsMaxSizeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/SessionStatsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/SessionStatsTest.java
index 9c46dbf782bd..5245ecef1439 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/SessionStatsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/SessionStatsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/State.java
index fd11ead660a3..0fd62c78521d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/State.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java
index b0e10351c328..aa432a90d590 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
 import org.hibernate.cache.internal.NoCachingRegionFactory;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java
index 11d4cb218c02..b3346dd15d58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java
index 97d8dc721ccf..14fba5a862a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stats;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/DefaultDialectSelectorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/DefaultDialectSelectorTest.java
index 2eea0df037b5..805a1ccaebc3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/DefaultDialectSelectorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/DefaultDialectSelectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.strategyselectors;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java
index b9ea2c29d674..21b5684f1ac0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.strategyselectors;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java
index 90ad4cea5acc..86484b35948c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stream;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/KeyToOneCollectionFetchScrollTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/KeyToOneCollectionFetchScrollTest.java
index a6b997c64d11..3aefd608ed11 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/KeyToOneCollectionFetchScrollTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/KeyToOneCollectionFetchScrollTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stream;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java
index a27a1a26b5f1..47c30628db27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.stream;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NestedCollectionFetchStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NestedCollectionFetchStreamTest.java
index 3c83a14b5156..718b5fd3d29f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NestedCollectionFetchStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NestedCollectionFetchStreamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stream;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java
index 1d1327a45014..2c540556b463 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stream.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java
index b5cd7c5c56e1..d4a1236cd0d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.stream.basic;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Doctor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Doctor.java
index 1219c32a340c..82218da7181a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Doctor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Doctor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassProxyInterface;
 
@@ -18,7 +16,7 @@ public Doctor(String name) {
 		super( name );
 	}
 
-    public String operate() {
-        return "Dr. " + getName() + " is in";
-    }
+	public String operate() {
+		return "Dr. " + getName() + " is in";
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/IDoctor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/IDoctor.java
index 7ebfffd10338..e9bc929ed3cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/IDoctor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/IDoctor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassProxyInterface;
 
@@ -11,5 +9,5 @@
  * @author Steve Ebersole
  */
 public interface IDoctor {
-    String operate();
+	String operate();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Person.java
index e8dfbb397447..1e2ff4347f88 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassProxyInterface;
 
@@ -11,8 +9,8 @@
  * @author Steve Ebersole
  */
 public class Person {
-    private Long id;
-    private String name;
+	private Long id;
+	private String name;
 
 	public Person() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/SubclassProxyInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/SubclassProxyInterfaceTest.java
index 15d975d8eb69..39cb14cc56f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/SubclassProxyInterfaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassProxyInterface/SubclassProxyInterfaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassProxyInterface;
 
@@ -21,7 +19,7 @@
 public class SubclassProxyInterfaceTest {
 	@Test
 	public void testSubclassProxyInterfaces() {
-        final Configuration cfg = new Configuration()
+		final Configuration cfg = new Configuration()
 				.setProperty( Environment.DIALECT, H2Dialect.class )
 				.addClass( Person.class );
 		try (ServiceRegistry serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ) ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Customer.java
index 3cf19793a596..0e5cef3c20ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Customer.java 5899 2005-02-24 20:08:04Z steveebersole $
 package org.hibernate.orm.test.subclassfilter;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java
index 623604f7ee9b..2575a2393f42 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassfilter;
 
@@ -52,7 +50,7 @@ public void testFiltersWithSubclass(SessionFactoryScope scope) {
 					s.clear();
 
 					results = new ArrayList( new HashSet( s.createQuery( "from Person as p left join fetch p.minions" )
-																  .list() ) );
+																.list() ) );
 					assertEquals( 4, results.size(), "Incorrect qry result count" );
 					itr = results.iterator();
 					while ( itr.hasNext() ) {
@@ -67,7 +65,7 @@ public void testFiltersWithSubclass(SessionFactoryScope scope) {
 					s.clear();
 
 					results = new ArrayList( new HashSet( s.createQuery( "from Employee as p left join fetch p.minions" )
-																  .list() ) );
+																.list() ) );
 					assertEquals( 2, results.size(), "Incorrect qry result count" );
 					itr = results.iterator();
 					while ( itr.hasNext() ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Employee.java
index a55d9668fdcc..659512ff2f21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Employee.java 5899 2005-02-24 20:08:04Z steveebersole $
 package org.hibernate.orm.test.subclassfilter;
 import jakarta.persistence.Column;
 import java.util.HashSet;
@@ -18,7 +14,7 @@
  */
 public class Employee extends Person {
 	@Column(name="`title`")
-    private String title;
+	private String title;
 	private String department;
 	private Employee manager;
 	private Set minions = new HashSet();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java
index d7de97b1e235..f898318f5534 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassfilter;
 
@@ -17,9 +15,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.orm.test.subclassfilter.Customer;
-import org.hibernate.orm.test.subclassfilter.Employee;
-import org.hibernate.orm.test.subclassfilter.Person;
 
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Person.java
index a9d5343fe81d..ad6b8b3a98c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Person.java 5899 2005-02-24 20:08:04Z steveebersole $
 package org.hibernate.orm.test.subclassfilter;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java
index 186f80fa8fb5..bec046e67f21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subclassfilter;
 
@@ -52,7 +50,7 @@ public void testFiltersWithUnionSubclass(SessionFactoryScope scope) {
 					s.clear();
 
 					results = new ArrayList( new HashSet( s.createQuery( "from Person as p left join fetch p.minions" )
-																  .list() ) );
+																.list() ) );
 					assertEquals( 4, results.size(), "Incorrect qry result count" );
 					itr = results.iterator();
 					while ( itr.hasNext() ) {
@@ -67,7 +65,7 @@ public void testFiltersWithUnionSubclass(SessionFactoryScope scope) {
 					s.clear();
 
 					results = new ArrayList( new HashSet( s.createQuery( "from Employee as p left join fetch p.minions" )
-																  .list() ) );
+																.list() ) );
 					assertEquals( 2, results.size(), "Incorrect qry result count" );
 					itr = results.iterator();
 					while ( itr.hasNext() ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/EntityA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/EntityA.java
index 40e870dcc11f..dc96047ab995 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/EntityA.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/EntityA.java
@@ -1,44 +1,39 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.subquery;
 
 import jakarta.persistence.*;
 
 @Entity
 public class EntityA {
-    @Id
-    @Column(name = "id", nullable = false)
-    private int id;
-    private String name;
-
-    public EntityA() {
-    }
-
-    public EntityA(int id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
+	@Id
+	@Column(name = "id", nullable = false)
+	private int id;
+	private String name;
+
+	public EntityA() {
+	}
+
+	public EntityA(int id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java
index 731b47d2f64b..26c4ba4509b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id$
-
 package org.hibernate.orm.test.subquery;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Alien.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Alien.java
index 4d0644e506a2..0a0c1d488421 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Alien.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Alien.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Alien.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.subselect;
 
 
@@ -18,7 +14,7 @@ public class Alien {
 	private String planet;
 	private String species;
 	private double heightInches;
-	
+
 	public void setIdentity(String identity) {
 		this.identity = identity;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Author.java
index 431ef15ddae7..9ed3ddf85cda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Author.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Author.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Being.java
index c32c8081d5c8..66f935c40a10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Being.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Being.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.subselect;
 
 
@@ -17,8 +13,8 @@ public class Being {
 	private String identity;
 	private String location;
 	private String species;
-	private double heightInches;	
-	
+	private double heightInches;
+
 	public void setLocation(String location) {
 		this.location = location;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Book.java
index f329df43760d..a3f8671d0d78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Book.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java
index eb2c6905c524..6e7824ca394c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Employee.java
index 21d3463a6ac7..7aa87791e8b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroup.java
index 830fec9dbc0f..1643a6482ead 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroup.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroupId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroupId.java
index 538b2193e46e..4da8d5756c4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroupId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/EmployeeGroupId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Human.java
index a9396a82e1a4..62b7d19cebe5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/Human.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Human.java 7203 2005-06-19 02:01:05Z oneovthafew $
 package org.hibernate.orm.test.subselect;
 
 
@@ -18,7 +14,7 @@ public class Human {
 	private char sex;
 	private String address;
 	private double heightInches;
-	
+
 	public void setAddress(String address) {
 		this.address = address;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java
index ee73b8b1379b..bab2a42408bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAndSingleAttributeIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAndSingleAttributeIdClassTest.java
index 50b8f8540889..ad916556ce03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAndSingleAttributeIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAndSingleAttributeIdClassTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.subselect;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
index d5750e67df51..7e8b7d17339c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java
index 4ccc4773cc00..fb685271f3a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.subselect.join;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
index 55aea3d2613b..a42657b4be95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
index ae089f5d4f15..e3e8ce2b4bfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java
index c492b4c8d2b5..cf1f73221210 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java
index 8941ec12270b..9fa8c1bafc6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java
index 7b74a5df330c..cf7b9dec96cd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
@@ -69,7 +67,7 @@ public void testTimeAsDate(SessionFactoryScope scope) {
 
 		final String queryString;
 
-        if ( SQLServerDialect.class.isAssignableFrom( scope.getSessionFactory().getJdbcServices().getDialect().getClass() ) ) {
+		if ( SQLServerDialect.class.isAssignableFrom( scope.getSessionFactory().getJdbcServices().getDialect().getClass() ) ) {
 			queryString = "from TimePropertyTest$Entity where tAsDate = cast ( ?1 as time )";
 		}
 		else {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
index f16c9b55c2f4..a00f7f8d4337 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.temporal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Account.java
index ad7a89679e5f..3172060bfdf7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantid;
 
@@ -16,16 +14,15 @@
 @Entity
 public class Account {
 
-    @Id @GeneratedValue Long id;
+	@Id @GeneratedValue Long id;
 
-    @TenantId String tenantId;
+	@TenantId String tenantId;
 
-    @ManyToOne(optional = false) Client client;
+	@ManyToOne(optional = false) Client client;
 
-    public Account(Client client) {
-        this.client = client;
-    }
+	public Account(Client client) {
+		this.client = client;
+	}
 
-    Account() {}
+	Account() {}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Client.java
index a25d33716834..25f9cd973d95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantid;
 
@@ -17,21 +15,21 @@
 
 @Entity
 public class Client {
-    @Id
-    @GeneratedValue
-    Long id;
+	@Id
+	@GeneratedValue
+	Long id;
 
-    String name;
+	String name;
 
-    @TenantId
-    String tenantId;
+	@TenantId
+	String tenantId;
 
-    @OneToMany(mappedBy = "client")
-    Set accounts = new HashSet<>();
+	@OneToMany(mappedBy = "client")
+	Set accounts = new HashSet<>();
 
-    public Client(String name) {
-        this.name = name;
-    }
+	public Client(String name) {
+		this.name = name;
+	}
 
-    Client() {}
+	Client() {}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Record.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Record.java
index 479ecbebcf7f..51eaa29c397a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Record.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/Record.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.tenantid;
 
 import jakarta.persistence.Entity;
@@ -6,7 +10,7 @@
 
 @Entity
 public class Record {
-    @Id @GeneratedValue
-    public Long id;
-    public State state = new State();
+	@Id @GeneratedValue
+	public Long id;
+	public State state = new State();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/State.java
index 589dff6ac193..a6d99067dddf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/State.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/State.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.tenantid;
 
 import jakarta.persistence.Embeddable;
@@ -8,7 +12,7 @@
 
 @Embeddable
 public class State {
-    public boolean deleted;
-    public @TenantId String tenantId;
-    public @UpdateTimestamp Instant updated;
+	public boolean deleted;
+	public @TenantId String tenantId;
+	public @UpdateTimestamp Instant updated;
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java
index d7db5d26b4fc..e38eacb8af6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantid;
 
@@ -56,301 +54,301 @@
 @SessionFactory
 @DomainModel(annotatedClasses = { Account.class, Client.class, Record.class })
 @ServiceRegistry(
-        settings = {
-                @Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
-        },
-        settingProviders = @SettingProvider(settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME, provider = MutableClockSettingProvider.class)
+		settings = {
+				@Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
+		},
+		settingProviders = @SettingProvider(settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME, provider = MutableClockSettingProvider.class)
 )
 public class TenantIdTest implements SessionFactoryProducer {
 
-    String currentTenant;
-    MutableClock clock;
-
-    @BeforeEach
-    public void setup(SessionFactoryScope scope) {
-        clock = CurrentTimestampGeneration.getClock( scope.getSessionFactory() );
-        clock.reset();
-    }
-
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        // Use the root tenant to clean up all partitions
-        currentTenant = "root";
-        scope.inTransaction(
-                session -> {
-                    session.createMutationQuery( "delete from Account" ).executeUpdate();
-                    session.createMutationQuery( "delete from Client" ).executeUpdate();
-                    session.createMutationQuery( "delete from Record" ).executeUpdate();
-                }
-        );
-    }
-
-    @Override
-    public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
-        final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
-        sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
-            @Override
-            public String resolveCurrentTenantIdentifier() {
-                return currentTenant;
-            }
-            @Override
-            public boolean validateExistingCurrentSessions() {
-                return false;
-            }
-
-            @Override
-            public boolean isRoot(String tenantId) {
-                return "root".equals( tenantId );
-            }
-        } );
-        return (SessionFactoryImplementor) sessionFactoryBuilder.build();
-    }
-
-    @Test
-    public void test(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-        } );
-        scope.inTransaction( session -> {
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
-        } );
-        assertEquals("mine", acc.tenantId);
-
-        currentTenant = "yours";
-        scope.inTransaction( session -> {
-            //HHH-16830 Sessions applies tenantId filter on find()
-            assertNull( session.find(Account.class, acc.id) );
-            assertEquals( 0, session.createQuery("from Account", Account.class).getResultList().size() );
-            session.disableFilter(TenantIdBinder.FILTER_NAME);
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
-        } );
-    }
-
-    @Test
-    public void testRoot(SessionFactoryScope scope) {
-        currentTenant = "root";
-        scope.inTransaction( session -> {
-            assertEquals( 0, session.createQuery( "from Account", Account.class ).getResultList().size() );
-        } );
-
-        currentTenant = "mine";
-        Client client = new Client( "Gavin" );
-        Account acc = new Account( client );
-        scope.inTransaction( session -> {
-            session.persist( client );
-            session.persist( acc );
-        } );
-        assertEquals( "mine", acc.tenantId );
-        scope.inTransaction( session -> {
-            assertNotNull( session.find( Account.class, acc.id ) );
-            assertEquals( 1, session.createQuery( "from Account", Account.class ).getResultList().size() );
-        } );
-
-        currentTenant = "root";
-        // Root tenants should find entities from other tenants
-        scope.inTransaction( session -> {
-            assertNotNull( session.find( Account.class, acc.id ) );
-            assertEquals( 1, session.createQuery( "from Account", Account.class ).getResultList().size() );
-        } );
-
-        // Root tenants should find entities from their own tenant
-        Client rootClient = new Client( "Sacha" );
-        Account rootAcc = new Account( rootClient );
-        scope.inTransaction( session -> {
-            session.persist( rootClient );
-            session.persist( rootAcc );
-        } );
-        assertEquals( "root", rootAcc.tenantId );
-        scope.inTransaction( session -> {
-            assertNotNull( session.find( Account.class, rootAcc.id ) );
-            assertEquals( 2, session.createQuery( "from Account", Account.class ).getResultList().size() );
-        } );
-    }
-
-    @Test
-    public void testErrorOnInsert(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        acc.tenantId = "yours";
-        try {
-            scope.inTransaction( session -> {
-                session.persist(client);
-                session.persist(acc);
-            } );
-            fail("should have thrown");
-        }
-        catch (Throwable e) {
-            assertTrue( e instanceof PropertyValueException );
-        }
-    }
-
-    @Test
-    public void testErrorOnUpdate(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-            acc.tenantId = "yours";
-            client.tenantId = "yours";
-            client.name = "Steve";
-        } );
-        //TODO: it would be better if this were an error
-        scope.inTransaction( session -> {
-            Account account = session.find(Account.class, acc.id);
-            assertNotNull(account);
-            assertEquals( "mine", acc.tenantId );
-            assertEquals( "Steve", acc.client.name );
-            assertEquals( "mine", acc.client.tenantId );
-        } );
-    }
-
-    @Test
-    @SkipForDialect(dialectClass = SybaseASEDialect.class,
-            reason = "low timestamp precision on Sybase")
-    public void testEmbeddedTenantId(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Record record = new Record();
-        scope.inTransaction( s -> s.persist( record ) );
-        assertEquals( "mine", record.state.tenantId );
-        assertNotNull( record.state.updated );
-
-        clock.tick();
-
-        scope.inTransaction( s -> {
-            Record r = s.find( Record.class, record.id );
-            assertEquals( "mine", r.state.tenantId );
-            assertEquals( record.state.updated, r.state.updated );
-            assertEquals( false, r.state.deleted );
-            r.state.deleted = true;
-        } );
-        scope.inTransaction( s -> {
-            Record r = s.find( Record.class, record.id );
-            assertEquals( "mine", r.state.tenantId );
-            assertNotEquals( record.state.updated, r.state.updated );
-            assertEquals( true, r.state.deleted );
-        } );
-    }
-
-    @Test
-    public void testEntityManagerHint(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Record record = new Record();
-        scope.inTransaction( s -> s.persist( record ) );
-        assertEquals( "mine", record.state.tenantId );
-        assertNotNull( record.state.updated );
-
-        currentTenant = "yours";
-        Record record2 = new Record();
-        scope.inTransaction( s -> s.persist( record2 ) );
-        assertEquals( "yours", record2.state.tenantId );
-        assertNotNull( record2.state.updated );
-
-        currentTenant = null;
-        final EntityManagerFactory emf = scope.getSessionFactory();
-        try (EntityManager em = emf.createEntityManager( toMap( HINT_TENANT_ID, "mine" ) ) ) {
-            Record r = em.find( Record.class, record.id );
-            assertEquals( "mine", r.state.tenantId );
-
-            // HHH-16830 Session applies tenant-id on #find
-            Record yours = em.find( Record.class, record2.id );
-            assertNull(yours);
-
-
-            em.createQuery( "from Record where id = :id", Record.class )
-                    .setParameter( "id", record.id )
-                    .getSingleResult();
-            assertEquals( "mine", r.state.tenantId );
-
-            // However, Session does seem to apply tenant-id on queries
-            try {
-                em.createQuery( "from Record where id = :id", Record.class )
-                        .setParameter( "id", record2.id )
-                        .getSingleResult();
-                fail( "Expecting an exception" );
-            }
-            catch (Exception expected) {
-            }
-        }
-        catch (RuntimeException e) {
-            currentTenant = "yours";
-            scope.inTransaction( (s) -> s.createMutationQuery( "delete Record" ) );
-
-            throw e;
-        }
-        finally {
-            // for cleanup
-            currentTenant = "mine";
-        }
-    }
-
-
-    @Test
-    public void tenantFilterWithStatelessSession(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        Record myRecord1 = new Record();
-        Record myRecord2 = new Record();
-
-        scope.inTransaction( session -> {
-            session.persist(myRecord1);
-            session.persist(myRecord2);
-        } );
-        scope.inStatelessTransaction( session -> {
-            assertThat( listAllRecordsForTenant( session ) ).hasSize( 2 );
-        } );
-
-        currentTenant = "yours";
-        scope.inStatelessTransaction( session -> {
-            assertThat( listAllRecordsForTenant( session ) ).isEmpty();
-        } );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-17972")
-    public void testChangeTenantId(SessionFactoryScope scope) {
-        currentTenant = "mine";
-        scope.inSession(
-                session -> {
-                    Query sessionQuery = session.createQuery( "from Client", Client.class );
-
-                    Transaction t = session.beginTransaction();
-                    session.persist( new Client("Gavin") );
-                    t.commit();
-                    assertEquals(1, sessionQuery.getResultList().size() );
-                    assertEquals( "mine", sessionQuery.getResultList().get( 0 ).tenantId );
-
-                    Session newSession = session.sessionWithOptions().tenantIdentifier( "yours" ).connection().openSession();
-                    Query newSessionQuery = newSession.createQuery( "from Client", Client.class );
-                    t = newSession.beginTransaction();
-                    newSession.persist( new Client("Jan") );
-                    t.commit();
-
-                    assertEquals(1, newSessionQuery.getResultList().size() );
-                    assertEquals( "yours", newSessionQuery.getResultList().get( 0 ).tenantId );
-
-                    session.disableFilter( TenantIdBinder.FILTER_NAME );
-                    assertEquals(2, sessionQuery.getResultList().size() );
-
-                    newSession.disableFilter( TenantIdBinder.FILTER_NAME );
-                    assertEquals(2, newSessionQuery.getResultList().size() );
-
-                    newSession.close();
-                }
-        );
-    }
-
-    private static List listAllRecordsForTenant(StatelessSession session) {
-        HibernateCriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
-        JpaCriteriaQuery criteriaQuery = criteriaBuilder.createQuery( Record.class );
-        JpaRoot from = criteriaQuery.from( Record.class );
-        return session.createQuery( criteriaQuery ).getResultList();
-    }
+	String currentTenant;
+	MutableClock clock;
+
+	@BeforeEach
+	public void setup(SessionFactoryScope scope) {
+		clock = CurrentTimestampGeneration.getClock( scope.getSessionFactory() );
+		clock.reset();
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		// Use the root tenant to clean up all partitions
+		currentTenant = "root";
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Account" ).executeUpdate();
+					session.createMutationQuery( "delete from Client" ).executeUpdate();
+					session.createMutationQuery( "delete from Record" ).executeUpdate();
+				}
+		);
+	}
+
+	@Override
+	public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
+		final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
+		sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
+			@Override
+			public String resolveCurrentTenantIdentifier() {
+				return currentTenant;
+			}
+			@Override
+			public boolean validateExistingCurrentSessions() {
+				return false;
+			}
+
+			@Override
+			public boolean isRoot(String tenantId) {
+				return "root".equals( tenantId );
+			}
+		} );
+		return (SessionFactoryImplementor) sessionFactoryBuilder.build();
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+		} );
+		scope.inTransaction( session -> {
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
+		} );
+		assertEquals("mine", acc.tenantId);
+
+		currentTenant = "yours";
+		scope.inTransaction( session -> {
+			//HHH-16830 Sessions applies tenantId filter on find()
+			assertNull( session.find(Account.class, acc.id) );
+			assertEquals( 0, session.createQuery("from Account", Account.class).getResultList().size() );
+			session.disableFilter(TenantIdBinder.FILTER_NAME);
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
+		} );
+	}
+
+	@Test
+	public void testRoot(SessionFactoryScope scope) {
+		currentTenant = "root";
+		scope.inTransaction( session -> {
+			assertEquals( 0, session.createQuery( "from Account", Account.class ).getResultList().size() );
+		} );
+
+		currentTenant = "mine";
+		Client client = new Client( "Gavin" );
+		Account acc = new Account( client );
+		scope.inTransaction( session -> {
+			session.persist( client );
+			session.persist( acc );
+		} );
+		assertEquals( "mine", acc.tenantId );
+		scope.inTransaction( session -> {
+			assertNotNull( session.find( Account.class, acc.id ) );
+			assertEquals( 1, session.createQuery( "from Account", Account.class ).getResultList().size() );
+		} );
+
+		currentTenant = "root";
+		// Root tenants should find entities from other tenants
+		scope.inTransaction( session -> {
+			assertNotNull( session.find( Account.class, acc.id ) );
+			assertEquals( 1, session.createQuery( "from Account", Account.class ).getResultList().size() );
+		} );
+
+		// Root tenants should find entities from their own tenant
+		Client rootClient = new Client( "Sacha" );
+		Account rootAcc = new Account( rootClient );
+		scope.inTransaction( session -> {
+			session.persist( rootClient );
+			session.persist( rootAcc );
+		} );
+		assertEquals( "root", rootAcc.tenantId );
+		scope.inTransaction( session -> {
+			assertNotNull( session.find( Account.class, rootAcc.id ) );
+			assertEquals( 2, session.createQuery( "from Account", Account.class ).getResultList().size() );
+		} );
+	}
+
+	@Test
+	public void testErrorOnInsert(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		acc.tenantId = "yours";
+		try {
+			scope.inTransaction( session -> {
+				session.persist(client);
+				session.persist(acc);
+			} );
+			fail("should have thrown");
+		}
+		catch (Throwable e) {
+			assertTrue( e instanceof PropertyValueException );
+		}
+	}
+
+	@Test
+	public void testErrorOnUpdate(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+			acc.tenantId = "yours";
+			client.tenantId = "yours";
+			client.name = "Steve";
+		} );
+		//TODO: it would be better if this were an error
+		scope.inTransaction( session -> {
+			Account account = session.find(Account.class, acc.id);
+			assertNotNull(account);
+			assertEquals( "mine", acc.tenantId );
+			assertEquals( "Steve", acc.client.name );
+			assertEquals( "mine", acc.client.tenantId );
+		} );
+	}
+
+	@Test
+	@SkipForDialect(dialectClass = SybaseASEDialect.class,
+			reason = "low timestamp precision on Sybase")
+	public void testEmbeddedTenantId(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Record record = new Record();
+		scope.inTransaction( s -> s.persist( record ) );
+		assertEquals( "mine", record.state.tenantId );
+		assertNotNull( record.state.updated );
+
+		clock.tick();
+
+		scope.inTransaction( s -> {
+			Record r = s.find( Record.class, record.id );
+			assertEquals( "mine", r.state.tenantId );
+			assertEquals( record.state.updated, r.state.updated );
+			assertEquals( false, r.state.deleted );
+			r.state.deleted = true;
+		} );
+		scope.inTransaction( s -> {
+			Record r = s.find( Record.class, record.id );
+			assertEquals( "mine", r.state.tenantId );
+			assertNotEquals( record.state.updated, r.state.updated );
+			assertEquals( true, r.state.deleted );
+		} );
+	}
+
+	@Test
+	public void testEntityManagerHint(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Record record = new Record();
+		scope.inTransaction( s -> s.persist( record ) );
+		assertEquals( "mine", record.state.tenantId );
+		assertNotNull( record.state.updated );
+
+		currentTenant = "yours";
+		Record record2 = new Record();
+		scope.inTransaction( s -> s.persist( record2 ) );
+		assertEquals( "yours", record2.state.tenantId );
+		assertNotNull( record2.state.updated );
+
+		currentTenant = null;
+		final EntityManagerFactory emf = scope.getSessionFactory();
+		try (EntityManager em = emf.createEntityManager( toMap( HINT_TENANT_ID, "mine" ) ) ) {
+			Record r = em.find( Record.class, record.id );
+			assertEquals( "mine", r.state.tenantId );
+
+			// HHH-16830 Session applies tenant-id on #find
+			Record yours = em.find( Record.class, record2.id );
+			assertNull(yours);
+
+
+			em.createQuery( "from Record where id = :id", Record.class )
+					.setParameter( "id", record.id )
+					.getSingleResult();
+			assertEquals( "mine", r.state.tenantId );
+
+			// However, Session does seem to apply tenant-id on queries
+			try {
+				em.createQuery( "from Record where id = :id", Record.class )
+						.setParameter( "id", record2.id )
+						.getSingleResult();
+				fail( "Expecting an exception" );
+			}
+			catch (Exception expected) {
+			}
+		}
+		catch (RuntimeException e) {
+			currentTenant = "yours";
+			scope.inTransaction( (s) -> s.createMutationQuery( "delete Record" ) );
+
+			throw e;
+		}
+		finally {
+			// for cleanup
+			currentTenant = "mine";
+		}
+	}
+
+
+	@Test
+	public void tenantFilterWithStatelessSession(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		Record myRecord1 = new Record();
+		Record myRecord2 = new Record();
+
+		scope.inTransaction( session -> {
+			session.persist(myRecord1);
+			session.persist(myRecord2);
+		} );
+		scope.inStatelessTransaction( session -> {
+			assertThat( listAllRecordsForTenant( session ) ).hasSize( 2 );
+		} );
+
+		currentTenant = "yours";
+		scope.inStatelessTransaction( session -> {
+			assertThat( listAllRecordsForTenant( session ) ).isEmpty();
+		} );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-17972")
+	public void testChangeTenantId(SessionFactoryScope scope) {
+		currentTenant = "mine";
+		scope.inSession(
+				session -> {
+					Query sessionQuery = session.createQuery( "from Client", Client.class );
+
+					Transaction t = session.beginTransaction();
+					session.persist( new Client("Gavin") );
+					t.commit();
+					assertEquals(1, sessionQuery.getResultList().size() );
+					assertEquals( "mine", sessionQuery.getResultList().get( 0 ).tenantId );
+
+					Session newSession = session.sessionWithOptions().tenantIdentifier( "yours" ).connection().openSession();
+					Query newSessionQuery = newSession.createQuery( "from Client", Client.class );
+					t = newSession.beginTransaction();
+					newSession.persist( new Client("Jan") );
+					t.commit();
+
+					assertEquals(1, newSessionQuery.getResultList().size() );
+					assertEquals( "yours", newSessionQuery.getResultList().get( 0 ).tenantId );
+
+					session.disableFilter( TenantIdBinder.FILTER_NAME );
+					assertEquals(2, sessionQuery.getResultList().size() );
+
+					newSession.disableFilter( TenantIdBinder.FILTER_NAME );
+					assertEquals(2, newSessionQuery.getResultList().size() );
+
+					newSession.close();
+				}
+		);
+	}
+
+	private static List listAllRecordsForTenant(StatelessSession session) {
+		HibernateCriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
+		JpaCriteriaQuery criteriaQuery = criteriaBuilder.createQuery( Record.class );
+		JpaRoot from = criteriaQuery.from( Record.class );
+		return session.createQuery( criteriaQuery ).getResultList();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Account.java
index a4cec927c82a..74ef41ab96da 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Account.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.tenantidpk;
 
 import jakarta.persistence.Entity;
@@ -12,16 +16,16 @@
 @Entity @IdClass(TenantizedId.class)
 public class Account {
 
-    @Id @GeneratedValue Long id;
+	@Id @GeneratedValue Long id;
 
-    @Id @TenantId UUID tenantId;
+	@Id @TenantId UUID tenantId;
 
-    @ManyToOne(optional = false)
-    Client client;
+	@ManyToOne(optional = false)
+	Client client;
 
-    public Account(Client client) {
-        this.client = client;
-    }
+	public Account(Client client) {
+		this.client = client;
+	}
 
-    Account() {}
+	Account() {}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Client.java
index 926c3bee9c75..4b7d3a17b8d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantidpk;
 
@@ -18,21 +16,21 @@
 
 @Entity
 public class Client {
-    @Id
-    @GeneratedValue
-    Long id;
+	@Id
+	@GeneratedValue
+	Long id;
 
-    String name;
+	String name;
 
-    @Id @TenantId
-    UUID tenantId;
+	@Id @TenantId
+	UUID tenantId;
 
-    @OneToMany(mappedBy = "client")
-    Set accounts = new HashSet<>();
+	@OneToMany(mappedBy = "client")
+	Set accounts = new HashSet<>();
 
-    public Client(String name) {
-        this.name = name;
-    }
+	public Client(String name) {
+		this.name = name;
+	}
 
-    Client() {}
-}
\ No newline at end of file
+	Client() {}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java
index 52592a73e84e..3d78b60184d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java
@@ -1,13 +1,9 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantidpk;
 
-import org.hibernate.PropertyValueException;
 import org.hibernate.binder.internal.TenantIdBinder;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
@@ -28,88 +24,87 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
 
 @SessionFactory
 @DomainModel(annotatedClasses = { Account.class, Client.class })
 @ServiceRegistry(
-        settings = {
-                @Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
-        }
+		settings = {
+				@Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
+		}
 )
 public class TenantPkTest implements SessionFactoryProducer {
 
-    private static final UUID mine = UUID.randomUUID();
-    private static final UUID yours = UUID.randomUUID();
+	private static final UUID mine = UUID.randomUUID();
+	private static final UUID yours = UUID.randomUUID();
 
-    UUID currentTenant;
+	UUID currentTenant;
 
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            session.createQuery("delete from Account").executeUpdate();
-            session.createQuery("delete from Client").executeUpdate();
-        });
-    }
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createQuery("delete from Account").executeUpdate();
+			session.createQuery("delete from Client").executeUpdate();
+		});
+	}
 
-    @Override
-    public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
-        final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
-        sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
-            @Override
-            public UUID resolveCurrentTenantIdentifier() {
-                return currentTenant;
-            }
-            @Override
-            public boolean validateExistingCurrentSessions() {
-                return false;
-            }
-        } );
-        return (SessionFactoryImplementor) sessionFactoryBuilder.build();
-    }
+	@Override
+	public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
+		final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
+		sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
+			@Override
+			public UUID resolveCurrentTenantIdentifier() {
+				return currentTenant;
+			}
+			@Override
+			public boolean validateExistingCurrentSessions() {
+				return false;
+			}
+		} );
+		return (SessionFactoryImplementor) sessionFactoryBuilder.build();
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-        } );
-        scope.inTransaction( session -> {
-            assertNotNull( session.createSelectionQuery("where id=?1", Account.class)
-                    .setParameter(1, acc.id)
-                    .getSingleResultOrNull() );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-        assertEquals(mine, acc.tenantId);
+	@Test
+	public void test(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+		} );
+		scope.inTransaction( session -> {
+			assertNotNull( session.createSelectionQuery("where id=?1", Account.class)
+					.setParameter(1, acc.id)
+					.getSingleResultOrNull() );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+		assertEquals(mine, acc.tenantId);
 
-        currentTenant = yours;
-        scope.inTransaction( session -> {
-            assertNull( session.createSelectionQuery("where id=?1", Account.class)
-                    .setParameter(1, acc.id)
-                    .getSingleResultOrNull() );
-            assertEquals( 0, session.createQuery("from Account").getResultList().size() );
-            session.disableFilter(TenantIdBinder.FILTER_NAME);
-            assertNotNull( session.createSelectionQuery("where id=?1", Account.class)
-                    .setParameter(1, acc.id)
-                    .getSingleResultOrNull() );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-    }
+		currentTenant = yours;
+		scope.inTransaction( session -> {
+			assertNull( session.createSelectionQuery("where id=?1", Account.class)
+					.setParameter(1, acc.id)
+					.getSingleResultOrNull() );
+			assertEquals( 0, session.createQuery("from Account").getResultList().size() );
+			session.disableFilter(TenantIdBinder.FILTER_NAME);
+			assertNotNull( session.createSelectionQuery("where id=?1", Account.class)
+					.setParameter(1, acc.id)
+					.getSingleResultOrNull() );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+	}
 
-    @Test
-    public void testErrorOnInsert(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        acc.tenantId = yours;
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-        } );
-        assertEquals( mine, acc.tenantId );
-        assertEquals( mine, client.tenantId );
-    }
+	@Test
+	public void testErrorOnInsert(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		acc.tenantId = yours;
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+		} );
+		assertEquals( mine, acc.tenantId );
+		assertEquals( mine, client.tenantId );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantizedId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantizedId.java
index dc0a82890de0..41be8c94bbf2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantizedId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantizedId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantidpk;
 
@@ -21,4 +19,4 @@ public TenantizedId(Long id, UUID tenantId) {
 	}
 
 	TenantizedId() {}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Account.java
index 88b827d37587..8a1123d92799 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantlongid;
 
@@ -15,17 +13,16 @@
 @Entity
 public class Account {
 
-    @Id @GeneratedValue Long id;
+	@Id @GeneratedValue Long id;
 
-    @TenantId Long tenantId;
+	@TenantId Long tenantId;
 
-    @ManyToOne(optional = false)
-    Client client;
+	@ManyToOne(optional = false)
+	Client client;
 
-    public Account(Client client) {
-        this.client = client;
-    }
+	public Account(Client client) {
+		this.client = client;
+	}
 
-    Account() {}
+	Account() {}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Client.java
index da18cadeeda9..f27391c6fcae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantlongid;
 
@@ -17,21 +15,21 @@
 
 @Entity
 public class Client {
-    @Id
-    @GeneratedValue
-    Long id;
+	@Id
+	@GeneratedValue
+	Long id;
 
-    String name;
+	String name;
 
-    @TenantId
-    Long tenantId;
+	@TenantId
+	Long tenantId;
 
-    @OneToMany(mappedBy = "client")
-    Set accounts = new HashSet<>();
+	@OneToMany(mappedBy = "client")
+	Set accounts = new HashSet<>();
 
-    public Client(String name) {
-        this.name = name;
-    }
+	public Client(String name) {
+		this.name = name;
+	}
 
-    Client() {}
+	Client() {}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java
index 0d98864d0d9a..10a05d593c62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantlongid;
 
@@ -27,104 +25,104 @@
 @SessionFactory
 @DomainModel(annotatedClasses = { Account.class, Client.class })
 @ServiceRegistry(
-        settings = {
-                @Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
-        }
+		settings = {
+				@Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
+		}
 )
 public class TenantLongIdTest implements SessionFactoryProducer {
 
-    private static final Long mine = 1L;
-    private static final Long yours = 2L;
+	private static final Long mine = 1L;
+	private static final Long yours = 2L;
 
-    Long currentTenant;
+	Long currentTenant;
 
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            session.createQuery("delete from Account").executeUpdate();
-            session.createQuery("delete from Client").executeUpdate();
-        });
-    }
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createQuery("delete from Account").executeUpdate();
+			session.createQuery("delete from Client").executeUpdate();
+		});
+	}
 
-    @Override
-    public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
-        final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
-        sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
-            @Override
-            public Long resolveCurrentTenantIdentifier() {
-                return currentTenant;
-            }
-            @Override
-            public boolean validateExistingCurrentSessions() {
-                return false;
-            }
-        } );
-        return (SessionFactoryImplementor) sessionFactoryBuilder.build();
-    }
+	@Override
+	public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
+		final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
+		sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
+			@Override
+			public Long resolveCurrentTenantIdentifier() {
+				return currentTenant;
+			}
+			@Override
+			public boolean validateExistingCurrentSessions() {
+				return false;
+			}
+		} );
+		return (SessionFactoryImplementor) sessionFactoryBuilder.build();
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-        } );
-        scope.inTransaction( session -> {
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-        assertEquals(mine, acc.tenantId);
+	@Test
+	public void test(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+		} );
+		scope.inTransaction( session -> {
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+		assertEquals(mine, acc.tenantId);
 
-        currentTenant = yours;
-        scope.inTransaction( session -> {
-            //HHH-16830 Sessions applies tenantId filter on find()
-            assertNull( session.find(Account.class, acc.id) );
-            assertEquals( 0, session.createQuery("from Account").getResultList().size() );
-            session.disableFilter(TenantIdBinder.FILTER_NAME);
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-    }
+		currentTenant = yours;
+		scope.inTransaction( session -> {
+			//HHH-16830 Sessions applies tenantId filter on find()
+			assertNull( session.find(Account.class, acc.id) );
+			assertEquals( 0, session.createQuery("from Account").getResultList().size() );
+			session.disableFilter(TenantIdBinder.FILTER_NAME);
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+	}
 
-    @Test
-    public void testErrorOnInsert(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        acc.tenantId = yours;
-        try {
-            scope.inTransaction( session -> {
-                session.persist(client);
-                session.persist(acc);
-            } );
-            fail("should have thrown");
-        }
-        catch (Throwable e) {
-            assertTrue( e instanceof PropertyValueException );
-        }
-    }
+	@Test
+	public void testErrorOnInsert(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		acc.tenantId = yours;
+		try {
+			scope.inTransaction( session -> {
+				session.persist(client);
+				session.persist(acc);
+			} );
+			fail("should have thrown");
+		}
+		catch (Throwable e) {
+			assertTrue( e instanceof PropertyValueException );
+		}
+	}
 
-    @Test
-    public void testErrorOnUpdate(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-            acc.tenantId = yours;
-            client.tenantId = yours;
-            client.name = "Steve";
-        } );
-        //TODO: it would be better if this were an error
-        scope.inTransaction( session -> {
-            Account account = session.find(Account.class, acc.id);
-            assertNotNull(account);
-            assertEquals( mine, acc.tenantId );
-            assertEquals( "Steve", acc.client.name );
-            assertEquals( mine, acc.client.tenantId );
-        } );
-    }
+	@Test
+	public void testErrorOnUpdate(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+			acc.tenantId = yours;
+			client.tenantId = yours;
+			client.name = "Steve";
+		} );
+		//TODO: it would be better if this were an error
+		scope.inTransaction( session -> {
+			Account account = session.find(Account.class, acc.id);
+			assertNotNull(account);
+			assertEquals( mine, acc.tenantId );
+			assertEquals( "Steve", acc.client.name );
+			assertEquals( mine, acc.client.tenantId );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Account.java
index fb32b1154980..62ddac9b9f5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantuuid;
 
@@ -17,17 +15,16 @@
 @Entity
 public class Account {
 
-    @Id @GeneratedValue Long id;
+	@Id @GeneratedValue Long id;
 
-    @TenantId UUID tenantId;
+	@TenantId UUID tenantId;
 
-    @ManyToOne(optional = false)
-    Client client;
+	@ManyToOne(optional = false)
+	Client client;
 
-    public Account(Client client) {
-        this.client = client;
-    }
+	public Account(Client client) {
+		this.client = client;
+	}
 
-    Account() {}
+	Account() {}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Client.java
index 7eeab1f352de..bf6ef961458e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/Client.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantuuid;
 
@@ -18,21 +16,21 @@
 
 @Entity
 public class Client {
-    @Id
-    @GeneratedValue
-    Long id;
+	@Id
+	@GeneratedValue
+	Long id;
 
-    String name;
+	String name;
 
-    @TenantId
-    UUID tenantId;
+	@TenantId
+	UUID tenantId;
 
-    @OneToMany(mappedBy = "client")
-    Set accounts = new HashSet<>();
+	@OneToMany(mappedBy = "client")
+	Set accounts = new HashSet<>();
 
-    public Client(String name) {
-        this.name = name;
-    }
+	public Client(String name) {
+		this.name = name;
+	}
 
-    Client() {}
+	Client() {}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java
index 377235ee00a6..a98ba8a9fe08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tenantuuid;
 
@@ -35,104 +33,104 @@
 @SessionFactory
 @DomainModel(annotatedClasses = { Account.class, Client.class })
 @ServiceRegistry(
-        settings = {
-                @Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
-        }
+		settings = {
+				@Setting(name = JAKARTA_HBM2DDL_DATABASE_ACTION, value = "create-drop")
+		}
 )
 public class TenantUuidTest implements SessionFactoryProducer {
 
-    private static final UUID mine = SafeRandomUUIDGenerator.safeRandomUUID();
-    private static final UUID yours = SafeRandomUUIDGenerator.safeRandomUUID();
+	private static final UUID mine = SafeRandomUUIDGenerator.safeRandomUUID();
+	private static final UUID yours = SafeRandomUUIDGenerator.safeRandomUUID();
 
-    UUID currentTenant;
+	UUID currentTenant;
 
-    @AfterEach
-    public void cleanup(SessionFactoryScope scope) {
-        scope.inTransaction( session -> {
-            session.createQuery("delete from Account").executeUpdate();
-            session.createQuery("delete from Client").executeUpdate();
-        });
-    }
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createQuery("delete from Account").executeUpdate();
+			session.createQuery("delete from Client").executeUpdate();
+		});
+	}
 
-    @Override
-    public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
-        final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
-        sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
-            @Override
-            public UUID resolveCurrentTenantIdentifier() {
-                return currentTenant;
-            }
-            @Override
-            public boolean validateExistingCurrentSessions() {
-                return false;
-            }
-        } );
-        return (SessionFactoryImplementor) sessionFactoryBuilder.build();
-    }
+	@Override
+	public SessionFactoryImplementor produceSessionFactory(MetadataImplementor model) {
+		final SessionFactoryBuilder sessionFactoryBuilder = model.getSessionFactoryBuilder();
+		sessionFactoryBuilder.applyCurrentTenantIdentifierResolver( new CurrentTenantIdentifierResolver() {
+			@Override
+			public UUID resolveCurrentTenantIdentifier() {
+				return currentTenant;
+			}
+			@Override
+			public boolean validateExistingCurrentSessions() {
+				return false;
+			}
+		} );
+		return (SessionFactoryImplementor) sessionFactoryBuilder.build();
+	}
 
-    @Test
-    public void test(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-        } );
-        scope.inTransaction( session -> {
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-        assertEquals(mine, acc.tenantId);
+	@Test
+	public void test(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+		} );
+		scope.inTransaction( session -> {
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+		assertEquals(mine, acc.tenantId);
 
-        currentTenant = yours;
-        scope.inTransaction( session -> {
-            //HHH-16830 Sessions applies tenantId filter on find()
-            assertNull( session.find(Account.class, acc.id) );
-            assertEquals( 0, session.createQuery("from Account").getResultList().size() );
-            session.disableFilter(TenantIdBinder.FILTER_NAME);
-            assertNotNull( session.find(Account.class, acc.id) );
-            assertEquals( 1, session.createQuery("from Account").getResultList().size() );
-        } );
-    }
+		currentTenant = yours;
+		scope.inTransaction( session -> {
+			//HHH-16830 Sessions applies tenantId filter on find()
+			assertNull( session.find(Account.class, acc.id) );
+			assertEquals( 0, session.createQuery("from Account").getResultList().size() );
+			session.disableFilter(TenantIdBinder.FILTER_NAME);
+			assertNotNull( session.find(Account.class, acc.id) );
+			assertEquals( 1, session.createQuery("from Account").getResultList().size() );
+		} );
+	}
 
-    @Test
-    public void testErrorOnInsert(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        acc.tenantId = yours;
-        try {
-            scope.inTransaction( session -> {
-                session.persist(client);
-                session.persist(acc);
-            } );
-            fail("should have thrown");
-        }
-        catch (Throwable e) {
-            assertTrue( e instanceof PropertyValueException );
-        }
-    }
+	@Test
+	public void testErrorOnInsert(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		acc.tenantId = yours;
+		try {
+			scope.inTransaction( session -> {
+				session.persist(client);
+				session.persist(acc);
+			} );
+			fail("should have thrown");
+		}
+		catch (Throwable e) {
+			assertTrue( e instanceof PropertyValueException );
+		}
+	}
 
-    @Test
-    public void testErrorOnUpdate(SessionFactoryScope scope) {
-        currentTenant = mine;
-        Client client = new Client("Gavin");
-        Account acc = new Account(client);
-        scope.inTransaction( session -> {
-            session.persist(client);
-            session.persist(acc);
-            acc.tenantId = yours;
-            client.tenantId = yours;
-            client.name = "Steve";
-        } );
-        //TODO: it would be better if this were an error
-        scope.inTransaction( session -> {
-            Account account = session.find(Account.class, acc.id);
-            assertNotNull(account);
-            assertEquals( mine, acc.tenantId );
-            assertEquals( "Steve", acc.client.name );
-            assertEquals( mine, acc.client.tenantId );
-        } );
-    }
+	@Test
+	public void testErrorOnUpdate(SessionFactoryScope scope) {
+		currentTenant = mine;
+		Client client = new Client("Gavin");
+		Account acc = new Account(client);
+		scope.inTransaction( session -> {
+			session.persist(client);
+			session.persist(acc);
+			acc.tenantId = yours;
+			client.tenantId = yours;
+			client.name = "Steve";
+		} );
+		//TODO: it would be better if this were an error
+		scope.inTransaction( session -> {
+			Account account = session.find(Account.class, acc.id);
+			assertNotNull(account);
+			assertEquals( mine, acc.tenantId );
+			assertEquals( "Steve", acc.client.name );
+			assertEquals( mine, acc.client.tenantId );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
index d953f9995c55..762db74d0c63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.ternary;
 import java.util.Date;
 import java.util.HashMap;
@@ -21,7 +17,7 @@ public class Employee {
 	private Date hireDate;
 	private Map managerBySite = new HashMap();
 	private Set underlings = new HashSet();
-	
+
 	Employee() {}
 	public Employee(String name) {
 		this.name=name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
index d8ab6a77b1ab..4d1434ade4e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Site.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.ternary;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java
index c34d02340bfa..69cdb5a73e36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.ternary;
 
@@ -63,7 +61,7 @@ public void testTernary() {
 		tim.getManagerBySite().put(melb, tom);
 		t.commit();
 		s.close();
-		
+
 		s = openSession();
 		t = s.beginTransaction();
 		tom = (Employee) s.get(Employee.class, "Tom");
@@ -77,7 +75,7 @@ public void testTernary() {
 		assertTrue( melb.getEmployees().contains(bob) );
 		assertTrue( melb.getManagers().contains(tom) );
 		t.commit();
-		s.close();		
+		s.close();
 
 		s = openSession();
 		t = s.beginTransaction();
@@ -134,4 +132,3 @@ public void testIndexRelatedFunctions() {
 		session.close();
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
index 106f2c7e6a4b..a3996a97116b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -130,4 +128,3 @@ public static class Person {
 		private Time createdOn = new Time( 0 );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeDefaultTimeZoneTest.java
index a1f1715bd0ea..7db2362020b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeDefaultTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeDefaultTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -97,4 +95,3 @@ public static class Person {
 		private Time createdOn = new Time( 0 );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java
index 8a0030eab9dc..f4f007244f13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -103,7 +101,7 @@ public void testTimeZone() throws Throwable {
 									.getOffset( 0 ) - TIME_ZONE.getOffset( 0 );
 							assertEquals(
 									Math.abs( Long.valueOf( offsetDiff )
-													  .longValue() ),
+													.longValue() ),
 									Math.abs( timestamp.getTime() )
 							);
 						}
@@ -124,4 +122,3 @@ public static class Person {
 		private Timestamp createdOn = new Timestamp( 0 );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomTimeZoneTest.java
index d6e044244ea7..427403fd4f61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampCustomTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -105,7 +103,7 @@ public void testTimeZone() throws Throwable {
 									.getOffset( 0 ) - TIME_ZONE.getOffset( 0 );
 							assertEquals(
 									Math.abs( Long.valueOf( offsetDiff )
-													  .longValue() ),
+													.longValue() ),
 									Math.abs( timestamp.getTime() )
 							);
 						}
@@ -126,4 +124,3 @@ public static class Person {
 		private Timestamp createdOn = new Timestamp( 0 );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java
index 3a5d7c7c0dfb..7eb145d12dc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -166,4 +164,3 @@ public void setShiftStartTime(LocalTime shiftStartTime) {
 		}
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java
index ad4595a4fa9f..34f4591c093b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -90,4 +88,3 @@ public static class Person {
 		private Timestamp createdOn = new Timestamp( 0 );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampUTCTimeZoneTest.java
index 5164e6da8f60..0d3db6a893eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampUTCTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampUTCTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -54,4 +52,3 @@ protected String expectedTimestampValue() {
 		return "2000-01-01 00:00:00.000000";
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java
index d39f78050bd5..3d30d57fdaad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -47,4 +45,3 @@ protected String expectedTimestampValue() {
 		return "2000-01-01 00:00:00.000000";
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
index 58efae18e239..eb4036afaae5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -108,4 +106,3 @@ public static class Person {
 		private Timestamp createdOn;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/Person.java
index 25fd172e83b4..047324a987a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 8054 2005-08-31 20:12:24Z oneovthafew $
 package org.hibernate.orm.test.timestamp;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java
index 4b1d51238cef..4d09711535ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.timestamp;
 
@@ -89,4 +87,3 @@ public void testComponent(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/User.java
index 6f7497aa5f1a..1d48ab5db8af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: User.java 8054 2005-08-31 20:12:24Z oneovthafew $
 package org.hibernate.orm.test.timestamp;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
index ddaeb2742925..c1f797bdc584 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
@@ -7,11 +11,9 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.type.descriptor.DateTimeUtils;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
index ce00751ed046..cb5619a25c1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
index 90a68aa6f645..554760595286 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/JDBCTimeZoneZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/JDBCTimeZoneZonedTest.java
index 56ca6c348a6c..d16bb4320cc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/JDBCTimeZoneZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/JDBCTimeZoneZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
index 9318f6e622e3..4881ede2c366 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedInstantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedInstantTest.java
index 73dbf9f97d0a..2ad946aae309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedInstantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedInstantTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedZonedTest.java
index 23c379b3a43c..ee52a1ccb8b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedZonedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.timezones;
 
 import java.time.Instant;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
index d951e9882b47..19d6e4c66722 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tm;
 
@@ -571,4 +569,3 @@ public String getSetting() {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java
index 61df164f372d..2228c655a620 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
index 79cd147a8ab8..bf776e9bc3d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java
index 12f38a8715af..b4bf62d496a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java
index f21206da0721..35cfc8b863a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DefaultImportFileExecutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DefaultImportFileExecutionTest.java
index dcf17761f81f..5b94ea6ddd4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DefaultImportFileExecutionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DefaultImportFileExecutionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.tool.schema;
 
 import java.io.File;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java
index 797cfe10ad39..f807eb504b4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
@@ -15,7 +13,6 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java
index 6f659b5f202e..7739e38b9d65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java
index fb90bb4c1db8..cb2ea2747a1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java
index 6bb27ded596c..cb0569b17d21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java
index 119dc0e2d4c7..6f162fd9a6a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java
index 5c3d23482ee4..53bdd074a93f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/MySQLColumnValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/MySQLColumnValidationTest.java
index 07a2b0c1bd2b..00821fc6ab0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/MySQLColumnValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/MySQLColumnValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
@@ -23,7 +21,6 @@
 import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl;
 import org.hibernate.tool.schema.internal.HibernateSchemaManagementTool;
 import org.hibernate.tool.schema.internal.IndividuallySchemaValidatorImpl;
-import org.hibernate.tool.schema.spi.ContributableMatcher;
 import org.hibernate.tool.schema.spi.ExceptionHandler;
 import org.hibernate.tool.schema.spi.ExecutionOptions;
 import org.hibernate.tool.schema.spi.SchemaFilter;
@@ -89,23 +86,23 @@ public void init() {
 			}
 
 			statement.execute( "CREATE TABLE `TEST_DATA1` ( " +
-									   "  `ID` int unsigned NOT NULL, " +
-									   "  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
-									   "  `INTEGRAL2` tinyint unsigned DEFAULT '0', " +
-									   "   PRIMARY KEY (`ID`)" +
-									   ") ENGINE=InnoDB" );
+									"  `ID` int unsigned NOT NULL, " +
+									"  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
+									"  `INTEGRAL2` tinyint unsigned DEFAULT '0', " +
+									"   PRIMARY KEY (`ID`)" +
+									") ENGINE=InnoDB" );
 
 			statement.execute( "CREATE TABLE `TEST_DATA2` ( " +
-									   "  `ID` int unsigned NOT NULL, " +
-									   "  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
-									   "   PRIMARY KEY (`ID`)" +
-									   ") ENGINE=InnoDB" );
+									"  `ID` int unsigned NOT NULL, " +
+									"  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
+									"   PRIMARY KEY (`ID`)" +
+									") ENGINE=InnoDB" );
 
 			statement.execute( "CREATE TABLE `TEST_DATA3` ( " +
-									   "  `ID` int unsigned NOT NULL, " +
-									   "  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
-									   "   PRIMARY KEY (`ID`)" +
-									   ") ENGINE=InnoDB" );
+									"  `ID` int unsigned NOT NULL, " +
+									"  `INTEGRAL1` tinyint unsigned DEFAULT '0', " +
+									"   PRIMARY KEY (`ID`)" +
+									") ENGINE=InnoDB" );
 
 		}
 		catch (SQLException e) {
@@ -172,9 +169,9 @@ public SchemaFilter getSchemaFilter() {
 
 		try {
 			schemaValidator.doValidation( scope.getMetadataImplementor(), executionOptions,
-										  contributed -> {
+										contributed -> {
 											return "test_data1".equalsIgnoreCase( contributed.getExportIdentifier() );
-										  } );
+										} );
 		}
 		catch (SchemaManagementException e) {
 			fail( e.getMessage() );
@@ -182,9 +179,9 @@ public SchemaFilter getSchemaFilter() {
 
 		try {
 			schemaValidator.doValidation( scope.getMetadataImplementor(), executionOptions,
-										  contributed -> {
-											  return "test_data2".equalsIgnoreCase( contributed.getExportIdentifier() );
-										  } );
+										contributed -> {
+											return "test_data2".equalsIgnoreCase( contributed.getExportIdentifier() );
+										} );
 			fail( "SchemaManagementException expected" );
 		}
 		catch (SchemaManagementException e) {
@@ -196,9 +193,9 @@ public SchemaFilter getSchemaFilter() {
 
 		try {
 			schemaValidator.doValidation( scope.getMetadataImplementor(), executionOptions,
-										  contributed -> {
-											  return "test_data3".equalsIgnoreCase( contributed.getExportIdentifier() );
-										  } );
+										contributed -> {
+											return "test_data3".equalsIgnoreCase( contributed.getExportIdentifier() );
+										} );
 			fail( "SchemaManagementException expected" );
 		}
 		catch (SchemaManagementException e) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java
index d468b5e30195..b1a66c279c32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java
index 6ae9947ba420..d9ab7b01d721 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java
index efbafd687ef2..d38c3a494b61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java
index 3281736244be..e2272c67ea8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema;
 
@@ -20,7 +18,7 @@ public class TargetStdoutImpl implements GenerationTarget {
 	public TargetStdoutImpl() {
 		this( null );
 	}
-	
+
 	public TargetStdoutImpl(String delimiter) {
 		this( delimiter, FormatStyle.NONE.getFormatter());
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
index e6328ec65325..51618f96be86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.tool.schema.internal;
 
 import java.lang.reflect.InvocationTargetException;
@@ -137,7 +141,7 @@ public String toMetaDataObjectName(Identifier identifier) {
 	/**
 	 * If the key has no name it should never be found. Result is that those keys are always recreated. But keys always
 	 * have a name so this is no problem.
-	 * 
+	 *
 	 * @throws NoSuchMethodException - error
 	 * @throws SecurityException - error
 	 * @throws IllegalAccessException - error
@@ -160,7 +164,7 @@ public void testForeignKeyWithoutName()
 
 	/**
 	 * Test key not found if tableinformation is missing.
-	 * 
+	 *
 	 * @throws NoSuchMethodException - error
 	 * @throws SecurityException - error
 	 * @throws IllegalAccessException - error
@@ -183,7 +187,7 @@ public void testMissingTableInformation()
 
 	/**
 	 * Check detection of existing foreign keys with the same name exists.
-	 * 
+	 *
 	 * @throws SecurityException - error
 	 * @throws NoSuchMethodException - error
 	 * @throws InvocationTargetException - error
@@ -220,7 +224,7 @@ public void testKeyWithSameNameExists()
 
 	/**
 	 * Check detection of existing foreign keys with the same name exists.
-	 * 
+	 *
 	 * @throws SecurityException - error
 	 * @throws NoSuchMethodException - error
 	 * @throws InvocationTargetException - error
@@ -258,7 +262,7 @@ public void testKeyWithSameNameNotExists()
 	/**
 	 * Check detection of existing foreign key with the same mappings for a simple mapping (table1.objectId =>
 	 * table2.id).
-	 * 
+	 *
 	 * @throws SecurityException - error
 	 * @throws NoSuchMethodException - error
 	 * @throws InvocationTargetException - error
@@ -296,7 +300,7 @@ public void testCheckForExistingForeignKeyOne2One() throws NoSuchMethodException
 	/**
 	 * Check detection of not existing foreign key with the same mappings for a simple mapping (table1.objectId =>
 	 * table2.id).
-	 * 
+	 *
 	 * @throws SecurityException - error
 	 * @throws NoSuchMethodException - error
 	 * @throws InvocationTargetException - error
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java
index 4c87765f27c9..01f6d050f8f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.internal;
 
@@ -15,7 +13,6 @@
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl;
 import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.mapping.ForeignKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java
index 020127f84265..ccbccb9ac2f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Dog.java
index 95fdc337ac1b..18bc3b543e61 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Dog.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Dog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java
index 82b7d53ce553..aeaef940f265 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Human.java
index b61204dea092..8f42ff21d433 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java
index bd51032a899d..9d39501dff4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java
index 7d3a2433e6e0..3e47fb5b9649 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java
index f54c54e970e0..b1935e235e78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java
index 194c1f4a8b8c..ea5fe5d2eb3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java
index f6ed5b798a2c..07a8580f3d5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportFileTest.java
index ee61841e0750..2713af0a1c8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportFileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportFileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java
index 878bbffc92f3..8e8522dabd33 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tool.schema.scripts;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tooling/modelgen/ModelGenTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tooling/modelgen/ModelGenTests.java
index f346542e5ee7..7495ca2b152f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tooling/modelgen/ModelGenTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tooling/modelgen/ModelGenTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.tooling.modelgen;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java
index ffeed068f7bc..627df6166c62 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.transactions;
 
@@ -49,7 +47,7 @@ public void jdbc() {
 				.build();
 
 		//end::transactions-api-jdbc-example[]
-        */
+		*/
 
 		//tag::transactions-api-jdbc-example[]
 		Metadata metadata = new MetadataSources(serviceRegistry)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java
index 4d1ac053d501..b462e865729f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -27,7 +25,6 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractNamedEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractNamedEnumTest.java
index d6156bc831fe..b7b082343543 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractNamedEnumTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractNamedEnumTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
index 8fce65d3e211..d5ccc18ffdf1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
index b1e1f5f2e782..a42ed7332a5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicTypeRegistryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicTypeRegistryTest.java
index 29e57b3290e2..18a237607d4f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicTypeRegistryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicTypeRegistryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java
index f3c92953b713..7d96a65ab08f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java
index 6ed04a58b385..65488d3c62b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
index 60d274f572ff..e03cd9fb6a59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -90,7 +88,7 @@ public void testById(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect( dialectClass = OracleDialect.class, reason = "External driver fix required")
 	public void testQueryById(SessionFactoryScope scope) {
-      scope.inSession( em -> {
+	scope.inSession( em -> {
 			TypedQuery tq = em.createNamedQuery( "TableWithBooleanArrays.JPQL.getById", TableWithBooleanArrays.class );
 			tq.setParameter( "id", 2L );
 			TableWithBooleanArrays tableRecord = tq.getSingleResult();
@@ -100,8 +98,8 @@ public void testQueryById(SessionFactoryScope scope) {
 
 	@Test
 	@SkipForDialect( dialectClass = OracleDialect.class, reason = "External driver fix required")
-    public void testQuery(SessionFactoryScope scope) {
-      scope.inSession( em -> {
+	public void testQuery(SessionFactoryScope scope) {
+	scope.inSession( em -> {
 			TypedQuery tq = em.createNamedQuery( "TableWithBooleanArrays.JPQL.getByData", TableWithBooleanArrays.class );
 			tq.setParameter( "data", new Boolean[]{} );
 			TableWithBooleanArrays tableRecord = tq.getSingleResult();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/CharacterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/CharacterTypeTest.java
index c4c4e610ecf4..ab02cbb079f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/CharacterTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/CharacterTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
index 7df51ec64173..7592139d6559 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
index 60f7259c3751..c1e71c935212 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
index 24df5625bc76..a7819e7867c1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
index 713d15c0d316..6908560835ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -194,7 +192,7 @@ public void setTheSet(Set theSet) {
 	public enum MySpecialEnum {
 		VALUE1, VALUE2, VALUE3
 	}
-	
+
 	public static class MyEnumConverter implements AttributeConverter {
 		@Override
 		public String convertToDatabaseColumn(MySpecialEnum attribute) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
index 3f841c8f9bab..a0d674882bb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumUpdateTest.java
index ec696ee447c3..2af135381447 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
index 2420fb1924c5..7b744b6143f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/H2JsonListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/H2JsonListTest.java
index 7f42792d11f3..afb781fdbfca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/H2JsonListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/H2JsonListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/InstantTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/InstantTest.java
index 5e162f207695..a6d6c4d32ee3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/InstantTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/InstantTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -11,7 +9,6 @@
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
index b23083dee5b0..6a8e98d3ee3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java
index 45d5223d0b75..f577e5b2c351 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LobUnfetchedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LobUnfetchedPropertyTest.java
index f5d3b09b443a..f3773d6cfc09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LobUnfetchedPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LobUnfetchedPropertyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -125,15 +123,15 @@ public void testNClob(SessionFactoryScope scope) {
 			NClob nClob = file.getClob();
 			assertTrue( Hibernate.isPropertyInitialized( file, "clob" ) );
 			try {
-			   final char[] chars = new char[(int) file.getClob().length()];
-			   nClob.getCharacterStream().read( chars );
+			final char[] chars = new char[(int) file.getClob().length()];
+			nClob.getCharacterStream().read( chars );
 				assertArrayEquals( "TEST CASE".toCharArray(), chars );
 			}
 			catch (SQLException ex ) {
-			   fail( "could not determine Lob length" );
+			fail( "could not determine Lob length" );
 			}
 			catch (IOException ex) {
-			   fail( "could not read Lob" );
+			fail( "could not read Lob" );
 			}
 		});
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java
index 0d3ad0e673b7..dc034ae04de0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTimeTest.java
index 31d36f489750..62b63034d3a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalTimeTest.java
index 21a45381a889..a223025a9195 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
index b99c45c98de2..5d5758aed4e2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
index 481e1e17582f..e219583fb377 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java
index f53b3c8eb9b7..67283e165b75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetTimeTest.java
index 5d4b2841ae26..f3ca505d052e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleArrayTest.java
index 470bcc512479..40ae33822efc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java
index 7d8df150a9f3..205e3fbb3ad3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java
index d37393f8524f..498fce9435f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNamedEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNamedEnumTest.java
index 657e29d8c074..6c9982295be3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNamedEnumTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNamedEnumTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java
index 512f3e129616..390fbed4ade2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java
index 0caa60a03cfb..6f575f46664a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.math.BigInteger;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OverrideStandardJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OverrideStandardJavaTypeTest.java
index d5e2a283512e..cfee69496fd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OverrideStandardJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OverrideStandardJavaTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.util.Comparator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
index e8dcd62bec25..af3b72625a68 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.time.Duration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
index cd3c874fbf8d..c682f90516a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
index 41a4ddc66102..8506cee44f51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.util.Locale;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PreferredUuidJdbcTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PreferredUuidJdbcTypeTest.java
index 610bf9e2167e..2a29456b1b80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PreferredUuidJdbcTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PreferredUuidJdbcTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type;
 
 import java.util.UUID;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java
index 596a9dfe8131..19eb3ed90653 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
index f76e498f1392..52e01733cbc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java
index 0ff47c703edf..9e90849906ec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StandardBasicTypeTemplateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StandardBasicTypeTemplateTest.java
index 89130e790eda..3241cd7a13cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StandardBasicTypeTemplateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StandardBasicTypeTemplateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
index c3af202004f7..c255dd3f2217 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java
index c639fdf6b148..77d011779d58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
index eed3ddfc3a55..d6029ac1135c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
index ef95ad363a1c..b2ea5646d4fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
index 425eb9fc4d15..677501e3be75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -28,7 +26,6 @@
 import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.BasicTypeReference;
 import org.hibernate.type.SerializableType;
 import org.hibernate.type.StandardBasicTypes;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java
index e972cfca2f13..e17ae67a1623 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
index 44973eedf029..d00aba27afdf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
@@ -14,7 +12,6 @@
 
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.dialect.HANADialect;
-import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.type.SqlTypes;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java
index a117c7a0d837..97becb648516 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/Array.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/Array.java
index 1388594fbd6b..b3bdceb12634 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/Array.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/Array.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.contributor;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java
index 05af919f46e7..6e6d8bfc820a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor;
 
@@ -97,4 +95,3 @@ public Array getEmailAddresses() {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayJavaType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayJavaType.java
index 39b4cd5b8c7a..fa140333fb8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayJavaType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayJavaType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.contributor;
 
 import java.sql.Types;
@@ -13,77 +17,77 @@
  */
 public class ArrayJavaType extends AbstractClassJavaType {
 
-    private static final String DELIMITER = ",";
+	private static final String DELIMITER = ",";
 
-    public static final ArrayJavaType INSTANCE = new ArrayJavaType();
+	public static final ArrayJavaType INSTANCE = new ArrayJavaType();
 
-    public ArrayJavaType() {
-        super( Array.class );
-    }
+	public ArrayJavaType() {
+		super( Array.class );
+	}
 
-    @Override
-    public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
-        return indicators.getJdbcType( Types.VARCHAR );
-    }
+	@Override
+	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
+		return indicators.getJdbcType( Types.VARCHAR );
+	}
 
-    @Override
-    public String toString(Array value) {
-        StringBuilder builder = new StringBuilder();
-        for ( String token : value ) {
-            if ( builder.length() > 0 ) {
-                builder.append( DELIMITER );
-            }
-            builder.append( token );
-        }
-        return builder.toString();
-    }
+	@Override
+	public String toString(Array value) {
+		StringBuilder builder = new StringBuilder();
+		for ( String token : value ) {
+			if ( builder.length() > 0 ) {
+				builder.append( DELIMITER );
+			}
+			builder.append( token );
+		}
+		return builder.toString();
+	}
 
-    public static String extractString(Array value) {
-        StringBuilder builder = new StringBuilder();
-        for ( String token : value ) {
-            if ( builder.length() > 0 ) {
-                builder.append( DELIMITER );
-            }
-            builder.append( token );
-        }
-        return builder.toString();
-    }
+	public static String extractString(Array value) {
+		StringBuilder builder = new StringBuilder();
+		for ( String token : value ) {
+			if ( builder.length() > 0 ) {
+				builder.append( DELIMITER );
+			}
+			builder.append( token );
+		}
+		return builder.toString();
+	}
 
-    @Override
-    public Array fromString(CharSequence string) {
-        if ( string == null || string.length() == 0 ) {
-            return null;
-        }
-        String[] tokens = string.toString().split( DELIMITER );
-        Array array = new Array();
-        array.addAll( Arrays.asList(tokens) );
-        return array;
-    }
+	@Override
+	public Array fromString(CharSequence string) {
+		if ( string == null || string.length() == 0 ) {
+			return null;
+		}
+		String[] tokens = string.toString().split( DELIMITER );
+		Array array = new Array();
+		array.addAll( Arrays.asList(tokens) );
+		return array;
+	}
 
-    @SuppressWarnings("unchecked")
-    public  X unwrap(Array value, Class type, WrapperOptions options) {
-        if ( value == null ) {
-            return null;
-        }
-        if ( Array.class.isAssignableFrom( type ) ) {
-            return (X) value;
-        }
-        if ( String.class.isAssignableFrom( type ) ) {
-            return (X) toString( value);
-        }
-        throw unknownUnwrap( type );
-    }
+	@SuppressWarnings("unchecked")
+	public  X unwrap(Array value, Class type, WrapperOptions options) {
+		if ( value == null ) {
+			return null;
+		}
+		if ( Array.class.isAssignableFrom( type ) ) {
+			return (X) value;
+		}
+		if ( String.class.isAssignableFrom( type ) ) {
+			return (X) toString( value);
+		}
+		throw unknownUnwrap( type );
+	}
 
-    public  Array wrap(X value, WrapperOptions options) {
-        if ( value == null ) {
-            return null;
-        }
-        if ( value instanceof String ) {
-            return fromString( (String) value );
-        }
-        if ( value instanceof Array ) {
-            return (Array) value;
-        }
-        throw unknownWrap( value.getClass() );
-    }
+	public  Array wrap(X value, WrapperOptions options) {
+		if ( value == null ) {
+			return null;
+		}
+		if ( value instanceof String ) {
+			return fromString( (String) value );
+		}
+		if ( value instanceof Array ) {
+			return (Array) value;
+		}
+		throw unknownWrap( value.getClass() );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayMutabilityPlan.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayMutabilityPlan.java
index d264e65cd09a..27c99a36d627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayMutabilityPlan.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayMutabilityPlan.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java
index eacb0d44e741..6861c8877de0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.contributor;
 
 import java.io.Serializable;
@@ -23,107 +27,107 @@
  * @author Vlad Mihalcea
  */
 public class ArrayType implements UserType, BindableType, BasicValueConverter {
-    public static final ArrayType INSTANCE = new ArrayType();
-
-    private final BasicJavaType javaType = ArrayJavaType.INSTANCE;
-    private final JdbcType jdbcType = VarcharJdbcType.INSTANCE;
-
-    @Override
-    public Class getBindableJavaType() {
-        // really a UserType should not implement BindableType
-        return Array.class;
-    }
-
-    @Override
-    public SqmExpressible resolveExpressible(BindingContext bindingContext) {
-        // really a UserType should not implement BindableType
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getSqlType() {
-        return jdbcType.getJdbcTypeCode();
-    }
-
-    @Override
-    public JdbcType getJdbcType(TypeConfiguration typeConfiguration) {
-        return jdbcType;
-    }
-
-    @Override
-    public Class returnedClass() {
-        return Array.class;
-    }
-
-    @Override
-    public boolean equals(Array x, Array y) throws HibernateException {
-        return javaType.areEqual( x, y );
-    }
-
-    @Override
-    public int hashCode(Array x) throws HibernateException {
-        return javaType.extractHashCode( x );
-    }
-
-    @Override
-    public Array nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
-            throws SQLException {
-        return jdbcType.getExtractor( javaType ).extract( rs, position, session );
-    }
-
-    @Override
-    public void nullSafeSet(PreparedStatement st, Array value, int index, SharedSessionContractImplementor session)
-            throws SQLException {
-        jdbcType.getBinder( javaType ).bind( st, value, index, session );
-    }
-
-    @Override
-    public BasicValueConverter getValueConverter() {
-        return (BasicValueConverter) this;
-    }
-
-    @Override
-    public Array toDomainValue(String relationalForm) {
-        return assemble( relationalForm, null );
-    }
-
-    @Override
-    public String toRelationalValue(Array domainForm) {
-        return (String) disassemble( domainForm );
-    }
-
-    @Override
-    public JavaType getDomainJavaType() {
-        return javaType;
-    }
-
-    @Override
-    public JavaType getRelationalJavaType() {
-        return StringJavaType.INSTANCE;
-    }
-
-    @Override
-    public Array deepCopy(Array value) throws HibernateException {
-        return ArrayMutabilityPlan.INSTANCE.deepCopy( value );
-    }
-
-    @Override
-    public boolean isMutable() {
-        return true;
-    }
-
-    @Override
-    public Serializable disassemble(Array value) throws HibernateException {
-        return ArrayMutabilityPlan.INSTANCE.disassemble( value, null );
-    }
-
-    @Override
-    public Array assemble(Serializable cached, Object owner) throws HibernateException {
-        return ArrayMutabilityPlan.INSTANCE.assemble( cached, null );
-    }
-
-    @Override
-    public Array replace(Array original, Array target, Object owner) throws HibernateException {
-        return null;
-    }
+	public static final ArrayType INSTANCE = new ArrayType();
+
+	private final BasicJavaType javaType = ArrayJavaType.INSTANCE;
+	private final JdbcType jdbcType = VarcharJdbcType.INSTANCE;
+
+	@Override
+	public Class getBindableJavaType() {
+		// really a UserType should not implement BindableType
+		return Array.class;
+	}
+
+	@Override
+	public SqmExpressible resolveExpressible(BindingContext bindingContext) {
+		// really a UserType should not implement BindableType
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int getSqlType() {
+		return jdbcType.getJdbcTypeCode();
+	}
+
+	@Override
+	public JdbcType getJdbcType(TypeConfiguration typeConfiguration) {
+		return jdbcType;
+	}
+
+	@Override
+	public Class returnedClass() {
+		return Array.class;
+	}
+
+	@Override
+	public boolean equals(Array x, Array y) throws HibernateException {
+		return javaType.areEqual( x, y );
+	}
+
+	@Override
+	public int hashCode(Array x) throws HibernateException {
+		return javaType.extractHashCode( x );
+	}
+
+	@Override
+	public Array nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
+			throws SQLException {
+		return jdbcType.getExtractor( javaType ).extract( rs, position, session );
+	}
+
+	@Override
+	public void nullSafeSet(PreparedStatement st, Array value, int index, SharedSessionContractImplementor session)
+			throws SQLException {
+		jdbcType.getBinder( javaType ).bind( st, value, index, session );
+	}
+
+	@Override
+	public BasicValueConverter getValueConverter() {
+		return (BasicValueConverter) this;
+	}
+
+	@Override
+	public Array toDomainValue(String relationalForm) {
+		return assemble( relationalForm, null );
+	}
+
+	@Override
+	public String toRelationalValue(Array domainForm) {
+		return (String) disassemble( domainForm );
+	}
+
+	@Override
+	public JavaType getDomainJavaType() {
+		return javaType;
+	}
+
+	@Override
+	public JavaType getRelationalJavaType() {
+		return StringJavaType.INSTANCE;
+	}
+
+	@Override
+	public Array deepCopy(Array value) throws HibernateException {
+		return ArrayMutabilityPlan.INSTANCE.deepCopy( value );
+	}
+
+	@Override
+	public boolean isMutable() {
+		return true;
+	}
+
+	@Override
+	public Serializable disassemble(Array value) throws HibernateException {
+		return ArrayMutabilityPlan.INSTANCE.disassemble( value, null );
+	}
+
+	@Override
+	public Array assemble(Serializable cached, Object owner) throws HibernateException {
+		return ArrayMutabilityPlan.INSTANCE.assemble( cached, null );
+	}
+
+	@Override
+	public Array replace(Array original, Array target, Object owner) throws HibernateException {
+		return null;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java
index 470b47b53d59..6fe9197f66a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor;
 
@@ -94,4 +92,3 @@ public Array getEmailAddresses() {
 
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
index 1e13aa7b95a7..321e8dc7dad3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor;
 
@@ -103,4 +101,4 @@ public void testIdVersionFunctions(Object literalValue, SessionFactoryScope scop
 		);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ContributedUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ContributedUserTypeTest.java
index a933719981c6..fdf98817f427 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ContributedUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ContributedUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValue.java
index 2b8578bd73ef..3fafb7ae822f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueType.java
index 5facd1c2950e..4a8df95921d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueTypeContributor.java
index b05e97f1dd17..f4b44000684c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/MyCompositeValueTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ServiceLoadedCustomUserTypeTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ServiceLoadedCustomUserTypeTypeContributor.java
index 6fac70792da7..8e28ac38cc97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ServiceLoadedCustomUserTypeTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/ServiceLoadedCustomUserTypeTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapper.java
index 84dfb49967c3..88287dd80af3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
@@ -13,32 +11,32 @@
  */
 public class StringWrapper implements Serializable {
 
-    private final String value;
+	private final String value;
 
-    public StringWrapper(String value) {
-        this.value = value;
-    }
+	public StringWrapper(String value) {
+		this.value = value;
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if ( this == o ) {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() ) {
-            return false;
-        }
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
 
-        StringWrapper that = (StringWrapper) o;
+		StringWrapper that = (StringWrapper) o;
 
-        return value.equals( that.value );
-    }
+		return value.equals( that.value );
+	}
 
-    @Override
-    public int hashCode() {
-        return value.hashCode();
-    }
+	@Override
+	public int hashCode() {
+		return value.hashCode();
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperTypeContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperTypeContributor.java
index 95aba5fe769b..62d532e0dbd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperTypeContributor.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperUserType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperUserType.java
index 93a2e3702615..816658ba70c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/StringWrapperUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.contributor.usertype;
 
@@ -26,89 +24,89 @@ public class StringWrapperUserType implements UserType {
 
 	public static final StringWrapperUserType INSTANCE = new StringWrapperUserType();
 
-    private static final Logger log = Logger.getLogger( StringWrapperUserType.class );
+	private static final Logger log = Logger.getLogger( StringWrapperUserType.class );
 
-    @Override
-    public int getSqlType() {
-        return Types.VARCHAR;
-    }
+	@Override
+	public int getSqlType() {
+		return Types.VARCHAR;
+	}
 
-    @Override
-    public Class returnedClass() {
-        return StringWrapper.class;
-    }
+	@Override
+	public Class returnedClass() {
+		return StringWrapper.class;
+	}
 
-    @Override
-    public boolean equals(StringWrapper x, StringWrapper y)
+	@Override
+	public boolean equals(StringWrapper x, StringWrapper y)
 			throws HibernateException {
-        return Objects.equals( x, y );
-    }
+		return Objects.equals( x, y );
+	}
 
-    @Override
-    public int hashCode(StringWrapper x)
+	@Override
+	public int hashCode(StringWrapper x)
 			throws HibernateException {
-        return Objects.hashCode( x );
-    }
-
-    @Override
-    public StringWrapper nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
-            throws SQLException {
-        String columnValue = (String) rs.getObject( position );
-        log.debugv( "Result set column {0} value is {1}", position, columnValue );
-        return columnValue == null ? null : fromString( columnValue );
-    }
-
-    @Override
-    public void nullSafeSet(
-            PreparedStatement st, StringWrapper value, int index, SharedSessionContractImplementor session)
-            throws SQLException {
-        if ( value == null ) {
-            log.debugv("Binding null to parameter {0} ",index);
-            st.setNull( index, Types.VARCHAR );
-        }
-        else {
-            String stringValue = toString( value );
-            log.debugv("Binding {0} to parameter {1} ", stringValue, index);
-            st.setString( index, stringValue );
-        }
-    }
-    public String toString(StringWrapper value) {
-        return value.getValue();
-    }
-
-    public StringWrapper fromString(String string) {
-        if ( string == null || string.isEmpty() ) {
-            return null;
-        }
-        return new StringWrapper( string );
-    }
-
-    @Override
-    public StringWrapper deepCopy(StringWrapper value)
+		return Objects.hashCode( x );
+	}
+
+	@Override
+	public StringWrapper nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
+			throws SQLException {
+		String columnValue = (String) rs.getObject( position );
+		log.debugv( "Result set column {0} value is {1}", position, columnValue );
+		return columnValue == null ? null : fromString( columnValue );
+	}
+
+	@Override
+	public void nullSafeSet(
+			PreparedStatement st, StringWrapper value, int index, SharedSessionContractImplementor session)
+			throws SQLException {
+		if ( value == null ) {
+			log.debugv("Binding null to parameter {0} ",index);
+			st.setNull( index, Types.VARCHAR );
+		}
+		else {
+			String stringValue = toString( value );
+			log.debugv("Binding {0} to parameter {1} ", stringValue, index);
+			st.setString( index, stringValue );
+		}
+	}
+	public String toString(StringWrapper value) {
+		return value.getValue();
+	}
+
+	public StringWrapper fromString(String string) {
+		if ( string == null || string.isEmpty() ) {
+			return null;
+		}
+		return new StringWrapper( string );
+	}
+
+	@Override
+	public StringWrapper deepCopy(StringWrapper value)
 			throws HibernateException {
-        return value;
-    }
+		return value;
+	}
 
-    @Override
-    public boolean isMutable() {
-        return false;
-    }
+	@Override
+	public boolean isMutable() {
+		return false;
+	}
 
-    @Override
-    public Serializable disassemble(StringWrapper value)
+	@Override
+	public Serializable disassemble(StringWrapper value)
 			throws HibernateException {
-        return value == null ? null : value.getValue().getBytes();
-    }
+		return value == null ? null : value.getValue().getBytes();
+	}
 
-    @Override
-    public StringWrapper assemble(Serializable cached, Object owner)
+	@Override
+	public StringWrapper assemble(Serializable cached, Object owner)
 			throws HibernateException {
-        return new StringWrapper( new String( (byte[]) cached ) );
-    }
+		return new StringWrapper( new String( (byte[]) cached ) );
+	}
 
-    @Override
-    public StringWrapper replace(StringWrapper original, StringWrapper target, Object owner)
+	@Override
+	public StringWrapper replace(StringWrapper original, StringWrapper target, Object owner)
 			throws HibernateException {
-        return deepCopy( original );
-    }
+		return deepCopy( original );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
index de72436d39ae..911941333572 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.descriptor.java;
 
 import java.sql.Date;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
index 7051fdc7b53b..2854ce4f2d79 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.descriptor.java;
 
 import java.sql.Time;
@@ -8,7 +12,6 @@
 
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.JdbcTimeJavaType;
-import org.hibernate.type.descriptor.java.LocalTimeJavaType;
 
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalDateArrayDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalDateArrayDescriptorTest.java
index 8ccb5edf68a1..6d29eb9aa14a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalDateArrayDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalDateArrayDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalTimeJavaTypeDescriptorTest.java
index dd447e50f830..ca8b145c6912 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LocalTimeJavaTypeDescriptorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.descriptor.java;
 
 import java.sql.Time;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LongArrayDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LongArrayDescriptorTest.java
index f56d9e122924..ddc619bc6b7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LongArrayDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/LongArrayDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/OffsetTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/OffsetTimeJavaTypeDescriptorTest.java
index 61633844b59b..a254788d29c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/OffsetTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/OffsetTimeJavaTypeDescriptorTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.descriptor.java;
 
 import java.sql.Time;
@@ -13,7 +17,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.LocalTimeJavaType;
 import org.hibernate.type.descriptor.java.OffsetTimeJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/StringArrayDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/StringArrayDescriptorTest.java
index 924b5b8b4107..af0855c43a18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/StringArrayDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/StringArrayDescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.java;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java
index 6aa80335ca5a..836336da6cc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.type.descriptor.jdbc;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -13,15 +17,15 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ArrayJdbcTypeTest {
-    @Test
-    @JiraKey(value = "HHH-17662")
-    public void testEquality() {
-        Map typeMap = new HashMap<>();
-        JdbcType bigInt = new BigIntJdbcType();
-        typeMap.put(new ArrayJdbcType(bigInt), "bees");
-        typeMap.put(new ArrayJdbcType(bigInt), "bees");
-        typeMap.put(new ArrayJdbcType(bigInt), "bees");
-        typeMap.put(new ArrayJdbcType(new IntegerJdbcType()), "waffles");
-        assertThat("A map of arrays only contains non duplicate entries", typeMap.size() == 2);
-    }
+	@Test
+	@JiraKey(value = "HHH-17662")
+	public void testEquality() {
+		Map typeMap = new HashMap<>();
+		JdbcType bigInt = new BigIntJdbcType();
+		typeMap.put(new ArrayJdbcType(bigInt), "bees");
+		typeMap.put(new ArrayJdbcType(bigInt), "bees");
+		typeMap.put(new ArrayJdbcType(bigInt), "bees");
+		typeMap.put(new ArrayJdbcType(new IntegerJdbcType()), "waffles");
+		assertThat("A map of arrays only contains non duplicate entries", typeMap.size() == 2);
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/PreparedStatementProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/PreparedStatementProxy.java
index ff92e5da7b9b..35424d3c9111 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/PreparedStatementProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/PreparedStatementProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/ResultSetProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/ResultSetProxy.java
index 6a74d7d52ccc..1ac4a5e11259 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/ResultSetProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/ResultSetProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringClobImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringClobImpl.java
index ac3aba193cc7..c5bf0e2b643b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringClobImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringClobImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.sql;
 import java.io.InputStream;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringValueMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringValueMappingTest.java
index 3da882b0f177..8558a0dc881c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringValueMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/sql/StringValueMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.type.descriptor.sql;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java
index 01b244671272..b5863606ebbc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typedescriptor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
index b3a8db239125..34db33d19c92 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typedescriptor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java
index f88b934deb09..b561947df82f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java
@@ -1,50 +1,48 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
- package org.hibernate.orm.test.typedescriptor;
- 
+package org.hibernate.orm.test.typedescriptor;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
- /**
-  * @author Strong Liu
-  */
+/**
+* @author Strong Liu
+*/
 @Entity
- public class Issue {
-    @Id
-    @GeneratedValue
-    private Long id;
-    private String description;
-    @Column(columnDefinition = "char(8)")
-    private String issueNumber;
-
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIssueNumber() {
-        return issueNumber;
-    }
-
-    public void setIssueNumber(String issueNumber) {
-        this.issueNumber = issueNumber;
-    }
- }
+public class Issue {
+	@Id
+	@GeneratedValue
+	private Long id;
+	private String description;
+	@Column(columnDefinition = "char(8)")
+	private String issueNumber;
+
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getIssueNumber() {
+		return issueNumber;
+	}
+
+	public void setIssueNumber(String issueNumber) {
+		this.issueNumber = issueNumber;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java
index 77aa747e025a..2e7b4743d9c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typedescriptor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java
index ca1c34269d30..c3ee299abcff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typedescriptor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Address.java
index b69e15768a8c..1cd476181404 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.typedonetoone;
 import java.io.Serializable;
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Address implements Serializable {
-	
+
 	private AddressId addressId;
 	private String street;
 	private String city;
@@ -27,7 +23,7 @@ public Customer getCustomer() {
 	public void setCustomer(Customer customer) {
 		this.customer = customer;
 	}
-	
+
 	public String getCity() {
 		return city;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/AddressId.java
index bd4fe181d1bb..b7858f4a5d35 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/AddressId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/AddressId.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: AddressId.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.typedonetoone;
 import java.io.Serializable;
 
@@ -15,14 +11,14 @@
 public class AddressId implements Serializable {
 	private String type;
 	private String customerId;
-	
+
 	public AddressId(String type, String customerId) {
 		this.customerId = customerId;
 		this.type = type;
 	}
-	
+
 	public AddressId() {}
-	
+
 	public String getType() {
 		return type;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Customer.java
index 2672969dda02..e3a7e217ceff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.typedonetoone;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java
index b1f860f2a67a..aead472a48e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typedonetoone;
 
@@ -107,4 +105,3 @@ public void testCreateQueryNull(SessionFactoryScope scope) {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/Entity.java
index 4e26c6eb6cf0..e73524b39633 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/Entity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeoverride;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/StoredPrefixedStringType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/StoredPrefixedStringType.java
index 724e6c66023c..2f8fa3dc6a01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/StoredPrefixedStringType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/StoredPrefixedStringType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeoverride;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java
index ef7f7c5df6f6..685bc0662b75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeoverride;
 
@@ -27,7 +25,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
 /**
@@ -135,8 +132,3 @@ public void testRegisteredFunction() {
 		);
 	}
 }
-
-
-
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/DefaultValueIntegerType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/DefaultValueIntegerType.java
index 75e4bef24248..a68523db8633 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/DefaultValueIntegerType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/DefaultValueIntegerType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeparameters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java
index bfbd86074121..e9b8efab34f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeparameters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/Widget.java
index 6baefad34f36..faf3f5e62343 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/Widget.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/Widget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.typeparameters;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java
index 456b3c14e309..9118a3cd50f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 6298 2005-04-03 03:56:22Z oneovthafew $
 package org.hibernate.orm.test.unconstrained;
 
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Employee {
-	
+
 	private String id;
 
 	public Employee() {
@@ -26,11 +22,11 @@ public Employee(String id) {
 	public String getId() {
 		return id;
 	}
-	
+
 
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java
index 52ea8ca42806..d6507500c732 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 6298 2005-04-03 03:56:22Z oneovthafew $
 package org.hibernate.orm.test.unconstrained;
 
 
@@ -13,7 +9,7 @@
  * @author Gavin King
  */
 public class Person {
-	
+
 	private String name;
 	private String employeeId;
 	private Employee employee;
@@ -22,30 +18,30 @@ public Person() {}
 	public Person(String name) {
 		this.name = name;
 	}
-	
+
 	public Employee getEmployee() {
 		return employee;
 	}
-	
+
 	public void setEmployee(Employee employee) {
 		this.employee = employee;
 	}
-	
+
 	public String getEmployeeId() {
 		return employeeId;
 	}
-	
+
 	public void setEmployeeId(String employeeId) {
 		this.employeeId = employeeId;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java
index 9ff901d31c95..c22ba294e38e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unconstrained;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java
index 7d88c0db284f..d7b949311815 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java
index 6c7b9b8b68dd..7408891ab4e3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
@@ -33,7 +31,7 @@ protected String getBaseForMappings() {
 	protected String[] getMappings() {
 		return new String[] { "unidir/ParentChild.hbm.xml" };
 	}
-	
+
 	@Override
 	protected Class[] getAnnotatedClasses() {
 		// No test needed at this time.  This was purely to test a
@@ -110,7 +108,7 @@ public void testBackRefToProxiedEntityOnMerge() {
 		s.beginTransaction();
 		Parent me = new Parent( "Steve", 192837465 );
 		me.getChildren().add( new Child( "Joe" ) );
-  		s.persist( me );
+		s.persist( me );
 		s.getTransaction().commit();
 		s.close();
 
@@ -137,4 +135,3 @@ public void testBackRefToProxiedEntityOnMerge() {
 		s.close();
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java
index b54fe5ea9d5e..3ccaad94ca08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Child.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.unidir;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java
index b1f4ae41a11f..f664d67b3505 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
@@ -13,23 +11,23 @@
 @Entity
 @Table(name = "CHILD1")
 public class Child1 {
-    @Id
-    @Column(name = "ID")
-    private Long id;
+	@Id
+	@Column(name = "ID")
+	private Long id;
 
-    @OneToMany(fetch = FetchType.LAZY)
-    @JoinColumn(name = "CHILD1_ID", nullable = false)
-    private List parents = new ArrayList();
+	@OneToMany(fetch = FetchType.LAZY)
+	@JoinColumn(name = "CHILD1_ID", nullable = false)
+	private List parents = new ArrayList();
 
-    public Long getId() {
-        return this.id;
-    }
+	public Long getId() {
+		return this.id;
+	}
 
-    public List getParents() {
-        return this.parents;
-    }
+	public List getParents() {
+		return this.parents;
+	}
 
-    public void setParents(List parents) {
-        this.parents = parents;
-    }
+	public void setParents(List parents) {
+		this.parents = parents;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java
index 0d2dacbe07a3..508096aeec63 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
@@ -13,23 +11,23 @@
 @Entity
 @Table(name = "CHILD2")
 public class Child2 {
-    @Id
-    @Column(name = "ID")
-    private Long id;
+	@Id
+	@Column(name = "ID")
+	private Long id;
 
-    @OneToMany(fetch = FetchType.LAZY)
-    @JoinColumn(name = "CHILD2_ID", nullable = false)
-    private List parents = new ArrayList();
+	@OneToMany(fetch = FetchType.LAZY)
+	@JoinColumn(name = "CHILD2_ID", nullable = false)
+	private List parents = new ArrayList();
 
-    public Long getId() {
-        return this.id;
-    }
+	public Long getId() {
+		return this.id;
+	}
 
-    public List getParents() {
-        return this.parents;
-    }
+	public List getParents() {
+		return this.parents;
+	}
 
-    public void setParents(List parents) {
-        this.parents = parents;
-    }
+	public void setParents(List parents) {
+		this.parents = parents;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java
index 3b1a5626e166..eae4a68fbb3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Parent.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.unidir;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java
index a7c2db27c547..3bcaac400fed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
@@ -14,11 +12,11 @@
 @Entity
 @Table(name = "PARENT1")
 public class Parent1 {
-    @Id
-    @Column(name = "ID")
-    Long id;
+	@Id
+	@Column(name = "ID")
+	Long id;
 
-    public Long getId() {
-        return this.id;
-    }
+	public Long getId() {
+		return this.id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java
index 0c14c094da79..03f2f5537f89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unidir;
 
@@ -23,7 +21,6 @@
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author Vlad Mihalcea
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Alien.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Alien.java
index 95c7d8fdb97d..ae0188c87eae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Alien.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Alien.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Alien.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.unionsubclass;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Being.java
index 0996246eceee..d5e8db02248a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Being.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Being.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Being.java 6007 2005-03-04 12:01:43Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -70,9 +66,9 @@ public void setThings(List things) {
 	public Map getInfo() {
 		return info;
 	}
-	
+
 	public void setInfo(Map info) {
 		this.info = info;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Employee.java
index f3a1f3dd5123..23b3d82579a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 6673 2005-05-03 22:59:24Z epbernard $
 package org.hibernate.orm.test.unionsubclass;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Hive.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Hive.java
index fcbae3095018..8745a2d7a7b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Hive.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Hive.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Hive.java 5686 2005-02-12 07:27:32Z steveebersole $
 package org.hibernate.orm.test.unionsubclass;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Human.java
index 3d65e37502ad..863d356e1aa0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Human.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Human.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Human.java 4364 2004-08-17 12:10:32Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass;
 
 
@@ -14,7 +10,7 @@
  */
 public class Human extends Being {
 	private char sex;
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Location.java
index 11f9359c9275..51bb2f088e01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Location.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Location.java 4357 2004-08-17 09:20:17Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,13 +13,13 @@ public class Location {
 	private long id;
 	private String name;
 	private Collection beings = new ArrayList();
-	
+
 	Location() {}
-	
+
 	public Location(String name) {
 		this.name = name;
 	}
-	
+
 	public void addBeing(Being b) {
 		b.setLocation(this);
 		beings.add(b);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Thing.java
index a92427f5aa93..cb04d25072e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/Thing.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Thing.java 4418 2004-08-22 13:38:16Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java
index 899d4ff3ffa4..e8b8fd67f160 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass;
 
@@ -525,28 +523,28 @@ public void testBulkOperationsWithDifferentConnections() throws Exception {
 			inTransaction( s2 -> {
 				// Force connection acquisition
 				s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
-							   // Check same assertions for s2 as was done for s1.
+							// Check same assertions for s2 as was done for s1.
 				assertTrue( s2.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected() );
-							   assertEquals(
-									   PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION,
-									   s2.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
-							   );
-
-							   // Get the Connection s2 will use.
-							   Connection connection2 = s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
-
-							   // Assert that connection2 is not the same as connection1
-							   assertNotSame( connection1, connection2 );
-
-							   // Execute a bulk operation on s2 (using connection2)
-							   assertEquals(
-									   1,
-									   s2.createQuery( "delete from Being where species = 'Martian'" ).executeUpdate()
-							   );
-
-							   // Assert the Connection has not changed
-							   assertSame( connection2, s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection() );
-						   }
+							assertEquals(
+									PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION,
+									s2.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode()
+							);
+
+							// Get the Connection s2 will use.
+							Connection connection2 = s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
+
+							// Assert that connection2 is not the same as connection1
+							assertNotSame( connection1, connection2 );
+
+							// Execute a bulk operation on s2 (using connection2)
+							assertEquals(
+									1,
+									s2.createQuery( "delete from Being where species = 'Martian'" ).executeUpdate()
+							);
+
+							// Assert the Connection has not changed
+							assertSame( connection2, s2.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection() );
+						}
 			);
 
 			// Assert that the Connection used by s1 has hot changed.
@@ -575,4 +573,3 @@ public void testBulkOperationsWithDifferentConnections() throws Exception {
 				} );
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/CarBuyer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/CarBuyer.java
index e935431b688c..b72ce27782cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/CarBuyer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/CarBuyer.java
@@ -1,43 +1,41 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass.alias;
 
 
 /**
- * 
+ *
  * @author Strong Liu
  */
 public class CarBuyer extends Customer {
-    private String sellerName;
-    private String pid;
-    private Seller seller;
+	private String sellerName;
+	private String pid;
+	private Seller seller;
 
-    public String getSellerName() {
-        return sellerName;
-    }
+	public String getSellerName() {
+		return sellerName;
+	}
 
-    public void setSellerName( String sellerName ) {
-        this.sellerName = sellerName;
-    }
+	public void setSellerName( String sellerName ) {
+		this.sellerName = sellerName;
+	}
 
-    public String getPid() {
-        return pid;
-    }
+	public String getPid() {
+		return pid;
+	}
 
-    public void setPid( String pid ) {
-        this.pid = pid;
-    }
+	public void setPid( String pid ) {
+		this.pid = pid;
+	}
 
-    public Seller getSeller() {
-        return seller;
-    }
+	public Seller getSeller() {
+		return seller;
+	}
 
-    public void setSeller( Seller seller ) {
-        this.seller = seller;
-    }
+	public void setSeller( Seller seller ) {
+		this.seller = seller;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Customer.java
index 05f044086609..4f91444b290e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Customer.java
@@ -1,39 +1,37 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass.alias;
 import java.io.Serializable;
 
 /**
- * 
+ *
  * @author Strong Liu
  */
 public abstract class Customer implements Serializable {
-    private PersonID id;
+	private PersonID id;
 
-    public PersonID getId() {
-        return id;
-    }
+	public PersonID getId() {
+		return id;
+	}
 
-    public void setId( PersonID id ) {
-        this.id = id;
-    }
+	public void setId( PersonID id ) {
+		this.id = id;
+	}
 
-    public boolean equals( Object obj ) {
-        if ( obj == null )
-            return false;
-        if ( obj == this )
-            return true;
-        if ( !( obj instanceof Customer ) )
-            return false;
-        return ( (Customer) obj ).getId().equals( getId() );
-    }
+	public boolean equals( Object obj ) {
+		if ( obj == null )
+			return false;
+		if ( obj == this )
+			return true;
+		if ( !( obj instanceof Customer ) )
+			return false;
+		return ( (Customer) obj ).getId().equals( getId() );
+	}
 
-    public int hashCode() {
-        return id.hashCode();
-    }
+	public int hashCode() {
+		return id.hashCode();
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/PersonID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/PersonID.java
index 2a4f9c5c4539..43efe6ae2627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/PersonID.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/PersonID.java
@@ -1,76 +1,74 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass.alias;
 import java.io.Serializable;
 
 /**
- * 
+ *
  * @author Strong Liu
  */
 public class PersonID implements Serializable {
-    private Long num;
-    private String name;
+	private Long num;
+	private String name;
 
-    public Long getNum() {
-        return num;
-    }
+	public Long getNum() {
+		return num;
+	}
 
-    public void setNum( Long num ) {
-        this.num = num;
-    }
+	public void setNum( Long num ) {
+		this.num = num;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName( String name ) {
-        this.name = name;
-    }
+	public void setName( String name ) {
+		this.name = name;
+	}
 
-    public boolean equals( Object obj ) {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        final PersonID other = (PersonID) obj;
-        if ( name == null ) {
-            if ( other.name != null )
-                return false;
+	public boolean equals( Object obj ) {
+		if ( this == obj )
+			return true;
+		if ( obj == null )
+			return false;
+		if ( getClass() != obj.getClass() )
+			return false;
+		final PersonID other = (PersonID) obj;
+		if ( name == null ) {
+			if ( other.name != null )
+				return false;
 
-        } else if ( !name.equals( other.name ) ) {
-            return false;
-        }
-        if ( num == null ) {
-            if ( other.num != null )
-                return false;
+		} else if ( !name.equals( other.name ) ) {
+			return false;
+		}
+		if ( num == null ) {
+			if ( other.num != null )
+				return false;
 
-        } else if ( !num.equals( other.num ) ) {
-            return false;
-        }
-        return true;
-    }
+		} else if ( !num.equals( other.num ) ) {
+			return false;
+		}
+		return true;
+	}
 
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        if ( name != null ) {
-            result += name.hashCode();
-        }
-        result *= PRIME;
-        if ( num != null ) {
-            result += num.hashCode();
-        }
-        return result;
-    }
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		if ( name != null ) {
+			result += name.hashCode();
+		}
+		result *= PRIME;
+		if ( num != null ) {
+			result += num.hashCode();
+		}
+		return result;
+	}
 
-    public String toString() {
-        return name + " | " + num;
-    }
+	public String toString() {
+		return name + " | " + num;
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java
index da122bbdb237..e06b2da20211 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass.alias;
 
@@ -23,52 +21,52 @@
 @JiraKey( value = "HHH-4825" )
 public class SellCarTest extends BaseCoreFunctionalTestCase {
 
-    @Override
-    protected String getBaseForMappings() {
-        return "org/hibernate/orm/test/";
-    }
+	@Override
+	protected String getBaseForMappings() {
+		return "org/hibernate/orm/test/";
+	}
 
-    @Override
-    public String[] getMappings() {
-        return new String[] { "unionsubclass/alias/mapping.hbm.xml" };
-    }
+	@Override
+	public String[] getMappings() {
+		return new String[] { "unionsubclass/alias/mapping.hbm.xml" };
+	}
 
 	@Test
-    public void testSellCar() {
-        prepareData();
-        Session session = openSession();
-        Transaction tx = session.beginTransaction();
-        Query query = session.createQuery( "from Seller" );
-        Seller seller = (Seller) query.uniqueResult();
-        assertNotNull( seller );
-        assertEquals( 1, seller.getBuyers().size() );
-        tx.commit();
-        session.close();
-    }
+	public void testSellCar() {
+		prepareData();
+		Session session = openSession();
+		Transaction tx = session.beginTransaction();
+		Query query = session.createQuery( "from Seller" );
+		Seller seller = (Seller) query.uniqueResult();
+		assertNotNull( seller );
+		assertEquals( 1, seller.getBuyers().size() );
+		tx.commit();
+		session.close();
+	}
 
-    private void prepareData() {
-        Session session = openSession();
-        Transaction tx = session.beginTransaction();
-        session.persist( createData() );
-        tx.commit();
-        session.close();
-    }
+	private void prepareData() {
+		Session session = openSession();
+		Transaction tx = session.beginTransaction();
+		session.persist( createData() );
+		tx.commit();
+		session.close();
+	}
 
 	private Object createData() {
-        Seller stliu = new Seller();
-        stliu.setId( createID( "stliu" ) );
-        CarBuyer zd = new CarBuyer();
-        zd.setId( createID( "zd" ) );
-        zd.setSeller( stliu );
-        zd.setSellerName( stliu.getId().getName() );
-        stliu.getBuyers().add( zd );
-        return stliu;
-    }
+		Seller stliu = new Seller();
+		stliu.setId( createID( "stliu" ) );
+		CarBuyer zd = new CarBuyer();
+		zd.setId( createID( "zd" ) );
+		zd.setSeller( stliu );
+		zd.setSellerName( stliu.getId().getName() );
+		stliu.getBuyers().add( zd );
+		return stliu;
+	}
 
 	private PersonID createID( String name ) {
-        PersonID id = new PersonID();
-        id.setName( name );
-        id.setNum(100L);
-        return id;
-    }
+		PersonID id = new PersonID();
+		id.setName( name );
+		id.setNum(100L);
+		return id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Seller.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Seller.java
index 0fac5a72aa56..4d911ec4e739 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Seller.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/Seller.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass.alias;
 import java.io.Serializable;
@@ -10,42 +8,42 @@
 import java.util.Set;
 
 /**
- * 
+ *
  * @author Strong Liu
  */
 public class Seller implements Serializable {
-    private PersonID id;
-    private Set buyers = new HashSet();
-
-    public PersonID getId() {
-        return id;
-    }
-
-    public void setId( PersonID id ) {
-        this.id = id;
-    }
-
-    public Set getBuyers() {
-        return buyers;
-    }
-
-    public void setBuyers( Set buyers ) {
-        this.buyers = buyers;
-    }
-
-    public boolean equals( Object obj ) {
-        if ( obj == null )
-            return false;
-        if ( obj == this )
-            return true;
-        if ( !( obj instanceof Seller ) )
-            return false;
-
-        return ( (Seller) obj ).getId().equals( getId() );
-    }
-
-    public int hashCode() {
-        return id.hashCode();
-    }
+	private PersonID id;
+	private Set buyers = new HashSet();
+
+	public PersonID getId() {
+		return id;
+	}
+
+	public void setId( PersonID id ) {
+		this.id = id;
+	}
+
+	public Set getBuyers() {
+		return buyers;
+	}
+
+	public void setBuyers( Set buyers ) {
+		this.buyers = buyers;
+	}
+
+	public boolean equals( Object obj ) {
+		if ( obj == null )
+			return false;
+		if ( obj == this )
+			return true;
+		if ( !( obj instanceof Seller ) )
+			return false;
+
+		return ( (Seller) obj ).getId().equals( getId() );
+	}
+
+	public int hashCode() {
+		return id.hashCode();
+	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java
index f562a5816823..62bf0e5314f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Address.java 7192 2005-06-18 14:40:15Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass2;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java
index 948aab4a66ff..e3b566429e95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Customer.java 7192 2005-06-18 14:40:15Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass2;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java
index 92328849c5d3..a88cdd1f80bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Employee.java 7192 2005-06-18 14:40:15Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass2;
 import java.math.BigDecimal;
 
@@ -15,7 +11,7 @@
 public class Employee extends Person {
 	private String title;
 	private BigDecimal salary;
-	private double passwordExpiryDays;	
+	private double passwordExpiryDays;
 	private Employee manager;
 	/**
 	 * @return Returns the title.
@@ -60,9 +56,9 @@ public double getPasswordExpiryDays() {
 		return passwordExpiryDays;
 	}
 	/**
-	 * @param passwordExpiryDays The password expiry policy in days. 
+	 * @param passwordExpiryDays The password expiry policy in days.
 	 */
 	public void setPasswordExpiryDays(double passwordExpiryDays) {
 		this.passwordExpiryDays = passwordExpiryDays;
-	}	
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java
index 9f252331208c..17e9c31782a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 7192 2005-06-18 14:40:15Z oneovthafew $
 package org.hibernate.orm.test.unionsubclass2;
 
 
@@ -38,7 +34,7 @@ public void setCountry(String string) {
 		this.address.country = string;
 	}
 
-	
+
 	/**
 	 * @return Returns the sex.
 	 */
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java
index 9eaa8b787257..ad6ff9c1bfca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass2;
 
@@ -13,13 +11,10 @@
 import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Hibernate;
-import org.hibernate.cfg.MappingSettings;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java
index f233e1be0800..e927e3be2469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.unionsubclass3;
 
@@ -187,14 +185,14 @@ public static class Child
 
 	@Entity(name = "Father")
 	public static class Father extends Parent {
-		
+
 		@Column
 		String fathersDay;
 	}
 
 	@Entity(name = "Mother")
 	public static class Mother extends Parent {
-		
+
 		@Column
 		String mothersDay;
 	}
@@ -206,4 +204,3 @@ public abstract static class Parent {
 		public Long id;
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/NaturalIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/NaturalIdCachingTest.java
index fc49c9c75ecb..0cf7a7372df7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/NaturalIdCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/NaturalIdCachingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.uniquekey;
 
@@ -25,24 +23,24 @@
 
 public class NaturalIdCachingTest extends BaseCoreFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[]{
-                PropertyHolder.class,
-                Property.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[]{
+				PropertyHolder.class,
+				Property.class
+		};
+	}
 
-    @Override
-    protected void configure(Configuration configuration) {
-        super.configure(configuration);
-        configuration.setProperty(AvailableSettings.SHOW_SQL, true);
-        configuration.setProperty(AvailableSettings.GENERATE_STATISTICS, true);
-    }
+	@Override
+	protected void configure(Configuration configuration) {
+		super.configure(configuration);
+		configuration.setProperty(AvailableSettings.SHOW_SQL, true);
+		configuration.setProperty(AvailableSettings.GENERATE_STATISTICS, true);
+	}
 
 
-    @Test
-    public void test() throws Exception {
+	@Test
+	public void test() throws Exception {
 		doInHibernate( this::sessionFactory, session -> {
 			Property property = new Property( 1, 1, 1 );
 			session.persist( property );
@@ -50,7 +48,7 @@ public void test() throws Exception {
 			session.persist( new PropertyHolder( 2, property ) );
 		} );
 
-        assertThat(sessionFactory().getStatistics().getEntityInsertCount(), is(3L));
+		assertThat(sessionFactory().getStatistics().getEntityInsertCount(), is(3L));
 		sessionFactory().getStatistics().clear();
 
 		doInHibernate( this::sessionFactory, session -> {
@@ -60,9 +58,9 @@ public void test() throws Exception {
 
 		assertThat( sessionFactory().getStatistics().getEntityLoadCount(), is(3L) );
 		assertThat( sessionFactory().getStatistics().getPrepareStatementCount(), is(3L) );
-    }
+	}
 
-    @Entity(name = "PropertyHolder")
+	@Entity(name = "PropertyHolder")
 	public static class PropertyHolder implements Serializable {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java
index dde9f2e47e17..9c1853dee198 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.uniquekey;
 
 import org.hibernate.NaturalIdLoadAccess;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java
index 9bbb45a0a6bc..d7d5f02a207f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
@@ -22,20 +20,20 @@ public class BytesHelperTest extends BaseUnitTestCase {
 	public void testAsLongNullArray() {
 		assertEquals(0, BytesHelper.asLong(null, 0));
 	}
-	
+
 	@Test(expected=IllegalArgumentException.class)
 	public void testAsLongArrayTooSmall() {
 		byte[] src = new byte[16];
 		assertEquals(0, BytesHelper.asLong(src, 9));
 	}
-	
+
 	@Test
 	public void testAsLong() {
 		byte[] src = new byte[] {-92, -120, -59, -64, 97, 55, -41, -55, 64, -43, 20, 109, -7, -95, 77, -115};
 		assertEquals(-6590800624601278519L, BytesHelper.asLong(src, 0));
 		assertEquals(4671662651038846349L, BytesHelper.asLong(src, 8));
 	}
-	
+
 	@Test
 	public void testfromLong() {
 		byte[] expected = new byte[] {-92, -120, -59, -64, 97, 55, -41, -55, 64, -43, 20, 109, -7, -95, 77, -115};
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java
index 6b83b38abd49..ba7f71685e21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.util;
 
 import java.sql.Connection;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java
index 1c24214f6192..91b4ae2fc32a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 import java.util.Properties;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java
index e5d8832098a3..b5d1b6e9ea51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java
index 5d4a5394fd18..9bdac8864c18 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java
index 52954ca98a4b..6bb050c54b2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java
index 8b379d44ea2b..3f1412273749 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 import java.io.InputStream;
@@ -63,9 +61,9 @@ public void testSerializeDeserialize() throws Exception {
 
 	public void testSerDeserClassUnknownToCustomLoader() throws Exception {
 		Object instance = LockMode.OPTIMISTIC;
-		assertSame( 
+		assertSame(
 			SerializationHelper.hibernateClassLoader(),
-			instance.getClass().getClassLoader() 
+			instance.getClass().getClassLoader()
 		);
 
 		// SerializableType.toBytes() logic, as called from SerializableType.disassemble()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java
index 1988faca923c..8de2c1b92525 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
index ccd4eb262fe3..9a32e7baf7c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
@@ -11,7 +9,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.internal.util.StringHelper;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/BaseDataSource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/BaseDataSource.java
index 7b35e4cacd70..d0d84dbf648f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/BaseDataSource.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/BaseDataSource.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.util.connections;
 
 import java.io.PrintWriter;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionBaseDelegate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionBaseDelegate.java
index ff153684f02b..82501c37333b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionBaseDelegate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionBaseDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util.connections;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionCheckingConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionCheckingConnectionProvider.java
index 20d65d03d5a8..61b33f75a8bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionCheckingConnectionProvider.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/connections/ConnectionCheckingConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util.connections;
 
@@ -119,4 +117,3 @@ public void close() throws SQLException {
 	}
 
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java
index ddd5339abe3f..9d8d4e2518bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util.dtd;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java
index 4b5d073047d9..15a76e515a97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util.dtd;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java
index 0fb95adf69a1..cdc40509209d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util.dtd;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/DetachedEntityWithNullVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/DetachedEntityWithNullVersionTest.java
index e4c1e090a367..585ef2ba694f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/DetachedEntityWithNullVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/DetachedEntityWithNullVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.version;
 
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java
index be0cf12e066b..0b95fa689891 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.version;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java
index 84d775551f79..cc4667834e30 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java
index d8ef1f627242..6edeb4f58993 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java
index dbf3ef5de37f..3cb524aa1760 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java
index cb5917b7aeee..24c1b8daf9bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Person.java 7676 2005-07-29 06:27:10Z oneovthafew $
 package org.hibernate.orm.test.version;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +11,7 @@ public class Person {
 	private List things;
 	private List tasks;
 	private int version;
-	
+
 	Person() {}
 	public Person(String name) {
 		this.name = name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java
index 96bcf70fe5f3..468acc7f05ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Task.java 7676 2005-07-29 06:27:10Z oneovthafew $
 package org.hibernate.orm.test.version;
 
 
@@ -13,7 +9,7 @@ public class Task {
 	private String description;
 	private Person person;
 	private int version;
-	
+
 	public int getVersion() {
 		return version;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java
index 7325a054ad01..2653a1083598 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: Thing.java 7715 2005-08-01 16:46:57Z oneovthafew $
 package org.hibernate.orm.test.version;
 
 
@@ -14,7 +10,7 @@ public class Thing {
 	private Person person;
 	private int version;
 	private String longDescription;
-	
+
 	public int getVersion() {
 		return version;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java
index f6799436de18..6fe78b5f7685 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.version;
 
 import java.io.Serializable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionSeedUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionSeedUpdateTest.java
index 70b504f2cd9e..33b6dcd38aaf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionSeedUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionSeedUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java
index ead9c51e29bd..c54af9b043b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java
@@ -1,14 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
 
 import org.junit.Test;
 
@@ -74,7 +69,7 @@ public void testMetamodelContainsHbmVersion() {
 			session.getMetamodel().entity( Person.class ).getAttribute( "version" );
 		}
 	}
-	
+
 	@Test
 	public void testCollectionVersion() {
 		Session s = openSession();
@@ -84,16 +79,16 @@ public void testCollectionVersion() {
 		s.persist(gavin);
 		t.commit();
 		s.close();
-		
+
 		assertEquals(0, gavin.getVersion());
-		
+
 		s = openSession();
 		t = s.beginTransaction();
 		gavin = getPerson( s );
 		new Thing("Laptop", gavin);
 		t.commit();
 		s.close();
-		
+
 		assertEquals(1, gavin.getVersion());
 		assertFalse( Hibernate.isInitialized( gavin.getThings() ) );
 
@@ -103,7 +98,7 @@ public void testCollectionVersion() {
 		gavin.getThings().clear();
 		t.commit();
 		s.close();
-		
+
 		assertEquals(2, gavin.getVersion());
 		assertTrue( Hibernate.isInitialized( gavin.getThings() ) );
 
@@ -113,7 +108,7 @@ public void testCollectionVersion() {
 		t.commit();
 		s.close();
 	}
-	
+
 	@Test
 	public void testCollectionNoVersion() {
 		Session s = openSession();
@@ -123,16 +118,16 @@ public void testCollectionNoVersion() {
 		s.persist(gavin);
 		t.commit();
 		s.close();
-		
+
 		assertEquals(0, gavin.getVersion());
-		
+
 		s = openSession();
 		t = s.beginTransaction();
 		gavin = getPerson( s );
 		new Task("Document", gavin);
 		t.commit();
 		s.close();
-		
+
 		assertEquals(0, gavin.getVersion());
 		assertFalse( Hibernate.isInitialized( gavin.getTasks() ) );
 
@@ -142,7 +137,7 @@ public void testCollectionNoVersion() {
 		gavin.getTasks().clear();
 		t.commit();
 		s.close();
-		
+
 		assertEquals(0, gavin.getVersion());
 		assertTrue( Hibernate.isInitialized( gavin.getTasks() ) );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionedBidirectionalOneToOneMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionedBidirectionalOneToOneMergeTest.java
index ab44c3821761..1e68ef3cc6dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionedBidirectionalOneToOneMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionedBidirectionalOneToOneMergeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.version;
 
 import java.util.UUID;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java
index 83639da82bc1..98666e3794a2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java
index 8960a4239240..9a93e127f700 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.db;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Group.java
index 1964581835bb..52194d1c8630 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Group.java 7736 2005-08-03 20:03:34Z steveebersole $
 package org.hibernate.orm.test.version.db;
 import java.util.Date;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Permission.java
index dad2cd4517c3..eb58105c01c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Permission.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/Permission.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Permission.java 7736 2005-08-03 20:03:34Z steveebersole $
 package org.hibernate.orm.test.version.db;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/User.java
index 7db521aee3b1..a5251c0321ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: User.java 7736 2005-08-03 20:03:34Z steveebersole $
 package org.hibernate.orm.test.version.db;
 import java.sql.Timestamp;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java
index 9023bc80dbbd..eda918e8b4d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.mappedsuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java
index cd143a8062ba..5bfff42a5015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.mappedsuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/TestEntity.java
index a641e1bd78de..25dc97704828 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/TestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.mappedsuperclass;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Group.java
index 01e6621054df..5ade861d98d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Group.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Group.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Group.java 7805 2005-08-10 16:25:11Z steveebersole $
 package org.hibernate.orm.test.version.sybase;
 import java.util.Date;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Permission.java
index 0019c0f2cd2a..3689a299e31c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Permission.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/Permission.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: Permission.java 7805 2005-08-10 16:25:11Z steveebersole $
 package org.hibernate.orm.test.version.sybase;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java
index 992359a03976..8ebf2322fb36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.sybase;
 
@@ -36,7 +34,7 @@ public class SybaseTimestampComparisonAnnotationsTest extends BaseCoreFunctional
 	@Test
 	@JiraKey( value = "HHH-10413" )
 	public void testComparableTimestamps() {
-        final BasicType versionType = sessionFactory()
+		final BasicType versionType = sessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(Thing.class.getName()).getVersionType();
 		assertTrue( versionType.getJavaTypeDescriptor() instanceof PrimitiveByteArrayJavaType );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java
index ae707667852e..f37acd82d630 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.version.sybase;
 
@@ -261,7 +259,7 @@ private static void sleep() {
 	@Test
 	@JiraKey( value = "HHH-10413" )
 	public void testComparableTimestamps() {
-        final BasicType versionType = sessionFactory()
+		final BasicType versionType = sessionFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor(User.class.getName())
 				.getVersionType();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/User.java
index b98f7c26b21e..09d085004090 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/User.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/User.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-// $Id: User.java 7805 2005-08-10 16:25:11Z steveebersole $
 package org.hibernate.orm.test.version.sybase;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
index c340cc66470c..4bd152751b86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.view;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java
index 7f437eda185e..280daefb3633 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.where.annotations;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java
index bd55951e5591..ad07fced3df4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.where.annotations;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
index 7fffd55eba48..590340389408 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java
index 5666cd56c217..d8e1dde5c0cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.where.annotations;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java
index 67f097582275..c59526cb7e2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java
index c510ed1ebda4..359c40188b21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java
index 8cf67de211ce..957a053ef55d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java
index 4ac36753eb4d..cb312e674a3f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
index 80f166d5a8d2..821fdfc3cb72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
index 2d36a9692f91..59cffc5f675a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
@@ -101,7 +99,7 @@ public void setup() {
 
 		doInHibernate(
 				this::sessionFactory, session -> {
-					
+
 					session.createNativeQuery( "insert into MAIN_TABLE(ID, NAME, CODE) VALUES( 1, 'plastic', 'MATERIAL' )" )
 							.executeUpdate();
 					session.createNativeQuery( "insert into MAIN_TABLE(ID, NAME, CODE) VALUES( 1, 'house', 'BUILDING' )" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
index e51869c1239b..d173f976acbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
@@ -74,10 +72,10 @@ public void setup() {
 					).executeUpdate();
 				}
 		);
-		
+
 		doInHibernate(
 				this::sessionFactory, session -> {
-					
+
 					session.createNativeQuery( "insert into MAIN_TABLE(ID, NAME, CODE) VALUES( 1, 'plastic', 'MATERIAL' )" )
 							.executeUpdate();
 					session.createNativeQuery( "insert into MAIN_TABLE(ID, NAME, CODE) VALUES( 1, 'house', 'BUILDING' )" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java
index ed010a5a04d9..a919176d6135 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java
index a8965ffd61cc..29adcd6a7ffd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.annotations;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java
index dde86ff2816e..462c8ac15f3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.where.annotations;
 
 import org.hibernate.annotations.SQLRestriction;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Category.java
index 311389a0473e..00119081ff56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Category.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java
index e3a1e35854bc..fbb4850a14b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java
index 3e84b60f5b1e..a4fc66578321 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java
@@ -1,16 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java
index 48015f567558..de60b3cb6dca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java
index 2f8a4bb11fd3..bf049b390bad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/File.java
index b37bc2a32489..ff29df883e95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/File.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/File.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-//$Id: File.java 8043 2005-08-30 15:20:42Z oneovthafew $
 package org.hibernate.orm.test.where.hbm;
 import java.util.Set;
 
@@ -15,7 +11,7 @@ public class File {
 	private File parent;
 	private boolean deleted;
 	private Set children;
-	
+
 	public Set getChildren() {
 		return children;
 	}
@@ -27,9 +23,9 @@ public File(String name, File parent) {
 		this.name = name;
 		this.parent = parent;
 	}
-	
+
 	File() {}
-	
+
 	public boolean isDeleted() {
 		return deleted;
 	}
@@ -54,5 +50,5 @@ public File getParent() {
 	public void setParent(File parent) {
 		this.parent = parent;
 	}
-	
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
index 4f5c06c12c17..658b5a595fb5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
index 8a4bc9ac0545..6fec3ca4ef82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
index 6425d02cd414..9a183d988dfc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
index a38b22575b21..8e5434c804c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
index 6000f2f799e4..d1bbfd8d36e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java
index 9e94135c034c..b3a657bb6d03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereUseClassWhereTest.java
index 064ef42209db..0c10aa03187a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereUseClassWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereUseClassWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Product.java
index 7b4ce44b76cf..4f747b71ac05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java
index 157811f7049e..55df5ca29800 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.where.hbm;
 
@@ -134,4 +132,3 @@ public void testNativeQuery() {
 		);
 	}
 }
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java
index 3cd884872537..5d33a77907a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write;
 
@@ -55,9 +53,9 @@ public void testBasicOperations(SessionFactoryScope scope) {
 	@SQLDelete( sql = "delete from custom_entity where id = ?" )
 	@SQLUpdate( sql = "update custom_entity set name = ? where id = ? " )
 	public static class CustomEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private CustomEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlWithExpectationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlWithExpectationTests.java
index 12cf3857456e..38df8f39c8af 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlWithExpectationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/CustomSqlWithExpectationTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write;
 
@@ -78,9 +76,9 @@ public int prepare(PreparedStatement statement) throws SQLException, HibernateEx
 	@SQLDelete( sql = "delete from custom_entity where id = ?", verify = Custom.class )
 	@SQLUpdate( sql = "update custom_entity set name = ? where id = ? ", verify = Custom.class )
 	public static class CustomEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		CustomEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java
index d6dbd420a02a..c91783825bf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write;
 
@@ -357,5 +355,3 @@ public void setController(String controller) {
 		}
 	}
 }
-
-
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java
index be1ba24e0086..16030723ec1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write;
 
@@ -99,9 +97,9 @@ void cleanUpTestData(SessionFactoryScope scope) {
 	@Table( name = "entities" )
 	@SecondaryTable( name = "supplements" )
 	public static class TheEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 		@Basic
 		@Column( table = "supplements" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java
index 1d0e0886202e..08b0104bf4cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write;
 
@@ -54,9 +52,9 @@ public void dropTestData(SessionFactoryScope scope) {
 	@Entity( name = "SimpleEntity" )
 	@Table( name = "SimpleEntity" )
 	public static class SimpleEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private SimpleEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleNullabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleNullabilityTest.java
index 681718518079..ae3497517671 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleNullabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleNullabilityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write.staticinsert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java
index b59b2c1e2c0c..1cc3c4662f1e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write.staticinsert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java
index efffd81bab56..72da32afaecb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write.staticinsert;
 
@@ -85,9 +83,9 @@ public void verify(SessionFactoryScope scope, int expectedPrepCount) {
 	@Entity( name = "SimpleEntity" )
 	@Table( name = "SimpleEntity" )
 	public static class SimpleEntity {
-	    @Id
-	    private Integer id;
-	    @Basic
+		@Id
+		private Integer id;
+		@Basic
 		private String name;
 
 		private SimpleEntity() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java
index 6bf0de5077a8..497e12805296 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.write.staticinsert;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java b/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java
index a7776095eb41..144dcdb849d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.schema.internal;
 
@@ -42,40 +40,40 @@
  */
 public class AbstractSchemaMigratorTest {
 
-    @Test
-    @JiraKey(value = "HHH-13779")
-    public void testForeignKeyPreExistenceDetectionIgnoresCaseForTableAndColumnName() {
-        final AbstractSchemaMigrator schemaMigrator = new AbstractSchemaMigrator(null, null) {
-            @Override
-            protected NameSpaceTablesInformation performTablesMigration(Metadata metadata,
+	@Test
+	@JiraKey(value = "HHH-13779")
+	public void testForeignKeyPreExistenceDetectionIgnoresCaseForTableAndColumnName() {
+		final AbstractSchemaMigrator schemaMigrator = new AbstractSchemaMigrator(null, null) {
+			@Override
+			protected NameSpaceTablesInformation performTablesMigration(Metadata metadata,
 					DatabaseInformation existingDatabase, ExecutionOptions options,ContributableMatcher contributableInclusionFilter, Dialect dialect,
 					Formatter formatter, Set exportIdentifiers, boolean tryToCreateCatalogs,
 					boolean tryToCreateSchemas, Set exportedCatalogs, Namespace namespace,
 					SqlStringGenerationContext sqlStringGenerationContext,
 					GenerationTarget[] targets) { return null; }
-        };
+		};
 
-        final TableInformation existingTableInformation = mock(TableInformation.class);
-        final ArrayList columnReferenceMappings = new ArrayList<>();
+		final TableInformation existingTableInformation = mock(TableInformation.class);
+		final ArrayList columnReferenceMappings = new ArrayList<>();
 
-        final TableInformation destinationTableInformation = mock(TableInformation.class);
-        doReturn(new QualifiedTableName(toIdentifier("catalog"), toIdentifier("schema"),
-                toIdentifier("referenced_table"))) // Table name is lower case
-                .when(destinationTableInformation).getName();
-        columnReferenceMappings.add(new ForeignKeyInformationImpl.ColumnReferenceMappingImpl(
-                new ColumnInformationImpl(null, toIdentifier("referencing_column"), // column name is lower case
-                        0, "typeName", 255, 0, TruthValue.TRUE),
-                new ColumnInformationImpl(destinationTableInformation, null, 1, "typeName", 0, 0, TruthValue.TRUE)));
-        doReturn(singletonList(new ForeignKeyInformationImpl(toIdentifier("FKp8mpamfw2inhj88hwhty1eipm"), columnReferenceMappings)))
-                .when(existingTableInformation).getForeignKeys();
+		final TableInformation destinationTableInformation = mock(TableInformation.class);
+		doReturn(new QualifiedTableName(toIdentifier("catalog"), toIdentifier("schema"),
+				toIdentifier("referenced_table"))) // Table name is lower case
+				.when(destinationTableInformation).getName();
+		columnReferenceMappings.add(new ForeignKeyInformationImpl.ColumnReferenceMappingImpl(
+				new ColumnInformationImpl(null, toIdentifier("referencing_column"), // column name is lower case
+						0, "typeName", 255, 0, TruthValue.TRUE),
+				new ColumnInformationImpl(destinationTableInformation, null, 1, "typeName", 0, 0, TruthValue.TRUE)));
+		doReturn(singletonList(new ForeignKeyInformationImpl(toIdentifier("FKp8mpamfw2inhj88hwhty1eipm"), columnReferenceMappings)))
+				.when(existingTableInformation).getForeignKeys();
 
-        final boolean existInDatabase = schemaMigrator.equivalentForeignKeyExistsInDatabase(
-                existingTableInformation,
-                "REFERENCING_COLUMN", "REFERENCED_TABLE"); // Table and column names are UPPER-case here, to prove the test
+		final boolean existInDatabase = schemaMigrator.equivalentForeignKeyExistsInDatabase(
+				existingTableInformation,
+				"REFERENCING_COLUMN", "REFERENCED_TABLE"); // Table and column names are UPPER-case here, to prove the test
 
-        assertThat("Expected ForeignKey pre-existence check to be case-insensitive",
-                existInDatabase,
-                is(true));
-    }
+		assertThat("Expected ForeignKey pre-existence check to be case-insensitive",
+				existInDatabase,
+				is(true));
+	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java
index 42dc2cfcae63..b266eacf833a 100644
--- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java
+++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.demo;
 import java.util.Set;
@@ -18,83 +16,83 @@
  */
 @Entity
 public class Address {
-    @Id
-    @GeneratedValue
-    private int id;
+	@Id
+	@GeneratedValue
+	private int id;
 
-    @Audited
-    private String streetName;
+	@Audited
+	private String streetName;
 
-    @Audited
-    private Integer houseNumber;
+	@Audited
+	private Integer houseNumber;
 
-    @Audited
-    private Integer flatNumber;
+	@Audited
+	private Integer flatNumber;
 
-    @Audited
-    @OneToMany(mappedBy = "address")
-    private Set persons;
+	@Audited
+	@OneToMany(mappedBy = "address")
+	private Set persons;
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public String getStreetName() {
-        return streetName;
-    }
+	public String getStreetName() {
+		return streetName;
+	}
 
-    public void setStreetName(String streetName) {
-        this.streetName = streetName;
-    }
+	public void setStreetName(String streetName) {
+		this.streetName = streetName;
+	}
 
-    public Integer getHouseNumber() {
-        return houseNumber;
-    }
+	public Integer getHouseNumber() {
+		return houseNumber;
+	}
 
-    public void setHouseNumber(Integer houseNumber) {
-        this.houseNumber = houseNumber;
-    }
+	public void setHouseNumber(Integer houseNumber) {
+		this.houseNumber = houseNumber;
+	}
 
-    public Integer getFlatNumber() {
-        return flatNumber;
-    }
+	public Integer getFlatNumber() {
+		return flatNumber;
+	}
 
-    public void setFlatNumber(Integer flatNumber) {
-        this.flatNumber = flatNumber;
-    }
+	public void setFlatNumber(Integer flatNumber) {
+		this.flatNumber = flatNumber;
+	}
 
-    public Set getPersons() {
-        return persons;
-    }
+	public Set getPersons() {
+		return persons;
+	}
 
-    public void setPersons(Set persons) {
-        this.persons = persons;
-    }
+	public void setPersons(Set persons) {
+		this.persons = persons;
+	}
 
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Address)) return false;
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof Address)) return false;
 
-        Address address = (Address) o;
+		Address address = (Address) o;
 
-        if (id != address.id) return false;
-        if (flatNumber != null ? !flatNumber.equals(address.flatNumber) : address.flatNumber != null) return false;
-        if (houseNumber != null ? !houseNumber.equals(address.houseNumber) : address.houseNumber != null) return false;
-        if (streetName != null ? !streetName.equals(address.streetName) : address.streetName != null) return false;
+		if (id != address.id) return false;
+		if (flatNumber != null ? !flatNumber.equals(address.flatNumber) : address.flatNumber != null) return false;
+		if (houseNumber != null ? !houseNumber.equals(address.houseNumber) : address.houseNumber != null) return false;
+		if (streetName != null ? !streetName.equals(address.streetName) : address.streetName != null) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public int hashCode() {
-        int result;
-        result = id;
-        result = 31 * result + (streetName != null ? streetName.hashCode() : 0);
-        result = 31 * result + (houseNumber != null ? houseNumber.hashCode() : 0);
-        result = 31 * result + (flatNumber != null ? flatNumber.hashCode() : 0);
-        return result;
-    }
+	public int hashCode() {
+		int result;
+		result = id;
+		result = 31 * result + (streetName != null ? streetName.hashCode() : 0);
+		result = 31 * result + (houseNumber != null ? houseNumber.hashCode() : 0);
+		result = 31 * result + (flatNumber != null ? flatNumber.hashCode() : 0);
+		return result;
+	}
 }
diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java
index 7673f68d2739..6f6642f0a9fc 100644
--- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java
+++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.demo;
 import jakarta.persistence.Entity;
@@ -17,70 +15,70 @@
  */
 @Entity
 public class Person {
-    @Id
-    @GeneratedValue
-    private int id;
+	@Id
+	@GeneratedValue
+	private int id;
 
-    @Audited
-    private String name;
+	@Audited
+	private String name;
 
-    @Audited
-    private String surname;
+	@Audited
+	private String surname;
 
-    @Audited
-    @ManyToOne
-    private Address address;
+	@Audited
+	@ManyToOne
+	private Address address;
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public String getSurname() {
-        return surname;
-    }
+	public String getSurname() {
+		return surname;
+	}
 
-    public void setSurname(String surname) {
-        this.surname = surname;
-    }
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
 
-    public Address getAddress() {
-        return address;
-    }
+	public Address getAddress() {
+		return address;
+	}
 
-    public void setAddress(Address address) {
-        this.address = address;
-    }
+	public void setAddress(Address address) {
+		this.address = address;
+	}
 
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Person)) return false;
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof Person)) return false;
 
-        Person person = (Person) o;
+		Person person = (Person) o;
 
-        if (id != person.id) return false;
-        if (name != null ? !name.equals(person.name) : person.name != null) return false;
-        if (surname != null ? !surname.equals(person.surname) : person.surname != null) return false;
+		if (id != person.id) return false;
+		if (name != null ? !name.equals(person.name) : person.name != null) return false;
+		if (surname != null ? !surname.equals(person.surname) : person.surname != null) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public int hashCode() {
-        int result;
-        result = id;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + (surname != null ? surname.hashCode() : 0);
-        return result;
-    }
+	public int hashCode() {
+		int result;
+		result = id;
+		result = 31 * result + (name != null ? name.hashCode() : 0);
+		result = 31 * result + (surname != null ? surname.hashCode() : 0);
+		return result;
+	}
 }
diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java
index f4f52fe6d73b..a99867b80fd4 100644
--- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java
+++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.demo;
 import java.io.PrintStream;
@@ -26,432 +24,432 @@
  * @author Adam Warski (adam at warski dot org)
  */
 public class TestConsole {
-    private EntityManager entityManager;
-
-    public TestConsole(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-    private String convertString(String s, String def) {
-        if ("NULL".equals(s)) { return null; }
-        if ("".equals(s)) { return def; }
-        return s;
-    }
-
-    private int convertStringToInteger(String s, int def) {
-        if ("".equals(s)) { return def; }
-        try {
-            return Integer.parseInt(s);
-        } catch (NumberFormatException e) {
-            System.err.println("Invalid number, returning 0.");
-            return 0;
-        }
-    }
-
-    private void printPerson(StringBuilder sb, Person p) {
-        sb.append("id = ").append(p.getId()).append(", name = ").append(p.getName())
-                .append(", surname = ").append(p.getSurname());
-
-        Address a = p.getAddress();
-        if (a != null) {
-            sb.append(", address = <").append(a.getId()).append("> ").append(a.getStreetName()).append(" ")
-                    .append(a.getHouseNumber()).append("/").append(a.getFlatNumber());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void printPersons(StringBuilder sb) {
-        List persons = entityManager.createQuery(
-                "select p from Person p order by p.id").getResultList();
-
-        sb.append("Persons:\n");
-        for (Person p : persons) {
-            printPerson(sb, p);
-            sb.append("\n");
-        }
-    }
-
-    private void printPersonHistory(StringBuilder sb, int personId) {
-        AuditReader reader = AuditReaderFactory.get(entityManager);
-
-        List personHistory = reader.createQuery()
-                .forRevisionsOfEntity(Person.class, false, true)
-                .add(AuditEntity.id().eq(personId))
-                .getResultList();
-
-        if (personHistory.size() == 0) {
-            sb.append("A person with id ").append(personId).append(" does not exist.\n");
-        } else {
-            for (Object historyObj : personHistory) {
-                Object[] history = (Object[]) historyObj;
-                DefaultRevisionEntity revision = (DefaultRevisionEntity) history[1];
-                sb.append("revision = ").append(revision.getId()).append(", ");
-                printPerson(sb, (Person) history[0]);
-                sb.append(" (").append(revision.getRevisionDate()).append(")\n");
-            }
-        }
-    }
-
-    private void printPersonAtRevision(StringBuilder sb, int personId, int revision) {
-        AuditReader reader = AuditReaderFactory.get(entityManager);
-
-        Person p = reader.find(Person.class, personId, revision);
-        if (p == null) {
-            sb.append("This person does not exist at that revision.");
-        } else {
-            printPerson(sb, p);
-        }
-    }
-
-    private void readAndSetAddress(Scanner scanner, Person p) {
-        Address old = p.getAddress();
-
-        String input = scanner.nextLine();
-        if ("NULL".equals(input)) {
-            p.setAddress(null);
-            if (old != null) {
-                old.getPersons().remove(p);
-            }
-        } else if ("".equals(input)) {
-        } else {
-            try {
-                Integer id = Integer.valueOf(input);
-
-                Address a = entityManager.find(Address.class, id);
-
-                if (a == null) {
-                    System.err.println("Unknown address id, setting to NULL.");
-                    p.setAddress(null);
-                    if (old != null) {
-                        old.getPersons().remove(p);
-                    }
-                } else {
-                    p.setAddress(a);
-
-                    a.getPersons().add(p);
-
-                    if (old != null) {
-                        old.getPersons().remove(p);
-                    }
-                }
-            } catch (NumberFormatException e) {
-                System.err.println("Invalid address id, setting to NULL.");
-                p.setAddress(null);
-                if (old != null) {
-                    old.getPersons().remove(p);
-                }
-            }
-        }
-    }
-
-    private Person readNewPerson(PrintStream out, Scanner scanner) {
-        Person p = new Person();
-
-        out.print("Person name (NULL for null): ");
-        p.setName(convertString(scanner.nextLine(), ""));
-
-        out.print("Person surname (NULL for null): ");
-        p.setSurname(convertString(scanner.nextLine(), ""));
-
-        out.print("Person address id (NULL for null): ");
-        readAndSetAddress(scanner, p);
-
-        return p;
-    }
-
-    private void readModifyPerson(PrintStream out, Scanner scanner, int personId) {
-        Person current = entityManager.find(Person.class, personId);
-
-        if (current == null) {
-            out.println("Person with id " + personId + " does not exist.");
-            return;
-        }
-
-        out.print("Person name (NULL for null, enter for no change, current - " + current.getName() + "): ");
-        current.setName(convertString(scanner.nextLine(), current.getName()));
-
-        out.print("Person surname (NULL for null, enter for no change, current - " + current.getSurname() + "): ");
-        current.setSurname(convertString(scanner.nextLine(), current.getSurname()));
-
-        out.print("Person address id (NULL for null, enter for no change, current - " +
-                (current.getAddress() == null ? "NULL" : current.getAddress().getId()) + "): ");
-        readAndSetAddress(scanner, current);
-    }
-
-    private void printAddress(StringBuilder sb, Address a) {
-        sb.append("id = ").append(a.getId()).append(", streetName = ").append(a.getStreetName())
-                .append(", houseNumber = ").append(a.getHouseNumber())
-                .append(", flatNumber = ").append(a.getFlatNumber())
-                .append(", persons = (");
-
-        Iterator iter = a.getPersons().iterator();
-        while (iter.hasNext()) {
-            Person p = iter.next();
-            sb.append("<").append(p.getId()).append("> ").append(p.getName()).append(" ").append(p.getSurname());
-            if (iter.hasNext()) {
-                sb.append(", ");
-            }
-        }
-
-        sb.append(")");
-    }
-
-    @SuppressWarnings("unchecked")
-    private void printAddresses(StringBuilder sb) {
-        List
     addresses = entityManager.createQuery(
-                "select a from Address a order by a.id").getResultList();
-
-        sb.append("Addresses:\n");
-        for (Address a : addresses) {
-            printAddress(sb, a);
-            sb.append("\n");
-        }
-    }
-
-    private void printAddressHistory(StringBuilder sb, int addressId) {
-        AuditReader reader = AuditReaderFactory.get(entityManager);
-
-        List addressHistory = reader.createQuery()
-                .forRevisionsOfEntity(Address.class, false, true)
-                .add(AuditEntity.id().eq(addressId))
-                .getResultList();
-
-        if (addressHistory.size() == 0) {
-            sb.append("A address with id ").append(addressId).append(" does not exist.\n");
-        } else {
-            for (Object historyObj : addressHistory) {
-                Object[] history = (Object[]) historyObj;
-                DefaultRevisionEntity revision = (DefaultRevisionEntity) history[1];
-                sb.append("revision = ").append(revision.getId()).append(", ");
-                printAddress(sb, (Address) history[0]);
-                sb.append(" (").append(revision.getRevisionDate()).append(")\n");
-            }
-        }
-    }
-
-    private void printAddressAtRevision(StringBuilder sb, int addressId, int revision) {
-        AuditReader reader = AuditReaderFactory.get(entityManager);
-
-        Address a = reader.find(Address.class, addressId, revision);
-        if (a == null) {
-            sb.append("This address does not exist at that revision.");
-        } else {
-            printAddress(sb, a);
-        }
-    }
-
-    private Address readNewAddress(PrintStream out, Scanner scanner) {
-        Address a = new Address();
-
-        out.print("Street name (NULL for null): ");
-        a.setStreetName(convertString(scanner.nextLine(), ""));
-
-        out.print("House number: ");
-        a.setHouseNumber(convertStringToInteger(scanner.nextLine(), 0));
-
-        out.print("Flat number: ");
-        a.setFlatNumber(convertStringToInteger(scanner.nextLine(), 0));
-
-        a.setPersons(new HashSet());
-
-        return a;
-    }
-
-    private void readModifyAddress(PrintStream out, Scanner scanner, int addressId) {
-        Address current = entityManager.find(Address.class, addressId);
-
-        if (current == null) {
-            out.println("Address with id " + addressId + " does not exist.");
-            return;
-        }
-
-        out.print("Street name (NULL for null, enter for no change, current - " + current.getStreetName() + "): ");
-        current.setStreetName(convertString(scanner.nextLine(), current.getStreetName()));
-
-        out.print("House number (enter for no change, current - " + current.getHouseNumber() + "): ");
-        current.setHouseNumber(convertStringToInteger(scanner.nextLine(), current.getHouseNumber()));
-
-        out.print("Flat number (enter for no change, current - " + current.getFlatNumber() + "): ");
-        current.setFlatNumber(convertStringToInteger(scanner.nextLine(), current.getFlatNumber()));
-    }
-
-    private void start() {
-        Scanner scanner = new Scanner(System.in);
-        PrintStream out = System.out;
-
-        while (true) {
-            out.println("-----------------------------------------------");
-            out.println("1 - list persons             5 - list addresses");
-            out.println("2 - list person history      6 - list addresses history");
-            out.println("3 - new person               7 - new address");
-            out.println("4 - modify person            8 - modify address");
-            out.println("9 - get person at revision  10 - get address at revision");
-            out.println("                             0 - end");
-
-            try {
-                int choice = scanner.nextInt();
-
-                scanner.nextLine();
-
-                entityManager.getTransaction().begin();
-
-                StringBuilder sb;
-                int personId;
-                int addressId;
-                int revision;
-                switch (choice) {
-                    case 1:
-                        sb = new StringBuilder();
-                        printPersons(sb);
-                        out.println(sb.toString());
-                        break;
-                    case 2:
-                        out.print("Person id: ");
-                        personId = scanner.nextInt(); scanner.nextLine();
-                        sb = new StringBuilder();
-                        printPersonHistory(sb, personId);
-                        out.println(sb.toString());
-                        break;
-                    case 3:
-                        Person p = readNewPerson(out, scanner);
-                        entityManager.persist(p);
-                        break;
-                    case 4:
-                        out.print("Person id: ");
-                        personId = scanner.nextInt(); scanner.nextLine();
-                        readModifyPerson(out, scanner, personId);
-                        break;
-                    case 5:
-                        sb = new StringBuilder();
-                        printAddresses(sb);
-                        out.println(sb.toString());
-                        break;
-                    case 6:
-                        out.print("Address id: ");
-                        addressId = scanner.nextInt(); scanner.nextLine();
-                        sb = new StringBuilder();
-                        printAddressHistory(sb, addressId);
-                        out.println(sb.toString());
-                        break;
-                    case 7:
-                        Address a = readNewAddress(out, scanner);
-                        entityManager.persist(a);
-                        break;
-                    case 8:
-                        out.print("Address id: ");
-                        addressId = scanner.nextInt(); scanner.nextLine();
-                        readModifyAddress(out, scanner, addressId);
-                        break;
-                    case 9:
-                        out.print("Person id: ");
-                        personId = scanner.nextInt(); scanner.nextLine();
-                        out.print("Revision number: ");
-                        revision = scanner.nextInt(); scanner.nextLine();
-                        if (revision <= 0) {
-                            System.out.println("Revision must be greater then 0!");
-                            continue;
-                        }
-                        sb = new StringBuilder();
-                        printPersonAtRevision(sb, personId, revision);
-                        out.println(sb.toString());
-                        break;
-                    case 10:
-                        out.print("Address id: ");
-                        addressId = scanner.nextInt(); scanner.nextLine();
-                        out.print("Revision number: ");
-                        revision = scanner.nextInt(); scanner.nextLine();
-                        if (revision <= 0) {
-                            System.out.println("Revision must be greater then 0!");
-                            continue;
-                        }
-                        sb = new StringBuilder();
-                        printAddressAtRevision(sb, addressId, revision);
-                        out.println(sb.toString());
-                        break;
-
-                    case 0:
-                        return;
-                }
-            } catch (InputMismatchException e) {
-                // continuing
-            } finally {
-                entityManager.getTransaction().commit();
-            }
-        }
-    }
-
-    private boolean hasData() {
-        return (((Long) entityManager.createQuery("select count(a) from Address a").getSingleResult()) +
-                ((Long) entityManager.createQuery("select count(p) from Person p").getSingleResult())) > 0;
-    }
-
-    private void populateTestData() {
-        entityManager.getTransaction().begin();
-
-        if (!hasData()) {
-            Person p1 = new Person();
-            Person p2 = new Person();
-            Person p3 = new Person();
-
-            Address a1 = new Address();
-            Address a2 = new Address();
-
-            p1.setName("James");
-            p1.setSurname("Bond");
-            p1.setAddress(a1);
-
-            p2.setName("John");
-            p2.setSurname("McClane");
-            p2.setAddress(a2);
-
-            p3.setName("Holly");
-            p3.setSurname("Gennaro");
-            p3.setAddress(a2);
-
-            a1.setStreetName("MI6");
-            a1.setHouseNumber(18);
-            a1.setFlatNumber(25);
-            a1.setPersons(new HashSet());
-            a1.getPersons().add(p1);
-
-            a2.setStreetName("Nakatomi Plaza");
-            a2.setHouseNumber(10);
-            a2.setFlatNumber(34);
-            a2.setPersons(new HashSet());
-            a2.getPersons().add(p2);
-            a2.getPersons().add(p3);
-
-            entityManager.persist(a1);
-            entityManager.persist(a2);
-
-            entityManager.persist(p1);
-            entityManager.persist(p2);
-            entityManager.persist(p3);
-
-            System.out.println("The DB was populated with example data.");
-        }
-
-        entityManager.getTransaction().commit();
-    }
-
-    public static void main(String[] args) {
-        Map configurationOverrides = new HashMap();
-        EntityManagerFactory emf = Persistence.createEntityManagerFactory("ConsolePU", configurationOverrides);
-        EntityManager entityManager = emf.createEntityManager();
-
-        TestConsole console = new TestConsole(entityManager);
-
-        System.out.println("");
-        System.out.println("Welcome to EntityVersions demo!");
+	private EntityManager entityManager;
+
+	public TestConsole(EntityManager entityManager) {
+		this.entityManager = entityManager;
+	}
+
+	private String convertString(String s, String def) {
+		if ("NULL".equals(s)) { return null; }
+		if ("".equals(s)) { return def; }
+		return s;
+	}
+
+	private int convertStringToInteger(String s, int def) {
+		if ("".equals(s)) { return def; }
+		try {
+			return Integer.parseInt(s);
+		} catch (NumberFormatException e) {
+			System.err.println("Invalid number, returning 0.");
+			return 0;
+		}
+	}
+
+	private void printPerson(StringBuilder sb, Person p) {
+		sb.append("id = ").append(p.getId()).append(", name = ").append(p.getName())
+				.append(", surname = ").append(p.getSurname());
+
+		Address a = p.getAddress();
+		if (a != null) {
+			sb.append(", address = <").append(a.getId()).append("> ").append(a.getStreetName()).append(" ")
+					.append(a.getHouseNumber()).append("/").append(a.getFlatNumber());
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private void printPersons(StringBuilder sb) {
+		List persons = entityManager.createQuery(
+				"select p from Person p order by p.id").getResultList();
+
+		sb.append("Persons:\n");
+		for (Person p : persons) {
+			printPerson(sb, p);
+			sb.append("\n");
+		}
+	}
+
+	private void printPersonHistory(StringBuilder sb, int personId) {
+		AuditReader reader = AuditReaderFactory.get(entityManager);
+
+		List personHistory = reader.createQuery()
+				.forRevisionsOfEntity(Person.class, false, true)
+				.add(AuditEntity.id().eq(personId))
+				.getResultList();
+
+		if (personHistory.size() == 0) {
+			sb.append("A person with id ").append(personId).append(" does not exist.\n");
+		} else {
+			for (Object historyObj : personHistory) {
+				Object[] history = (Object[]) historyObj;
+				DefaultRevisionEntity revision = (DefaultRevisionEntity) history[1];
+				sb.append("revision = ").append(revision.getId()).append(", ");
+				printPerson(sb, (Person) history[0]);
+				sb.append(" (").append(revision.getRevisionDate()).append(")\n");
+			}
+		}
+	}
+
+	private void printPersonAtRevision(StringBuilder sb, int personId, int revision) {
+		AuditReader reader = AuditReaderFactory.get(entityManager);
+
+		Person p = reader.find(Person.class, personId, revision);
+		if (p == null) {
+			sb.append("This person does not exist at that revision.");
+		} else {
+			printPerson(sb, p);
+		}
+	}
+
+	private void readAndSetAddress(Scanner scanner, Person p) {
+		Address old = p.getAddress();
+
+		String input = scanner.nextLine();
+		if ("NULL".equals(input)) {
+			p.setAddress(null);
+			if (old != null) {
+				old.getPersons().remove(p);
+			}
+		} else if ("".equals(input)) {
+		} else {
+			try {
+				Integer id = Integer.valueOf(input);
+
+				Address a = entityManager.find(Address.class, id);
+
+				if (a == null) {
+					System.err.println("Unknown address id, setting to NULL.");
+					p.setAddress(null);
+					if (old != null) {
+						old.getPersons().remove(p);
+					}
+				} else {
+					p.setAddress(a);
+
+					a.getPersons().add(p);
+
+					if (old != null) {
+						old.getPersons().remove(p);
+					}
+				}
+			} catch (NumberFormatException e) {
+				System.err.println("Invalid address id, setting to NULL.");
+				p.setAddress(null);
+				if (old != null) {
+					old.getPersons().remove(p);
+				}
+			}
+		}
+	}
+
+	private Person readNewPerson(PrintStream out, Scanner scanner) {
+		Person p = new Person();
+
+		out.print("Person name (NULL for null): ");
+		p.setName(convertString(scanner.nextLine(), ""));
+
+		out.print("Person surname (NULL for null): ");
+		p.setSurname(convertString(scanner.nextLine(), ""));
+
+		out.print("Person address id (NULL for null): ");
+		readAndSetAddress(scanner, p);
+
+		return p;
+	}
+
+	private void readModifyPerson(PrintStream out, Scanner scanner, int personId) {
+		Person current = entityManager.find(Person.class, personId);
+
+		if (current == null) {
+			out.println("Person with id " + personId + " does not exist.");
+			return;
+		}
+
+		out.print("Person name (NULL for null, enter for no change, current - " + current.getName() + "): ");
+		current.setName(convertString(scanner.nextLine(), current.getName()));
+
+		out.print("Person surname (NULL for null, enter for no change, current - " + current.getSurname() + "): ");
+		current.setSurname(convertString(scanner.nextLine(), current.getSurname()));
+
+		out.print("Person address id (NULL for null, enter for no change, current - " +
+				(current.getAddress() == null ? "NULL" : current.getAddress().getId()) + "): ");
+		readAndSetAddress(scanner, current);
+	}
+
+	private void printAddress(StringBuilder sb, Address a) {
+		sb.append("id = ").append(a.getId()).append(", streetName = ").append(a.getStreetName())
+				.append(", houseNumber = ").append(a.getHouseNumber())
+				.append(", flatNumber = ").append(a.getFlatNumber())
+				.append(", persons = (");
+
+		Iterator iter = a.getPersons().iterator();
+		while (iter.hasNext()) {
+			Person p = iter.next();
+			sb.append("<").append(p.getId()).append("> ").append(p.getName()).append(" ").append(p.getSurname());
+			if (iter.hasNext()) {
+				sb.append(", ");
+			}
+		}
+
+		sb.append(")");
+	}
+
+	@SuppressWarnings("unchecked")
+	private void printAddresses(StringBuilder sb) {
+		List
     addresses = entityManager.createQuery(
+				"select a from Address a order by a.id").getResultList();
+
+		sb.append("Addresses:\n");
+		for (Address a : addresses) {
+			printAddress(sb, a);
+			sb.append("\n");
+		}
+	}
+
+	private void printAddressHistory(StringBuilder sb, int addressId) {
+		AuditReader reader = AuditReaderFactory.get(entityManager);
+
+		List addressHistory = reader.createQuery()
+				.forRevisionsOfEntity(Address.class, false, true)
+				.add(AuditEntity.id().eq(addressId))
+				.getResultList();
+
+		if (addressHistory.size() == 0) {
+			sb.append("A address with id ").append(addressId).append(" does not exist.\n");
+		} else {
+			for (Object historyObj : addressHistory) {
+				Object[] history = (Object[]) historyObj;
+				DefaultRevisionEntity revision = (DefaultRevisionEntity) history[1];
+				sb.append("revision = ").append(revision.getId()).append(", ");
+				printAddress(sb, (Address) history[0]);
+				sb.append(" (").append(revision.getRevisionDate()).append(")\n");
+			}
+		}
+	}
+
+	private void printAddressAtRevision(StringBuilder sb, int addressId, int revision) {
+		AuditReader reader = AuditReaderFactory.get(entityManager);
+
+		Address a = reader.find(Address.class, addressId, revision);
+		if (a == null) {
+			sb.append("This address does not exist at that revision.");
+		} else {
+			printAddress(sb, a);
+		}
+	}
+
+	private Address readNewAddress(PrintStream out, Scanner scanner) {
+		Address a = new Address();
+
+		out.print("Street name (NULL for null): ");
+		a.setStreetName(convertString(scanner.nextLine(), ""));
+
+		out.print("House number: ");
+		a.setHouseNumber(convertStringToInteger(scanner.nextLine(), 0));
+
+		out.print("Flat number: ");
+		a.setFlatNumber(convertStringToInteger(scanner.nextLine(), 0));
+
+		a.setPersons(new HashSet());
+
+		return a;
+	}
+
+	private void readModifyAddress(PrintStream out, Scanner scanner, int addressId) {
+		Address current = entityManager.find(Address.class, addressId);
+
+		if (current == null) {
+			out.println("Address with id " + addressId + " does not exist.");
+			return;
+		}
+
+		out.print("Street name (NULL for null, enter for no change, current - " + current.getStreetName() + "): ");
+		current.setStreetName(convertString(scanner.nextLine(), current.getStreetName()));
+
+		out.print("House number (enter for no change, current - " + current.getHouseNumber() + "): ");
+		current.setHouseNumber(convertStringToInteger(scanner.nextLine(), current.getHouseNumber()));
+
+		out.print("Flat number (enter for no change, current - " + current.getFlatNumber() + "): ");
+		current.setFlatNumber(convertStringToInteger(scanner.nextLine(), current.getFlatNumber()));
+	}
+
+	private void start() {
+		Scanner scanner = new Scanner(System.in);
+		PrintStream out = System.out;
+
+		while (true) {
+			out.println("-----------------------------------------------");
+			out.println("1 - list persons             5 - list addresses");
+			out.println("2 - list person history      6 - list addresses history");
+			out.println("3 - new person               7 - new address");
+			out.println("4 - modify person            8 - modify address");
+			out.println("9 - get person at revision  10 - get address at revision");
+			out.println("                             0 - end");
+
+			try {
+				int choice = scanner.nextInt();
+
+				scanner.nextLine();
+
+				entityManager.getTransaction().begin();
+
+				StringBuilder sb;
+				int personId;
+				int addressId;
+				int revision;
+				switch (choice) {
+					case 1:
+						sb = new StringBuilder();
+						printPersons(sb);
+						out.println(sb.toString());
+						break;
+					case 2:
+						out.print("Person id: ");
+						personId = scanner.nextInt(); scanner.nextLine();
+						sb = new StringBuilder();
+						printPersonHistory(sb, personId);
+						out.println(sb.toString());
+						break;
+					case 3:
+						Person p = readNewPerson(out, scanner);
+						entityManager.persist(p);
+						break;
+					case 4:
+						out.print("Person id: ");
+						personId = scanner.nextInt(); scanner.nextLine();
+						readModifyPerson(out, scanner, personId);
+						break;
+					case 5:
+						sb = new StringBuilder();
+						printAddresses(sb);
+						out.println(sb.toString());
+						break;
+					case 6:
+						out.print("Address id: ");
+						addressId = scanner.nextInt(); scanner.nextLine();
+						sb = new StringBuilder();
+						printAddressHistory(sb, addressId);
+						out.println(sb.toString());
+						break;
+					case 7:
+						Address a = readNewAddress(out, scanner);
+						entityManager.persist(a);
+						break;
+					case 8:
+						out.print("Address id: ");
+						addressId = scanner.nextInt(); scanner.nextLine();
+						readModifyAddress(out, scanner, addressId);
+						break;
+					case 9:
+						out.print("Person id: ");
+						personId = scanner.nextInt(); scanner.nextLine();
+						out.print("Revision number: ");
+						revision = scanner.nextInt(); scanner.nextLine();
+						if (revision <= 0) {
+							System.out.println("Revision must be greater then 0!");
+							continue;
+						}
+						sb = new StringBuilder();
+						printPersonAtRevision(sb, personId, revision);
+						out.println(sb.toString());
+						break;
+					case 10:
+						out.print("Address id: ");
+						addressId = scanner.nextInt(); scanner.nextLine();
+						out.print("Revision number: ");
+						revision = scanner.nextInt(); scanner.nextLine();
+						if (revision <= 0) {
+							System.out.println("Revision must be greater then 0!");
+							continue;
+						}
+						sb = new StringBuilder();
+						printAddressAtRevision(sb, addressId, revision);
+						out.println(sb.toString());
+						break;
+
+					case 0:
+						return;
+				}
+			} catch (InputMismatchException e) {
+				// continuing
+			} finally {
+				entityManager.getTransaction().commit();
+			}
+		}
+	}
+
+	private boolean hasData() {
+		return (((Long) entityManager.createQuery("select count(a) from Address a").getSingleResult()) +
+				((Long) entityManager.createQuery("select count(p) from Person p").getSingleResult())) > 0;
+	}
+
+	private void populateTestData() {
+		entityManager.getTransaction().begin();
+
+		if (!hasData()) {
+			Person p1 = new Person();
+			Person p2 = new Person();
+			Person p3 = new Person();
+
+			Address a1 = new Address();
+			Address a2 = new Address();
+
+			p1.setName("James");
+			p1.setSurname("Bond");
+			p1.setAddress(a1);
+
+			p2.setName("John");
+			p2.setSurname("McClane");
+			p2.setAddress(a2);
+
+			p3.setName("Holly");
+			p3.setSurname("Gennaro");
+			p3.setAddress(a2);
+
+			a1.setStreetName("MI6");
+			a1.setHouseNumber(18);
+			a1.setFlatNumber(25);
+			a1.setPersons(new HashSet());
+			a1.getPersons().add(p1);
+
+			a2.setStreetName("Nakatomi Plaza");
+			a2.setHouseNumber(10);
+			a2.setFlatNumber(34);
+			a2.setPersons(new HashSet());
+			a2.getPersons().add(p2);
+			a2.getPersons().add(p3);
+
+			entityManager.persist(a1);
+			entityManager.persist(a2);
+
+			entityManager.persist(p1);
+			entityManager.persist(p2);
+			entityManager.persist(p3);
+
+			System.out.println("The DB was populated with example data.");
+		}
+
+		entityManager.getTransaction().commit();
+	}
+
+	public static void main(String[] args) {
+		Map configurationOverrides = new HashMap();
+		EntityManagerFactory emf = Persistence.createEntityManagerFactory("ConsolePU", configurationOverrides);
+		EntityManager entityManager = emf.createEntityManager();
+
+		TestConsole console = new TestConsole(entityManager);
+
+		System.out.println("");
+		System.out.println("Welcome to EntityVersions demo!");
 //      If you would like to use HSQLDB, uncomment relevant entries in
 //      hibernate-envers/src/demo/resources/META-INF/persistence.xml descriptor and add required JAR libraries.
 //        String userDbFile = System.getProperty("java.io.tmpdir") + File.separator + "_versions_demo.db";
 //        System.out.println("HSQLDB database file location: " + userDbFile);
 
-        console.populateTestData();
-        console.start();
+		console.populateTestData();
+		console.start();
 
-        entityManager.close();
-        emf.close();
-    }
+		entityManager.close();
+		emf.close();
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java
index 26c566154144..e8faea618a9a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
index 7929d090f301..9b93d0054c34 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java
index c95d407a8a26..111f448d0fc6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java
index 4212b89d6ba6..23f75e0c5f0c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
index 092808ca0082..46b399b4117e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
@@ -65,15 +63,15 @@  T find(Class cls, Object primaryKey, Number revision) throws
 	 * Find an entity by primary key on the given date.  The date specifies restricting
 	 * the result to any entity created on or before the date with the highest revision
 	 * number.
-	 *  
+	 *
 	 * @param cls Class of the entity.
 	 * @param primaryKey Primary key of the entity.
 	 * @param date Date for which to get entity revision.
-	 * 
+	 *
 	 * @return The found entity instance at created on or before the specified date with the highest
 	 *         revision number or null, if an entity with the id had not been created on or before the
 	 *         specified date.
-	 *         
+	 *
 	 * @throws IllegalArgumentException if cls, primaryKey, or date is null.
 	 * @throws NotAuditedException When entities of the given class are not audited.
 	 * @throws RevisionDoesNotExistException If the given date is before the first revision.
@@ -227,7 +225,7 @@ Number getRevisionNumberForDate(Date date) throws IllegalStateException, Revisio
 	 * @throws IllegalStateException If the associated entity manager is closed.
 	 * @throws RevisionDoesNotExistException If the given date is before the first revision.
 	 * @throws IllegalArgumentException If date is null.
-	 */	
+	 */
 	Number getRevisionNumberForDate(LocalDateTime date) throws IllegalStateException,
 			RevisionDoesNotExistException, IllegalArgumentException;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java
index 62915a119749..78fa1c90643f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditTable.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditTable.java
index 46d1c6a5531e..354b4e921494 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditTable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java b/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java
index efbb5e83beb9..bc3966de1c02 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/CollectionAuditTable.java b/hibernate-envers/src/main/java/org/hibernate/envers/CollectionAuditTable.java
index a6c97e7e46ea..34c3a7504775 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/CollectionAuditTable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/CollectionAuditTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/CrossTypeRevisionChangesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/CrossTypeRevisionChangesReader.java
index 4870eaf7cd82..214d906711cc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/CrossTypeRevisionChangesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/CrossTypeRevisionChangesReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/DateTimeFormatter.java b/hibernate-envers/src/main/java/org/hibernate/envers/DateTimeFormatter.java
index f657c41aa145..5f4540e481b7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/DateTimeFormatter.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/DateTimeFormatter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java
index 40bd6efe0337..8d5991e32446 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java
index 9a822fc311e5..e5cd2a80d2be 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/EntityTrackingRevisionListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/EntityTrackingRevisionListener.java
index 3faa3a1e0bb5..29a1d4db21cb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/EntityTrackingRevisionListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/EntityTrackingRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/ModifiedEntityNames.java b/hibernate-envers/src/main/java/org/hibernate/envers/ModifiedEntityNames.java
index 8091281806a1..608609195961 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/ModifiedEntityNames.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/ModifiedEntityNames.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/NotAudited.java b/hibernate-envers/src/main/java/org/hibernate/envers/NotAudited.java
index b1ca737ce947..a424631889bd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/NotAudited.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/NotAudited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetAuditMode.java b/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetAuditMode.java
index 562115199343..df953f5459b1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetAuditMode.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetAuditMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetNotFoundAction.java b/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetNotFoundAction.java
index aa072b52473a..5a4e10fff64d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetNotFoundAction.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RelationTargetNotFoundAction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionEntity.java
index 397ebc32bec4..cb3cbf7a2446 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionListener.java
index c22907599186..21d689e41571 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionNumber.java b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionNumber.java
index 5a686a8a9a97..d3f46c2a4cf6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionNumber.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java
index ad71a9620115..6e6be00b33f1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionType.java b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionType.java
index 736e1a2c5564..bba3ca35a720 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/RevisionType.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/RevisionType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTable.java b/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTable.java
index 5fde130f11d7..071220c1bca8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTables.java b/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTables.java
index 0a0a02eac325..b38bc3b942c9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTables.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/SecondaryAuditTables.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
index ee867af006ba..76cd8ea0b06e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversMappingException.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversMappingException.java
index 319fc7e7eb9f..291dca21bf47 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversMappingException.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversMappingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AbstractModifiedColumnNamingStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AbstractModifiedColumnNamingStrategy.java
index be08b1a6c4b8..cd2f51350148 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AbstractModifiedColumnNamingStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AbstractModifiedColumnNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalMappingContributorImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalMappingContributorImpl.java
index dbf14c2697e2..4ece189334ad 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalMappingContributorImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalMappingContributorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AuditStrategyRegistrationProvider.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AuditStrategyRegistrationProvider.java
index 233ea2e8893b..21311224f904 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AuditStrategyRegistrationProvider.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AuditStrategyRegistrationProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversIntegrator.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversIntegrator.java
index 97de0810ef4e..f242777b1550 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversIntegrator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversIntegrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
index 35b817c23627..708934b221cb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversService.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversService.java
index 1bd8295fb767..f08e14e7b39e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversService.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceContributor.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceContributor.java
index 500d171315a8..8429d499e439 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceContributor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
index 222c61cf7a85..007eb302137b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
@@ -131,7 +129,7 @@ public Getter getRevisionInfoTimestampAccessor() {
 					}
 				}
 		);
-		
+
 		this.entitiesConfigurations = new EntitiesConfigurator().configure( metadataBuildingContext );
 	}
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceInitiator.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceInitiator.java
index 9ec663895c22..059adb1446fc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceInitiator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/FunctionContributorImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/FunctionContributorImpl.java
index a0d2d481ec7a..2dfb7a8a639c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/FunctionContributorImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/FunctionContributorImpl.java
@@ -1,19 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.FunctionContributor;
-import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.boot.model.TypeContributor;
 import org.hibernate.envers.function.OrderByFragmentFunction;
-import org.hibernate.envers.internal.entities.RevisionTypeType;
-import org.hibernate.query.sqm.function.SqmFunctionRegistry;
-import org.hibernate.service.ServiceRegistry;
 
 /**
  * Envers specific FunctionContributor
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ImprovedModifiedColumnNamingStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ImprovedModifiedColumnNamingStrategy.java
index 0279bc604911..0bc8fe78caf0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ImprovedModifiedColumnNamingStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ImprovedModifiedColumnNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/LegacyModifiedColumnNamingStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/LegacyModifiedColumnNamingStrategy.java
index f6d6b4270256..c804aaa422ce 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/LegacyModifiedColumnNamingStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/LegacyModifiedColumnNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNameResolver.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNameResolver.java
index 65e08eedae42..a1e8739a9dd2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNameResolver.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNameResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNamingStrategyRegistrationProvider.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNamingStrategyRegistrationProvider.java
index 889eddb3e404..c3abdf2a5ee5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNamingStrategyRegistrationProvider.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/ModifiedColumnNamingStrategyRegistrationProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/TypeContributorImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/TypeContributorImpl.java
index 17d007fccab0..44f93de97e2e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/TypeContributorImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/TypeContributorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AbstractIdentifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AbstractIdentifier.java
index 24f88b0f8ecd..bb1bd9efbab5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AbstractIdentifier.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AbstractIdentifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
@@ -11,7 +9,7 @@
 
 /**
  * Base abstract implementation of {@link Identifier}.
- * 
+ *
  * @author Chris Cranford
  */
 public abstract class AbstractIdentifier implements Identifier {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Attribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Attribute.java
index 1eae1fc8a819..7867dfa7d9c2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Attribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Attribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AttributeContainer.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AttributeContainer.java
index 286ad2754426..d71f1c548576 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AttributeContainer.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/AttributeContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/BasicAttribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/BasicAttribute.java
index 290038aba132..7adf67d401a9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/BasicAttribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/BasicAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Bindable.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Bindable.java
index 656be9717b1a..1d3a21fdf1c1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Bindable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Bindable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Cloneable.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Cloneable.java
index 716fb587cbc2..2d692729f634 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Cloneable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Cloneable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Column.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Column.java
index 003ae3fe8525..e8df4a21ce14 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Column.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Column.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
@@ -28,7 +26,7 @@ public class Column extends Selection implements Cloneable.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/CompositeIdentifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/CompositeIdentifier.java
index 13e4bb95b5bc..e58d0e989e7f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/CompositeIdentifier.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/CompositeIdentifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ConfigParameterContainer.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ConfigParameterContainer.java
index 2c52814f6474..56660a2e4143 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ConfigParameterContainer.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ConfigParameterContainer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorPersistentEntity.java
index 43be94bfd9c7..646255012c53 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorPersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorType.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorType.java
index 8e322a5dfd21..7895c12e0f34 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorType.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/DiscriminatorType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Formula.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Formula.java
index 648e42e98669..398472c5082c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Formula.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Formula.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Identifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Identifier.java
index b1bc95aa2cb9..a3be1364d320 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Identifier.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Identifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/IdentifierRelation.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/IdentifierRelation.java
index 6b27489a2c65..56576157dd77 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/IdentifierRelation.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/IdentifierRelation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Join.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Join.java
index 419ada0d784c..914604c18385 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Join.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Join.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinAwarePersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinAwarePersistentEntity.java
index ba8e502134ce..481552fe8a62 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinAwarePersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinAwarePersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinedSubclassPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinedSubclassPersistentEntity.java
index 76ed1a9b4238..92723e370581 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinedSubclassPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/JoinedSubclassPersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Key.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Key.java
index bfa0a4cb3996..8540dac23753 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Key.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Key.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Keyable.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Keyable.java
index f2119e875f29..8f5e96029cd2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Keyable.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Keyable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ManyToOneAttribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ManyToOneAttribute.java
index bbdd589d06b0..c6f859eb9d11 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ManyToOneAttribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/ManyToOneAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PersistentEntity.java
index 419f05ec6181..a93aafb1c984 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PluralAttribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PluralAttribute.java
index 943018b84bdc..9b54dc83a803 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PluralAttribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/PluralAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
index 464ea0c7daec..f1b3303a3276 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Selection.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Selection.java
index 5eb0a711afa3..060eaaf7fea4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Selection.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/Selection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SetAttribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SetAttribute.java
index 30296709ecda..404d0b18eee1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SetAttribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SetAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SimpleIdentifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SimpleIdentifier.java
index 16d8405bc635..b41e81bd2147 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SimpleIdentifier.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SimpleIdentifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SingularAttribute.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SingularAttribute.java
index 055d7355f6b2..bbc1594b022b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SingularAttribute.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SingularAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SubclassPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SubclassPersistentEntity.java
index 9bf950af58c9..4da56e16bec2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SubclassPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/SubclassPersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/TypeSpecification.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/TypeSpecification.java
index 39d312cb75fe..cfc955227cb7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/TypeSpecification.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/TypeSpecification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/UnionSubclassPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/UnionSubclassPersistentEntity.java
index b5b87a75eb9a..a9141d5e2811 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/UnionSubclassPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/UnionSubclassPersistentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.model;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/registry/classloading/ClassLoaderAccessHelper.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/registry/classloading/ClassLoaderAccessHelper.java
index 2a051be14aec..ccd685f77a02 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/registry/classloading/ClassLoaderAccessHelper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/registry/classloading/ClassLoaderAccessHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.registry.classloading;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
index 71ae02b8711e..35b329168d9a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/ModifiedColumnNamingStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/ModifiedColumnNamingStrategy.java
index 16168d97554f..3f56ff546073 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/ModifiedColumnNamingStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/ModifiedColumnNamingStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.boot.spi;
 
@@ -32,5 +30,5 @@ void addModifiedColumns(
 			Configuration configuration,
 			Value value,
 			AttributeContainer mapping,
-			PropertyAuditingData propertyAuditingData);	
+			PropertyAuditingData propertyAuditingData);
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java
index 3bd9ec2b81d1..1e06e9fc6599 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java
index 4557c248396a..baac56ca51b0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration;
 
@@ -148,7 +146,7 @@ public interface EnversSettings {
 	 *
 	 * This option is meant to maintain backward compatibility while attempting to correct a bug in behavior without
 	 * impacting existing users who may use the current behavior.
-	 * 
+	 *
 	 * Defaults to {@literal false}.
 	 *
 	 * @since 5.4.4
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
index 4fb2ac4b2d54..e9b6472427da 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
index 0c9599cc7342..a8c80907723f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
@@ -24,7 +22,6 @@
 import org.hibernate.envers.internal.tools.graph.GraphTopologicalSort;
 import org.hibernate.mapping.PersistentClass;
 
-import org.jboss.logging.Logger;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/MappingCollector.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/MappingCollector.java
index 571562ea4833..2d354bcf72e7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/MappingCollector.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/MappingCollector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java
index 0adae1758739..884344385c84 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java
index 58b92f4a92b6..df5fe41f6201 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java
index f03d91127402..5ab6c98102c4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal;
 
@@ -160,7 +158,7 @@ public ModifiedEntityNamesReader getModifiedEntityNamesReader() {
 	public RootPersistentEntity getRevisionInfoMapping() {
 		return useDefaultRevisionInfoMapping ? generateDefaultRevisionInfoMapping( revisionInfoIdName ) : null;
 	}
-	
+
 	public Attribute getRevisionInfoRelationMapping() {
 		final ManyToOneAttribute attribute = new ManyToOneAttribute(
 				configuration.getRevisionFieldName(),
@@ -185,7 +183,7 @@ public Attribute getRevisionInfoRelationMapping() {
 				)
 		);
 
-		return attribute;		
+		return attribute;
 	}
 
 	private RootPersistentEntity generateDefaultRevisionInfoMapping(String revisionInfoIdName) {
@@ -494,7 +492,7 @@ else if ( isAnyType( type, Long.class, Long.TYPE ) ) {
 				revisionPropSqlType = column.columnDefinition();
 			}
 		}
-		
+
 		private void resolveRevisionTimestampFromProperty(MemberDetails memberDetails, String accessType) {
 			if ( revisionTimestampFound ) {
 				throw new EnversMappingException( "Only one property can be defined with @RevisionTimestamp" );
@@ -509,7 +507,7 @@ private void resolveRevisionTimestampFromProperty(MemberDetails memberDetails, S
 				throwUnexpectedAnnotatedType( memberDetails, RevisionTimestamp.class, "long, Long, Date, LocalDateTime, Instant, or java.sql.Date" );
 			}
 		}
-		
+
 		private void resolveModifiedEntityNamesFromProperty(MemberDetails memberDetails, String accessType) {
 			if ( modifiedEntityNamesFound ) {
 				throw new EnversMappingException( "Only one property can be defined with @ModifiedEntityNames" );
@@ -556,7 +554,7 @@ private Class getRevisionListenerClass(Class annotation, String allowedTypes) {
 			throw new EnversMappingException(
 					String.format(
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractCollectionMetadataGenerator.java
index 770dddf2bef3..0eb56bd5d1ae 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractCollectionMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractCollectionMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
@@ -528,7 +526,7 @@ else if ( collectionType instanceof ListType ) {
 
 		// this is never reached, but java requires it
 		throw new AssertionError();
-	}    
+	}
 
 	/**
 	 * Returns whether the collection is a map-type and that the map element is defined as a Clob/NClob type.
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
index 67b8f732f495..2409a256b40b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityConfigurationRegistry.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityConfigurationRegistry.java
index fb16d33b9734..b92b1c1036b6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityConfigurationRegistry.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityConfigurationRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java
index 3d6029cd7208..b0fc9058f40c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
index 4abe393434a9..4fed3eef5dba 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java
index 0353e2ca5079..bc8792962785 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java
index 153cc8d6914b..6564da8a37bd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
index a6412e9d596a..ee586567eda1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
 import java.lang.invoke.MethodHandles;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -15,7 +12,6 @@
 import org.hibernate.envers.boot.EnversMappingException;
 import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData;
 import org.hibernate.envers.internal.EnversMessageLogger;
-import org.hibernate.envers.internal.tools.Tools;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.KeyValue;
@@ -203,5 +199,5 @@ public Collection getCollection() {
 		public Table getTable() {
 			return table;
 		}
-	}    
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataContext.java
index 6cd6a82dad65..24d09c5e1a10 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataContext.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ColumnNameIterator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ColumnNameIterator.java
index d77e9d15de27..8e00e398b812 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ColumnNameIterator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ColumnNameIterator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java
index 408264833571..eca3bfefeb41 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java
index 6b8931a4f18a..5cf3e5344a2f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/FormulaNotSupportedException.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/FormulaNotSupportedException.java
index 2b075ab6e8b8..be5b897e0b5d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/FormulaNotSupportedException.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/FormulaNotSupportedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
index 102017e5c888..d81b1fcec74d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java
index 52b7a18856fb..d526347e9913 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
index 4b9802149cda..29dbc85c3dad 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
@@ -160,7 +158,7 @@ public void addCollection(CollectionMetadataContext context) {
 				fakeBidirectionalRelationMapper,
 				fakeBidirectionalRelationIndexMapper,
 				hasCollectionIndex( context )
-		);        
+		);
 	}
 
 	private boolean hasCollectionIndex(CollectionMetadataContext context) {
@@ -172,7 +170,7 @@ private String getAddOneToManyAttachedAuditMappedBy(CollectionMetadataContext co
 			return context.getPropertyAuditingData().getAuditMappedBy();
 		}
 		return context.getCollection().getMappedByProperty();
-	} 
+	}
 
 	private PropertyMapper getBidirectionalRelationMapper(String entityName, IdMappingData idData, String auditMappedBy) {
 		// Creating a prefixed relation mapper.
@@ -189,7 +187,7 @@ private PropertyMapper getBidirectionalRelationMapper(String entityName, IdMappi
 				false,
 				false
 		);
-	}    
+	}
 
 	private PropertyMapper getBidirectionalRelationIndexMapper(CollectionMetadataContext context, String positionMappedBy) {
 		if ( positionMappedBy != null ) {
@@ -223,5 +221,5 @@ private MiddleComponentData getBidirectionalIndexData(MiddleComponentData origin
 			return new MiddleComponentData( new MiddleStraightComponentMapper( positionMappedBy ) );
 		}
 		return original;
-	}    
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
index c44f04ca3bef..899cec1ede7a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
@@ -260,7 +258,7 @@ private boolean isRevisionTypeInId(CollectionMetadataContext context) {
 	private PersistentClass getReferencedEntityMapping(CollectionMetadataContext context) {
 		return getMetadataBuildingContext().getMetadataCollector().getEntityBinding( context.getReferencedEntityName() );
 	}
-	
+
 	private void storeMiddleEntityRelationInformation(
 			CollectionMetadataContext context,
 			String mappedBy,
@@ -307,5 +305,5 @@ private void storeMiddleEntityRelationInformation(
 					referencingIdData
 			);
 		}
-	}	
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/PersistentEntityInstantiator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/PersistentEntityInstantiator.java
index c6cb225a117c..47e6dd0313f7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/PersistentEntityInstantiator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/PersistentEntityInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java
index 26db78633572..6d09ffe5a513 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/RevisionInfoHelper.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/RevisionInfoHelper.java
index 9279fd32dadb..6588c2294f34 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/RevisionInfoHelper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/RevisionInfoHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
index 7d7df2aaf5c6..8f61477db2f4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ValueMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ValueMetadataGenerator.java
index 4053088cf229..476957ec4fb6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ValueMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ValueMetadataGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java
index 57d9682070b7..1885979cabb0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditJoinTableData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditJoinTableData.java
index d48ad83c551f..bec639134d9b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditJoinTableData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditJoinTableData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditOverrideData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditOverrideData.java
index 9802c30f7dff..f77acf5c5041 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditOverrideData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditOverrideData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
index 2711cf474b20..c596e0b3057a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
index 47782cee464d..ad1edc627086 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
index e0b7a80341b2..20970b407091 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
index c802d383b96f..54193ffdbe52 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
index 39dde21380e7..0581e6d9c1d8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java
index d7146a80e101..1429267f1adb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java
index 49c80d084d4d..65b91dadb65e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.configuration.internal.metadata.reader;
 
@@ -90,7 +88,7 @@ public PropertyAuditingData(
 	 * @param accessType the access type
 	 * @param relationTargetNotFoundAction the relation target not found action
 	 * @param forceInsertable whether the property is forced insertable
- 	 * @param synthetic whether the property is a synthetic, non-logic column-based property
+	 * @param synthetic whether the property is a synthetic, non-logic column-based property
 	 * @param value the mapping model's value
 	 */
 	public PropertyAuditingData(
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceGenerator.java
index dbdf17bb5567..f973b9a8aa62 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.enhanced;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceStructure.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceStructure.java
index 2fb78a3f2acf..a8c922a365c9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceStructure.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/OrderedSequenceStructure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.enhanced;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java
index 8111ebd571b4..a31dfdf76df2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.enhanced;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java
index 02cb2047da6a..36df1e35ade1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.enhanced;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
index c59413fb268e..dd01b68fba60 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java
index 2ecd49ff18b2..24dd8f46cc97 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversUpdateEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversUpdateEventListener.java
index 4425321028a7..e0e9e11fc190 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversUpdateEventListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversUpdateEventListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java
index 54adb4979440..51fbb03333c9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java
index 3d70cb155f13..92a611e8734e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
index 06ec5707708e..c8400071cbeb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java
index 7c3d62a66720..e5374cd4479a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java
index ae58e62aab40..a43d18e6ec56 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java
index 4c01fa70991b..8eb4dcc0fb04 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
index c5d2d02ea9df..691a20828100 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
index b6ea447934d6..0bf29674ddd8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreUpdateEventListenerImpl.java
index 9a5293756c9d..3be700fcd995 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreUpdateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreUpdateEventListenerImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.event.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/exception/AuditException.java b/hibernate-envers/src/main/java/org/hibernate/envers/exception/AuditException.java
index 409208d954c5..e57f3267410b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/exception/AuditException.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/exception/AuditException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.exception;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/exception/NotAuditedException.java b/hibernate-envers/src/main/java/org/hibernate/envers/exception/NotAuditedException.java
index 70477adc34aa..994dea81a5cd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/exception/NotAuditedException.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/exception/NotAuditedException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.exception;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java b/hibernate-envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java
index a96f5edbebbc..2b6916c66b0d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.exception;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java
index 84c827ead4c9..c7f6480c47e5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.envers.function;
 
 import java.util.ArrayList;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
index f1e420ad257d..f5908309b49c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java
index 2d86a8aca834..b6e12c01d47f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java
index 95f003c15f36..53db4e649656 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java
index 8407954fa1a9..ef8e0a601fa1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
index 74952e1f3c41..72a3e084b177 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
index 87f404f6887b..76c823f7c7a1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
@@ -19,8 +17,6 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
-import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java
index fd610393af05..b8ba600a9810 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java
index 8559d11c28f8..5071a3c8072a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
index 41a45d5d8146..82a1e7d214c1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java
index ec28474e53e5..6ada34fa329b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
index 3530b5030e6c..21123f5cc2c6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java
index 325497739b3a..56b739c98be8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractMapper.java
index c1f442c6083d..6b7dc19ccebe 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractPropertyMapper.java
index 11c04458141d..df6f36ce4904 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractPropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/AbstractPropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java
index 01f07c1a14e6..8c2f3ab20c90 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java
index 047dcf02f3e0..e05d12aff3ca 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/DynamicComponentMapperSupport.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/DynamicComponentMapperSupport.java
index 9cf636ad211a..545428905c84 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/DynamicComponentMapperSupport.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/DynamicComponentMapperSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java
index be32b4e7e82c..625a9c245745 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ModifiedFlagMapperSupport.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ModifiedFlagMapperSupport.java
index 11dc85a92809..cb72726024bc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ModifiedFlagMapperSupport.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ModifiedFlagMapperSupport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java
index 999d27961f54..769c7f25b0c0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java
@@ -1,8 +1,6 @@
-	/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java
index a7356a6a0c96..e8aeaf9e6ac2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java
index 24b948ef9c0e..2d5062233690 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java
index e995019dc5c9..1309f521e6ac 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java
index 842f97404312..914dfab89630 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java
index 4a0d5d6a6d7c..4dfd04347540 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java
index 4af1c6563c4a..1c1518b62e8f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java
index dd51ab3c02a8..6c49e32f1277 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java
index a4430cfb5e4a..ca389762a505 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java
index 23afb11d6374..64dda7e86f95 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java
index 9cb5bbda6526..0ae0059f5d4e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java
index 86cb71e451ee..1d82bc23f45f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/NestedEmbeddedIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/NestedEmbeddedIdMapper.java
index 2cb3ab6fe2a5..7a58d576a14c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/NestedEmbeddedIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/NestedEmbeddedIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java
index a496af6087ec..1f99dfa0ba38 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java
index eb9061676bfe..c1e8a9e603d8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java
index d12368f374ba..2b58719c5dbd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
@@ -16,8 +14,6 @@
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.service.ServiceRegistry;
 
-import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 
 /**
  * An implementation of an identifier mapper for a single basic attribute property.
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java
index f1e4e6466dfe..272fd4cc0d00 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.id;
 
@@ -21,8 +19,6 @@
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.EntityType;
 
-import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 
 /**
  * An extension to the {@link SingleIdMapper} implementation that supports the use case of an {@code @IdClass}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java
index c74ce3d346cf..a971edba3bdd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java
index 2c7916e722e2..7d52b7856503 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java
index a83ba9280f9a..65295e149149 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java
index d3ede1e2fae8..840bcb17a314 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java
index 9d0d671fa280..f29e1bba1667 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java
index 52c2f3cd1952..620bee711a90 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java
index e404f4bd53df..63064d26a68a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java
index b3b60b41c3ad..0c3ffca235d0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java
index 1ac2797d460e..9e585f8aadc9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java
index 23c95599cc04..6bda91080ab8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java
index b8a74b84df41..dac4dd93c17f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java
index 66afb0d4693a..12892a218e5e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java
index 377be7a646cf..27e9e0bb9a0d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java
index 8a979ad1e443..7be4fab24858 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
index d068c7e94aee..649c951565c9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
-import java.io.Serializable;
 
 import org.hibernate.envers.boot.internal.EnversService;
 import org.hibernate.envers.internal.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
index c692728b348f..5f5e7ddf032f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/AbstractMiddleComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/AbstractMiddleComponentMapper.java
index b216a3d8c1b8..31420f18ae35 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/AbstractMiddleComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/AbstractMiddleComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java
index 1b37c3e4582a..ff87a04f7c5a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java
index 9eb4c7c39e89..9a881f6d78ce 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java
index a24d6ee288d0..52730838f2cd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapElementNotKeyComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapElementNotKeyComponentMapper.java
index 27047d43dd8f..452e47b4a21c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapElementNotKeyComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapElementNotKeyComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java
index 3c985e639b3f..0bc65d3f4dc5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java
index da66804a01dc..4fec4bc15042 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java
index 1a07539ebaf0..ce611357612e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java
index 1c2e3fd4d282..5f21e052c4a9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java
index 79edbec6db7d..23278593ce50 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.component;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java
index 1fcba943a39e..b32510e0759d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
index 8b53f458da68..72547a854f57 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java
index 7af85c670082..a173d95306f7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
@@ -62,7 +60,7 @@ public T initialize() {
 
 		return collection;
 	}
-	
+
 	/**
 	 * Creates a new object based on the specified class with the given constructor arguments.
 	 *
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java
index 015efa57958d..32968d83edd1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java
index 17cf3f2a786c..99de738a61fc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java
index 32572207f4d3..60a1ace92b2a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java
index cf99247ca89e..9f0282667883 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java
index a224e4f4f3ea..6787c3fd7b16 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java
index c91d1ecb9e08..33c61adbebe0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java
index 6d417b00d4c5..e5e93dc1cce9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java
index 1848c753f507..91037d756e5c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
@@ -40,7 +38,7 @@ protected void checkInit() {
 	public final boolean wasInitialized() {
 		return delegate != null;
 	}
-	
+
 	@Override
 	public final void forceInitialization() {
 		checkInit();
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java
index 9c16482602ad..12badcb3e755 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java
index 7364a47e77af..3ae3a99bcfee 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java
index 11698fd27084..6580f168353e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java
index 189c8d6d616c..022fda14adc1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
@@ -42,7 +40,7 @@ private void checkInit() {
 	public final boolean wasInitialized() {
 		return delegate != null;
 	}
-	
+
 	@Override
 	public final void forceInitialization() {
 		checkInit();
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java
index edc0d8bd67d5..165c0b7897f5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java
index 17e2f0072762..6a3d4964d2ec 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java
index 6beb6190cd2c..0fd4b41b7ecd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java
index b267d4bf2b60..4e3446e5230c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java
index 886814d5c2b5..c3a7fb710c73 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java
index 638107c61c8c..80f9cbb144c0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java
index a0d6066cf12b..a8f36a8d5e78 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java
index 5c36a268089c..d54527a0a17c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java
index 2e08fcf05056..7196abae85ba 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.entities.mapper.relation.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java
index 56f7cfa1c04a..7feae79be4f3 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImplementor.java
index dbc09adf5d45..5eafeffff108 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImplementor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java
index ed356c01b6f2..409a4e6023e6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/CrossTypeRevisionChangesReaderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
index f4b5c70a9192..167c8b0932f8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.reader;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java
index 9d4dee136e70..d1f5e4c3a068 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java
index 1aac07f0d092..202d3c345a6d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java
index 57b8774265cc..f2decad022c4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java
index ad8d75f139b0..b2b80b352836 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java
index 0658300a4cca..e65461e0fe5c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java
index 408ace5da393..2a8c66d44e6a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionTimestampValueResolver.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionTimestampValueResolver.java
index 506457a7a7a8..271930e16839 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionTimestampValueResolver.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionTimestampValueResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.revisioninfo;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java
index def0caab20fe..872f26fb78ba 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java
index d69520c06667..72bb80bd03e3 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java
index eeca1d0a5848..4b8e799dc0a7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java
index ef56af216ce9..6019f8da9301 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java
index b5cb2974c358..f64327e93acf 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java
index 56fa51c5d350..84349c8f8131 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java
index b608e4b6e70d..5b34603572a6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java
index ce6969328ea0..81b915234c1d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java
index dc24cadc44a3..4f0696460c4d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java
index c99f9604894b..2d251ea2bff8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
@@ -216,13 +214,13 @@ public static FakeRelationChange merge(FakeRelationChange first, FakeRelationCha
 				return first;
 			}
 
-            /*
+			/*
 			 * The merging rules are the following (revision types of the first and second changes):
-             * - DEL, DEL - return any (the work units are the same)
-             * - DEL, ADD - return ADD (points to new owner)
-             * - ADD, DEL - return ADD (points to new owner)
-             * - ADD, ADD - return second (points to newer owner)
-             */
+			 * - DEL, DEL - return any (the work units are the same)
+			 * - DEL, ADD - return ADD (points to new owner)
+			 * - ADD, DEL - return ADD (points to new owner)
+			 * - ADD, ADD - return second (points to newer owner)
+			 */
 			if ( first.getRevisionType() == RevisionType.DEL || second.getRevisionType() == RevisionType.ADD ) {
 				return second;
 			}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java
index d6a973acad76..865745da6dc3 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java
index 382e6be9c540..5413cf11aebf 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java
index 700f93ca83e3..ea1a89088369 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java
index e09e825b0630..422f665e145d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.synchronization.work;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java
index f7530955279a..e35642d37d2e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java
index 56008d02cae5..587864c70114 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java
index b25d55e7226d..b2cee42e4a93 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
@@ -16,8 +14,6 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
-import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java
index 2b7e6a95dc92..cd343d679ec5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java
index a06830f50118..8a585cdc6592 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java
index 07650b1a7408..394a017ae3c5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java
index 68e465cdeab2..0221599b9a32 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java
index 1d975d3c7981..f9cd6e11d9c2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java
index 92c72b967f63..aa4897fd4602 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java
index bb5ba25f09e0..eab4453e4692 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java
index de02f660a39d..1d7946ebe81c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.graph;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java
index 6e148e05bb78..ee9cb743717a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.graph;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java
index 1af56681fa23..7687bd6b7fad 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.graph;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java
index 633e2d751d6e..85591dea64f5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.graph;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java
index 32507b54bdc5..5a38f6031998 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.query;
 
@@ -173,7 +171,7 @@ public void addWhere(String left, boolean addAliasLeft, String op, String right,
 				right
 		);
 	}
-	
+
 	public void addWhere(String aliasLeft, String left, String op, String aliasRight, String right) {
 		final StringBuilder expression = new StringBuilder();
 
@@ -195,15 +193,15 @@ public void addWhere(String aliasLeft, String left, String op, String aliasRight
 	public void addWhereWithFunction(String alias, String left, String leftFunction, String op, Object paramValue){
 		final String paramName = generateQueryParam();
 		localQueryParamValues.put( paramName, paramValue );
-		
+
 		final StringBuilder expression = new StringBuilder();
-		
+
 		expression.append( leftFunction ).append( "(" );
 		expression.append( alias ).append( "." );
 		expression.append( left ).append( ")" );
 		expression.append( " " ).append( op ).append( " " );
 		expression.append( ":" ).append( paramName );
-		
+
 		expressions.add( expression.toString() );
 	}
 
@@ -296,7 +294,7 @@ public void addWhere( String leftAlias, String left, String op, QueryBuilder rig
 	 * @param op The operator.
 	 * @param right Right property name.
 	 * @param addAliasRight Whether to add the alias to the right property.
-     */
+	 */
 	public void addWhereOrNullRestriction(String left, boolean addAliasLeft, String op, String right, boolean addAliasRight) {
 		if ( "=".equals( op ) ) {
 			addWhere( left, addAliasLeft, " is not distinct from ", right, addAliasRight );
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java
index e4794c9120b2..14f684c11c89 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java
index 7bc10d489065..f27581ab8580 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.internal.tools.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java
index a3406cebbf14..2575777d31d2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java
index 66e9e3fcbd79..ee8587764614 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query;
 
@@ -211,7 +209,7 @@ public static AuditFunction function(final String function, final Object... argu
 
 	/**
 	 * Adds a restriction for the type of the current entity.
-	 * 
+	 *
 	 * @param type the entity type to restrict the current alias to
 	 */
 	public static AuditCriterion entityType(final Class type) {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java
index 8ab74038ce1f..63db50320636 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
index cf07439992db..e52497a6f4af 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
index a98ccc2a1be8..506c2260d598 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java
index 1900b3cf2f5c..946a2c2242cb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java
index 598988d8a5f1..454ed2717d0b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java
index 1d06f5010c3c..ba2308b6a8f8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditFunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditFunction.java
index f897717d86be..f11dcf3541d9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditFunction.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
@@ -20,7 +18,7 @@
 
 /**
  * Create restrictions or projections using a function.
- * 
+ *
  * @author Felix Feisst (feisst dot felix at gmail dot com)
  */
 public class AuditFunction implements AuditProjection {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java
index 22d03cf3dd75..414d93b55cff 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
index df07c95cad98..f3827172b284 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
@@ -91,9 +89,9 @@ public AuditCriterion like(String value, MatchMode matchMode) {
 		return new SimpleAuditExpression( alias, propertyNameGetter, matchMode.toMatchString( value ), " like " );
 	}
 
-    /**
-     *  Apply an "ilike" constraint
-     */
+	/**
+	 *  Apply an "ilike" constraint
+	 */
 	public AuditCriterion ilike(T value) {
 		return new IlikeAuditExpression( alias, propertyNameGetter, value.toString() );
 	}
@@ -449,7 +447,7 @@ public AuditOrder asc() {
 	public AuditOrder desc() {
 		return new PropertyAuditOrder( alias, propertyNameGetter, false );
 	}
-	
+
 	@Override
 	public Object convertQueryResult(
 			EnversService enversService,
@@ -459,5 +457,5 @@ public Object convertQueryResult(
 			Object value) {
 		return value;
 	}
-	
+
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java
index 665e75346dd5..4c33a96a19f0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java
index 7547fbb619e9..b1f14f759726 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/MatchMode.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/MatchMode.java
index fb192b6c0d70..889492fb1ad8 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/MatchMode.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/MatchMode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/AbstractAtomicExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/AbstractAtomicExpression.java
index 44c855c90d07..703c0c5ac313 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/AbstractAtomicExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/AbstractAtomicExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java
index bf95efaa614b..3b1375f6d2bf 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java
index b638e83b8226..18a76c1f532f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/EntityTypeAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/EntityTypeAuditExpression.java
index 986720b8744f..6914b8a852dc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/EntityTypeAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/EntityTypeAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionFunctionAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionFunctionAuditExpression.java
index bea7065b0ba3..b8aa585d50ed 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionFunctionAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionFunctionAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionPropertyAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionPropertyAuditExpression.java
index 333ad20aaf9b..4e705ab7244d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionPropertyAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/FunctionPropertyAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java
index 08b56609fa4e..f4176a9f5d87 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IlikeAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IlikeAuditExpression.java
index 10c9eb9999d9..550ab74a5359 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IlikeAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IlikeAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java
index bc8160a857d2..a3723bf17224 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java
index 2fd9b9f77d22..3d75d8689154 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java
index 648afae9fe26..8d5d48d49ff0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java
index 695a96eb3ce5..0a5f61c12e90 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java
index 90c6a08212f4..f785e075e97d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java
index e90fd780c857..c0c0c83e85f2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyFunctionAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyFunctionAuditExpression.java
index e940bc9ab5a8..4b4fdcb8cbc7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyFunctionAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyFunctionAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditEqualityExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditEqualityExpression.java
index 01ca6ba310f4..eed0a8962882 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditEqualityExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditEqualityExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditInExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditInExpression.java
index 9160e23bdd9a..462216cd1dcc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditInExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditInExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java
index d9b177f82bb5..543dbf34f05e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java
index 03a04505698c..887dc2f0176c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
@@ -11,7 +9,6 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.envers.boot.internal.EnversService;
 import org.hibernate.envers.exception.AuditException;
-import org.hibernate.envers.internal.entities.ComponentDescription;
 import org.hibernate.envers.internal.entities.RelationDescription;
 import org.hibernate.envers.internal.entities.RelationType;
 import org.hibernate.envers.internal.reader.AuditReaderImplementor;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleFunctionAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleFunctionAuditExpression.java
index 23f4d70509f0..dfcf3d4a57ac 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleFunctionAuditExpression.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleFunctionAuditExpression.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.criteria.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditAssociationQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditAssociationQuery.java
index 1a052524c00b..fd7b70fb2d1b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditAssociationQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditAssociationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java
index 17ad72e160a3..4d6b11299b8b 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
@@ -96,7 +94,7 @@ protected AbstractAuditQuery(
 	public String getAlias() {
 		return REFERENCED_ENTITY_ALIAS;
 	}
-	
+
 	protected Query buildQuery() {
 		Query query = qb.toQuery( versionsReader.getSessionImplementor() );
 		setQueryProperties( query );
@@ -362,9 +360,9 @@ protected String getEntityName() {
 		// todo: can this be replaced by a call to getEntittyConfiguration#getEntityClassName()?
 		return entityName;
 	}
-	
+
 	protected void addAssociationQuery(String associationName, AbstractAuditAssociationQuery query) {
 		associationQueries.add( query );
 		associationQueryMap.put( associationName, query );
-	}	
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditQueryImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditQueryImplementor.java
index bf0dbb2af73f..9cb335eb1cc7 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditQueryImplementor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditQueryImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionAssociationQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionAssociationQuery.java
index 206c070ec73c..22f85a97674e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionAssociationQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionAssociationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java
index c34b21de4395..f8a49d2b0463 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
@@ -57,22 +55,22 @@ public EntitiesAtRevisionQuery(
 
 	public List list() {
 		/*
-         * The query that we need to create:
-         *   SELECT new list(e) FROM versionsReferencedEntity e
-         *   WHERE
-         * (all specified conditions, transformed, on the "e" entity) AND
-         * (selecting e entities at revision :revision)
-         *   --> for DefaultAuditStrategy:
-         *     e.revision = (SELECT max(e2.revision) FROM versionsReferencedEntity e2
-         *       WHERE e2.revision <= :revision AND e2.id = e.id) 
-         *     
-         *   --> for ValidityAuditStrategy:
-         *     e.revision <= :revision and (e.endRevision > :revision or e.endRevision is null)
-         *     
-         *     AND
-         * (only non-deleted entities)
-         *     e.revision_type != DEL
-         */
+		 * The query that we need to create:
+		 *   SELECT new list(e) FROM versionsReferencedEntity e
+		 *   WHERE
+		 * (all specified conditions, transformed, on the "e" entity) AND
+		 * (selecting e entities at revision :revision)
+		 *   --> for DefaultAuditStrategy:
+		 *     e.revision = (SELECT max(e2.revision) FROM versionsReferencedEntity e2
+		 *       WHERE e2.revision <= :revision AND e2.id = e.id)
+		 *
+		 *   --> for ValidityAuditStrategy:
+		 *     e.revision <= :revision and (e.endRevision > :revision or e.endRevision is null)
+		 *
+		 *     AND
+		 * (only non-deleted entities)
+		 *     e.revision_type != DEL
+		 */
 		Configuration configuration = enversService.getConfig();
 		String revisionPropertyPath = configuration.getRevisionNumberPath();
 		String originalIdPropertyName = configuration.getOriginalIdPropertyName();
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java
index b8cc65695592..7f0f4fcee50a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
@@ -56,12 +54,12 @@ public EntitiesModifiedAtRevisionQuery(
 	@Override
 	public List list() {
 		/*
-         * The query that we need to create:
-         *   SELECT new list(e) FROM versionsReferencedEntity e
-         *   WHERE
-         * (all specified conditions, transformed, on the "e" entity) AND
-         * e.revision = :revision
-         */
+		 * The query that we need to create:
+		 *   SELECT new list(e) FROM versionsReferencedEntity e
+		 *   WHERE
+		 * (all specified conditions, transformed, on the "e" entity) AND
+		 * e.revision = :revision
+		 */
 		String revisionPropertyPath = enversService.getConfig().getRevisionNumberPath();
 		qb.getRootParameters().addWhereWithParam( revisionPropertyPath, "=", revision );
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityAssociationQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityAssociationQuery.java
index 36063209760c..12f3558df310 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityAssociationQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityAssociationQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java
index 9edb2d5a3e9e..a28ff1822309 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.impl;
 
@@ -130,14 +128,14 @@ private Number getRevisionNumber(Map versionsEntity) {
 	public List list() throws AuditException {
 		Configuration configuration = enversService.getConfig();
 
-        /*
+		/*
 		The query that should be executed in the versions table:
-        SELECT e (unless another projection is specified) FROM ent_ver e, rev_entity r WHERE
-          e.revision_type != DEL (if selectDeletedEntities == false) AND
-          e.revision = r.revision AND
-          (all specified conditions, transformed, on the "e" entity)
-          ORDER BY e.revision ASC (unless another order or projection is specified)
-         */
+		SELECT e (unless another projection is specified) FROM ent_ver e, rev_entity r WHERE
+		e.revision_type != DEL (if selectDeletedEntities == false) AND
+		e.revision = r.revision AND
+		(all specified conditions, transformed, on the "e" entity)
+		ORDER BY e.revision ASC (unless another order or projection is specified)
+		 */
 		if ( !selectDeletedEntities ) {
 			// e.revision_type != DEL AND
 			qb.getRootParameters().addWhereWithParam( configuration.getRevisionTypePropertyName(), "<>", RevisionType.DEL );
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java
index 5665cb99ea09..244c816f60e0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java
index e1cdf4748344..e3d3c219ac87 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java
index 99f8d17aeac0..2d49c85df66e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java
index 73133d02ad7e..ae864d8c0e67 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java
index c71353336530..fc33ed91aa55 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java
index cb3ce607516d..70352ba9a77f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java
index 53cfeaed7dfe..310de4e6c9c9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.internal.property;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java
index 3e59a61e70b3..651e3a4fc3bf 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.order;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/NullPrecedence.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/NullPrecedence.java
index 8919792d277d..9e82718322f9 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/NullPrecedence.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/NullPrecedence.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.order;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java
index 6803a824fded..911abddcdf80 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.order.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java
index 72ec5cdb37cd..957863d0963d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.projection;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/EntityAuditProjection.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/EntityAuditProjection.java
index a53928c974c0..5cc15924225e 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/EntityAuditProjection.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/EntityAuditProjection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.projection.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java
index b46f55ea3c29..915cf2f36695 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.query.projection.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java
index 06739898b5a9..8a3865b0d333 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java
index b8baf0da6519..7cac896959a6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
index defe56673d14..000f92c5d2aa 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/DefaultAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/DefaultAuditStrategy.java
index 40efb4998422..ef0e105f8fad 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/DefaultAuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/DefaultAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java
index c2a808d8ba30..d4cf25475642 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy.internal;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategy.java
index de82d69ac0bc..10f7fb9335c6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategy.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategyContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategyContext.java
index ec1834f44b82..7452524d834a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategyContext.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/AuditStrategyContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/MappingContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/MappingContext.java
index c0a062fb94f4..f903cdfc2705 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/MappingContext.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/spi/MappingContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.strategy.spi;
 
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java
index 63929080fff6..e3c49d8e40ce 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.tools;
 
diff --git a/hibernate-envers/src/test/java/ee/estonia/entities/Child.java b/hibernate-envers/src/test/java/ee/estonia/entities/Child.java
index f27a9c41c6c0..a19a8cde7cfe 100644
--- a/hibernate-envers/src/test/java/ee/estonia/entities/Child.java
+++ b/hibernate-envers/src/test/java/ee/estonia/entities/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package ee.estonia.entities;
 
diff --git a/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java b/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java
index 00d9ca3066eb..9bcd4fa169c7 100644
--- a/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java
+++ b/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package ee.estonia.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java
index 74ab2e7a8289..fa5edd319552 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java
index 9cccc8183c36..fdc3a5c39764 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java
@@ -1,33 +1,22 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.envers.test.integration.customtype;
 
-import java.util.Arrays;
-import java.util.List;
 
-import org.hibernate.annotations.Type;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.envers.Audited;
-import org.hibernate.envers.boot.internal.EnversService;
 import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
 import org.hibernate.orm.test.envers.Priority;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.type.CustomType;
-import org.hibernate.usertype.UserType;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Test;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import java.time.Duration;
 
 @JiraKey(value = "HHH-17243")
@@ -37,17 +26,17 @@ public class DurationTest extends BaseEnversJPAFunctionalTestCase{
 	@Audited
 	public static class DurationTestEntity {
 		@Id
-		@GeneratedValue 
+		@GeneratedValue
 		private Integer id;
 
 		private Duration duration;
 
-                DurationTestEntity(){
-                    
-                }
-                
+				DurationTestEntity(){
+
+				}
+
 		DurationTestEntity(Duration aDuration) {
-                    this.duration = aDuration;
+					this.duration = aDuration;
 		}
 
 		public Integer getId() {
@@ -86,5 +75,5 @@ public void initData() {
 			duration.setDuration(Duration.ofHours(3));
 			entityManager.merge(duration);
 		} );
-	}    
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java
index cf2a7a297878..53ae6c0be25d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserType.java
index 8f48cfaac317..a50cf47b9a8b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java
index b5b0a769d68a..733f36716891 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java
index a7f726dddb80..11f55499e4d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
index e8443d27789f..5845f00b2f4b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java
index 7f3935501180..1e0795ba813d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.customtype;
 
@@ -120,4 +118,4 @@ public void testEnumRepresentation() {
 		Assert.assertArrayEquals( new Object[]{ 0, 0 }, values.get( 0 ) );
 		Assert.assertArrayEquals( new Object[]{ 1, 1 }, values.get( 1 ) );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
index c9ce9347b87c..583013b45929 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
index 4fc35ea3ade9..b110e43fb975 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
index 68c31186204b..e98bdea07dcf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
index 43af15707600..b0862d0e5664 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
index 4979c1dbd8fb..eb6d604dea5b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java
index 7345ffc0cd02..c4d69ecf2585 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
index af372d0f23b4..6f7c51aae3ae 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java
index 1b4768458a44..bf1d9a57838d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java
index 61019d396455..7411ca01292f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -23,33 +21,33 @@
 @Entity
 @Table(name = "address")
 public class Address extends BaseDomainEntity {
-    private static final long serialVersionUID = 7380477602657080463L;
+	private static final long serialVersionUID = 7380477602657080463L;
 
-    @Column(name = "name")
-    private String name;
+	@Column(name = "name")
+	private String name;
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "id", cascade = CascadeType.ALL)
-    Collection versions = new LinkedList<>();
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "id", cascade = CascadeType.ALL)
+	Collection versions = new LinkedList<>();
 
-    Address() {
-    }
+	Address() {
+	}
 
-    Address(Instant when, String who, String name) {
-        super( when, who );
-        this.name = name;
-    }
+	Address(Instant when, String who, String name) {
+		super( when, who );
+		this.name = name;
+	}
 
-    public AddressVersion addInitialVersion(String description) {
-        AddressVersion version = new AddressVersion( getCreatedAt(), getCreatedBy(), this, 0, description );
-        versions.add( version );
-        return version;
-    }
+	public AddressVersion addInitialVersion(String description) {
+		AddressVersion version = new AddressVersion( getCreatedAt(), getCreatedBy(), this, 0, description );
+		versions.add( version );
+		return version;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public Collection getVersions() {
-        return versions;
-    }
+	public Collection getVersions() {
+		return versions;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java
index 946173119d53..e2652af826c0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -23,39 +21,39 @@
 @Entity
 @Table(name = "address_version")
 public class AddressVersion extends BaseDomainEntityVersion {
-    private static final long serialVersionUID = 1100389518057335117L;
-
-    @Id
-    @ManyToOne(optional = false, fetch = FetchType.LAZY)
-    @JoinColumn(name = "id", referencedColumnName = "id", updatable = false, nullable = false)
-    private Address id;
-
-    @Column(name = "description", updatable = false)
-    private String description;
-
-    AddressVersion() {
-    }
-
-    AddressVersion(Instant when, String who, Address id, long version, String description) {
-        setCreatedAt( when );
-        setCreatedBy( who );
-        setVersion( version );
-        this.id = Objects.requireNonNull(id );
-        this.description = description;
-    }
-
-    @Override
-    public Address getId() {
-        return id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public AddressVersion update(Instant when, String who, String description) {
-        AddressVersion version = new AddressVersion( when, who, id, getVersion() + 1, description );
-        id.versions.add( version );
-        return version;
-    }
+	private static final long serialVersionUID = 1100389518057335117L;
+
+	@Id
+	@ManyToOne(optional = false, fetch = FetchType.LAZY)
+	@JoinColumn(name = "id", referencedColumnName = "id", updatable = false, nullable = false)
+	private Address id;
+
+	@Column(name = "description", updatable = false)
+	private String description;
+
+	AddressVersion() {
+	}
+
+	AddressVersion(Instant when, String who, Address id, long version, String description) {
+		setCreatedAt( when );
+		setCreatedBy( who );
+		setVersion( version );
+		this.id = Objects.requireNonNull(id );
+		this.description = description;
+	}
+
+	@Override
+	public Address getId() {
+		return id;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public AddressVersion update(Instant when, String who, String description) {
+		AddressVersion version = new AddressVersion( when, who, id, getVersion() + 1, description );
+		id.versions.add( version );
+		return version;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java
index 250e5835bb8d..3dd70a840762 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java
index 0a793e4fa31b..b460e91cc8ea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -19,38 +17,38 @@
  */
 @MappedSuperclass
 public abstract class BaseDomainEntity extends BaseDomainEntityMetadata {
-    private static final long serialVersionUID = 1023010094948580516L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    protected long id = 0;
-
-    BaseDomainEntity() {
-
-    }
-
-    BaseDomainEntity(Instant timestamp, String who) {
-        super( timestamp, who );
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if ( this == o ) {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() ) {
-            return false;
-        }
-        BaseDomainEntity that = (BaseDomainEntity) o;
-        return id == that.id;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash( id );
-    }
+	private static final long serialVersionUID = 1023010094948580516L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	protected long id = 0;
+
+	BaseDomainEntity() {
+
+	}
+
+	BaseDomainEntity(Instant timestamp, String who) {
+		super( timestamp, who );
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
+		BaseDomainEntity that = (BaseDomainEntity) o;
+		return id == that.id;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash( id );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java
index 0f495283b9f1..41c45c228fd4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -19,37 +17,37 @@
  */
 @MappedSuperclass
 public abstract class BaseDomainEntityMetadata extends Base implements Serializable {
-    private static final long serialVersionUID = 2765056578095518489L;
+	private static final long serialVersionUID = 2765056578095518489L;
 
-    @Column(name = "created_by", nullable = false, updatable = false)
-    private String createdBy;
+	@Column(name = "created_by", nullable = false, updatable = false)
+	private String createdBy;
 
-    @CreationTimestamp
-    @Column(name = "created_at", nullable = false, updatable = false)
-    private Instant createdAt;
+	@CreationTimestamp
+	@Column(name = "created_at", nullable = false, updatable = false)
+	private Instant createdAt;
 
-    BaseDomainEntityMetadata() {
+	BaseDomainEntityMetadata() {
 
-    }
+	}
 
-    BaseDomainEntityMetadata(Instant timestamp, String who) {
-        this.createdBy = who;
-        this.createdAt = timestamp;
-    }
+	BaseDomainEntityMetadata(Instant timestamp, String who) {
+		this.createdBy = who;
+		this.createdAt = timestamp;
+	}
 
-    public String getCreatedBy() {
-        return createdBy;
-    }
+	public String getCreatedBy() {
+		return createdBy;
+	}
 
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
 
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
+	public Instant getCreatedAt() {
+		return createdAt;
+	}
 
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
+	public void setCreatedAt(Instant createdAt) {
+		this.createdAt = createdAt;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java
index 6fb683a36145..0d095fa997dd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -17,36 +15,36 @@
  */
 @MappedSuperclass
 public abstract class BaseDomainEntityVersion extends BaseDomainEntityMetadata {
-    private static final long serialVersionUID = 1564895954324242368L;
-
-    @Id
-    @Column(name = "version", nullable = false, updatable = false)
-    private long version;
-
-    public long getVersion() {
-        return version;
-    }
-
-    public void setVersion(long version) {
-        this.version = version;
-    }
-
-    public abstract Object getId();
-
-    @Override
-    public boolean equals(Object o) {
-        if ( this == o ) {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() ) {
-            return false;
-        }
-        BaseDomainEntityVersion that = (BaseDomainEntityVersion) o;
-        return Objects.equals( getId(), that.getId() ) && version == that.version;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash( getId(), version );
-    }
+	private static final long serialVersionUID = 1564895954324242368L;
+
+	@Id
+	@Column(name = "version", nullable = false, updatable = false)
+	private long version;
+
+	public long getVersion() {
+		return version;
+	}
+
+	public void setVersion(long version) {
+		this.version = version;
+	}
+
+	public abstract Object getId();
+
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
+		BaseDomainEntityVersion that = (BaseDomainEntityVersion) o;
+		return Objects.equals( getId(), that.getId() ) && version == that.version;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash( getId(), version );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java
index eb0854cb2bb8..73599dd74fa6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -20,14 +18,14 @@
 @Entity
 public class ChildUser extends User {
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.REMOVE)
-    @NotAudited
-    private List shipmentList;
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.REMOVE)
+	@NotAudited
+	private List shipmentList;
 
-    ChildUser() {
-    }
+	ChildUser() {
+	}
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java
index be4ad702ace1..079ab9481f86 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -19,7 +17,6 @@
 import java.util.Map;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Tests that proxies can still be resolved correctly in ToOneIdMapper even the object is already deleted and can't
@@ -31,59 +28,59 @@
 @JiraKey(value = "HHH-13945")
 @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
 public class ManyToOneLazyDeleteTest extends BaseEnversFunctionalTestCase {
-    private Long shipmentId;
-    private User user;
+	private Long shipmentId;
+	private User user;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Shipment.class, Address.class, AddressVersion.class, User.class, ChildUser.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Shipment.class, Address.class, AddressVersion.class, User.class, ChildUser.class };
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() {
+	@Test
+	@Priority(10)
+	public void initData() {
 
-        this.shipmentId = doInHibernate( this::sessionFactory, session -> {
-            final Shipment shipment = new Shipment( Instant.now(), "system", Instant.now().plus( Duration.ofDays( 3 ) ), "abcd123", null, null );
-            session.persist( shipment );
-            session.flush();
+		this.shipmentId = doInHibernate( this::sessionFactory, session -> {
+			final Shipment shipment = new Shipment( Instant.now(), "system", Instant.now().plus( Duration.ofDays( 3 ) ), "abcd123", null, null );
+			session.persist( shipment );
+			session.flush();
 
-            final Address origin = new Address( Instant.now(), "system", "Valencia#1" );
-            final Address destination = new Address( Instant.now(), "system", "Madrid#3" );
-            final AddressVersion originVersion0 = origin.addInitialVersion( "Poligono Manises" );
-            final AddressVersion destinationVersion0 = destination.addInitialVersion( "Poligono Alcobendas" );
-            user = new ChildUser();
-            session.persist( origin );
-            session.persist( destination );
-            session.persist( user );
+			final Address origin = new Address( Instant.now(), "system", "Valencia#1" );
+			final Address destination = new Address( Instant.now(), "system", "Madrid#3" );
+			final AddressVersion originVersion0 = origin.addInitialVersion( "Poligono Manises" );
+			final AddressVersion destinationVersion0 = destination.addInitialVersion( "Poligono Alcobendas" );
+			user = new ChildUser();
+			session.persist( origin );
+			session.persist( destination );
+			session.persist( user );
 
-            session.flush();
-            shipment.setUser( user );
-            shipment.setOrigin( originVersion0 );
-            shipment.setDestination( destinationVersion0 );
+			session.flush();
+			shipment.setUser( user );
+			shipment.setOrigin( originVersion0 );
+			shipment.setDestination( destinationVersion0 );
 
-            session.merge( shipment );
-            session.flush();
+			session.merge( shipment );
+			session.flush();
 
-            return shipment.getId();
-        } );
+			return shipment.getId();
+		} );
 
-        doInHibernate( this::sessionFactory, session -> {
-            final Shipment shipment = session.get( Shipment.class, shipmentId );
-            session.remove(shipment);
-            // Cast the User instance to the ChildUser, and delete the child one, so the cache for
-            // the User instance will not be there, and entityNotFound exception will be thrown while envers processing it
-            ChildUser childUser = session.get(ChildUser.class, user.getId());
-            session.remove(childUser);
+		doInHibernate( this::sessionFactory, session -> {
+			final Shipment shipment = session.get( Shipment.class, shipmentId );
+			session.remove(shipment);
+			// Cast the User instance to the ChildUser, and delete the child one, so the cache for
+			// the User instance will not be there, and entityNotFound exception will be thrown while envers processing it
+			ChildUser childUser = session.get(ChildUser.class, user.getId());
+			session.remove(childUser);
 
-            session.flush();
-        } );
-    }
+			session.flush();
+		} );
+	}
 
-    @Override
-    protected void addSettings(Map settings) {
-        super.addSettings( settings );
+	@Override
+	protected void addSettings(Map settings) {
+		super.addSettings( settings );
 
-        settings.put(EnversSettings.STORE_DATA_AT_DELETE, "true");
-    }
+		settings.put(EnversSettings.STORE_DATA_AT_DELETE, "true");
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java
index 9001fb354929..e258ce0d8700 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -31,51 +29,51 @@
 @JiraKey(value = "HHH-13760")
 @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
 public class ManyToOneLazyFetchTest extends BaseEnversFunctionalTestCase {
-    private Long shipmentId;
+	private Long shipmentId;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Shipment.class, Address.class, AddressVersion.class, User.class, ChildUser.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Shipment.class, Address.class, AddressVersion.class, User.class, ChildUser.class };
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() {
-        this.shipmentId = doInHibernate( this::sessionFactory, session -> {
-            final Shipment shipment = new Shipment( Instant.now(), "system", Instant.now().plus( Duration.ofDays( 3 ) ), "abcd123", null, null );
-            session.persist( shipment );
-            session.flush();
+	@Test
+	@Priority(10)
+	public void initData() {
+		this.shipmentId = doInHibernate( this::sessionFactory, session -> {
+			final Shipment shipment = new Shipment( Instant.now(), "system", Instant.now().plus( Duration.ofDays( 3 ) ), "abcd123", null, null );
+			session.persist( shipment );
+			session.flush();
 
-            final Address origin = new Address( Instant.now(), "system", "Valencia#1" );
-            final Address destination = new Address( Instant.now(), "system", "Madrid#3" );
-            final AddressVersion originVersion0 = origin.addInitialVersion( "Poligono Manises" );
-            final AddressVersion destinationVersion0 = destination.addInitialVersion( "Poligono Alcobendas" );
-            session.persist( origin );
-            session.persist( destination );
-            session.flush();
+			final Address origin = new Address( Instant.now(), "system", "Valencia#1" );
+			final Address destination = new Address( Instant.now(), "system", "Madrid#3" );
+			final AddressVersion originVersion0 = origin.addInitialVersion( "Poligono Manises" );
+			final AddressVersion destinationVersion0 = destination.addInitialVersion( "Poligono Alcobendas" );
+			session.persist( origin );
+			session.persist( destination );
+			session.flush();
 
-            shipment.setOrigin( originVersion0 );
-            shipment.setDestination( destinationVersion0 );
-            session.merge( shipment );
-            session.flush();
+			shipment.setOrigin( originVersion0 );
+			shipment.setDestination( destinationVersion0 );
+			session.merge( shipment );
+			session.flush();
 
-            return shipment.getId();
-        } );
+			return shipment.getId();
+		} );
 
-        doInHibernate( this::sessionFactory, session -> {
-            final Shipment shipment = session.get( Shipment.class, shipmentId );
+		doInHibernate( this::sessionFactory, session -> {
+			final Shipment shipment = session.get( Shipment.class, shipmentId );
 
-            Hibernate.initialize( shipment.getOrigin() );
-            Hibernate.initialize( shipment.getDestination() );
-            shipment.setClosed( true );
+			Hibernate.initialize( shipment.getOrigin() );
+			Hibernate.initialize( shipment.getDestination() );
+			shipment.setClosed( true );
 
-            session.merge( shipment );
-            session.flush();
-        } );
-    }
+			session.merge( shipment );
+			session.flush();
+		} );
+	}
 
-    @Test
-    public void testRevisionHistory() {
-        assertEquals( Arrays.asList( 1, 2 ), getAuditReader().getRevisions( Shipment.class, shipmentId ) );
-    }
+	@Test
+	public void testRevisionHistory() {
+		assertEquals( Arrays.asList( 1, 2 ), getAuditReader().getRevisions( Shipment.class, shipmentId ) );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyProxyTest.java
index ee87176703d0..d5968f040cf0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyProxyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java
index 78e272ab79a6..cbefd44453d3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -31,86 +29,86 @@
 @Audited
 @AuditTable(value = "shipment_audit")
 public class Shipment extends BaseDomainEntity {
-    private static final long serialVersionUID = 5061763935663020703L;
-
-    @Column(name = "due_date", nullable = false, updatable = false)
-    private Instant dueDate;
-
-    @Column(name = "identifier", nullable = false, updatable = false)
-    private String identifier;
-
-    @Version
-    @Column(name = "mvc_version", nullable = false)
-    private Long mvcVersion;
-
-    @Column(name = "closed")
-    private Boolean closed;
-
-    @ManyToOne(optional = true, fetch = FetchType.LAZY, targetEntity = AddressVersion.class)
-    @JoinColumns(value = {
-            @JoinColumn(name = "origin_address_id", referencedColumnName = "id", nullable = true),
-            @JoinColumn(name = "origin_address_version", referencedColumnName = "version", nullable = true)
-    })
-    @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-    private AddressVersion origin;
-
-    @ManyToOne(optional = true, fetch = FetchType.LAZY, targetEntity = AddressVersion.class)
-    @JoinColumns(value = {
-            @JoinColumn(name = "destination_address_id", referencedColumnName = "id", nullable = true),
-            @JoinColumn(name = "destination_address_version", referencedColumnName = "version", nullable = true)
-    })
-    @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-    private AddressVersion destination;
-
-    @ManyToOne(optional = true, fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = true)
-    @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-    private User user;
-
-    Shipment() {
-    }
-
-    Shipment(Instant when, String who, Instant dueDate, String identifier, AddressVersion origin, AddressVersion dest) {
-        super( when, who );
-        this.dueDate = dueDate;
-        this.identifier = Objects.requireNonNull( identifier );
-        this.origin = origin;
-        this.destination = dest;
-    }
-
-    public Instant getDueDate() {
-        return dueDate;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public Boolean getClosed() {
-        return closed;
-    }
-
-    public void setClosed(Boolean closed) {
-        this.closed = closed;
-    }
-
-    public AddressVersion getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(AddressVersion origin) {
-        this.origin = origin;
-    }
-
-    public AddressVersion getDestination() {
-        return destination;
-    }
-
-    public void setDestination(AddressVersion destination) {
-        this.destination = destination;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
+	private static final long serialVersionUID = 5061763935663020703L;
+
+	@Column(name = "due_date", nullable = false, updatable = false)
+	private Instant dueDate;
+
+	@Column(name = "identifier", nullable = false, updatable = false)
+	private String identifier;
+
+	@Version
+	@Column(name = "mvc_version", nullable = false)
+	private Long mvcVersion;
+
+	@Column(name = "closed")
+	private Boolean closed;
+
+	@ManyToOne(optional = true, fetch = FetchType.LAZY, targetEntity = AddressVersion.class)
+	@JoinColumns(value = {
+			@JoinColumn(name = "origin_address_id", referencedColumnName = "id", nullable = true),
+			@JoinColumn(name = "origin_address_version", referencedColumnName = "version", nullable = true)
+	})
+	@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+	private AddressVersion origin;
+
+	@ManyToOne(optional = true, fetch = FetchType.LAZY, targetEntity = AddressVersion.class)
+	@JoinColumns(value = {
+			@JoinColumn(name = "destination_address_id", referencedColumnName = "id", nullable = true),
+			@JoinColumn(name = "destination_address_version", referencedColumnName = "version", nullable = true)
+	})
+	@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+	private AddressVersion destination;
+
+	@ManyToOne(optional = true, fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id", referencedColumnName = "id", nullable = true)
+	@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+	private User user;
+
+	Shipment() {
+	}
+
+	Shipment(Instant when, String who, Instant dueDate, String identifier, AddressVersion origin, AddressVersion dest) {
+		super( when, who );
+		this.dueDate = dueDate;
+		this.identifier = Objects.requireNonNull( identifier );
+		this.origin = origin;
+		this.destination = dest;
+	}
+
+	public Instant getDueDate() {
+		return dueDate;
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public Boolean getClosed() {
+		return closed;
+	}
+
+	public void setClosed(Boolean closed) {
+		this.closed = closed;
+	}
+
+	public AddressVersion getOrigin() {
+		return origin;
+	}
+
+	public void setOrigin(AddressVersion origin) {
+		this.origin = origin;
+	}
+
+	public AddressVersion getDestination() {
+		return destination;
+	}
+
+	public void setDestination(AddressVersion destination) {
+		this.destination = destination;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java
index 0f4ee5f80c3a..f0cda8d62a71 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.manytoone.lazy;
 
@@ -25,18 +23,18 @@
 @Table(name = "user_tbl")
 public class User {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    protected long id = 0;
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	protected long id = 0;
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.REMOVE)
-    @NotAudited
-    private List shipmentList;
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.REMOVE)
+	@NotAudited
+	private List shipmentList;
 
-    User() {
-    }
+	User() {
+	}
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java
index 2efefc83e81d..e40e46209cf6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.maytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
index ccd4b18f5232..c9dea374db0d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.envers.test.integration.modifiedflags;
 
 import java.util.List;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
index 014838de7e63..3613dbd3c9e4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.envers.test.integration.modifiedflags;
 
 import java.util.List;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
index 19ff6c511dfc..f0522833a087 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.envers.test.integration.modifiedflags;
 
 import java.util.List;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java
index 0553a1025c97..12930e7b351d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
index ef506e9f5b9d..ffc79446ee76 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.naming;
 
@@ -30,7 +28,7 @@
  * @author Erik-Berndt Scheper
  */
 public class VersionsJoinTableRangeComponentNamingTest extends
-													   BaseEnversJPAFunctionalTestCase {
+													BaseEnversJPAFunctionalTestCase {
 	private Integer vjrcte_id;
 	private Integer vjtrte_id;
 	private Integer vjtrtae_id1;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java
index 22dfc20ba555..60589e2e36b8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java
index fae2d4faa17b..f3b37cb1ac22 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AuditFunctionQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AuditFunctionQueryTest.java
index 7d562a8c14be..eccbccef5422 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AuditFunctionQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AuditFunctionQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java
index 8b922ef5982f..cf1337dedc93 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
index bf209ee83b9d..fb79316cc7dd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java
index 4f23324449d8..da308780bed7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java
index 52b790fb7e11..5a56a4ac5c65 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java
index e6c29cb054f5..2715f78fc90c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java
index d9c03eabd93f..515a4ea922a5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StrictJpaComplianceTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StrictJpaComplianceTest.java
index e2e21006617b..49d725ebb804 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StrictJpaComplianceTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StrictJpaComplianceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java
index b202e3ff591e..ed83c0811fdd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java
index 771669e7410b..b56f9a716b45 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java
index 20798db1dda1..a3aedd4aaf26 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.query.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
index 4e2d2f1e75e3..044d575654c2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.readwriteexpression;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
index 73ea5ab06d56..53e09a28d795 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.readwriteexpression;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
index 75109f0ee80b..cbb03a87b24a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
@@ -1,13 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.envers.test.integration.reventity;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.hibernate.mapping.Selectable;
@@ -49,4 +45,4 @@ public void testChildRevColumnType() {
 		assertNotNull( column );
 		assertEquals( column.getSqlType(), "int" );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionFactoryInterceptorTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionFactoryInterceptorTransactionTest.java
index 1782a4348160..5df6fd3b1ab8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionFactoryInterceptorTransactionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionFactoryInterceptorTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.tm;
 
@@ -30,48 +28,48 @@
  */
 public class SessionFactoryInterceptorTransactionTest extends BaseEnversJPAFunctionalTestCase {
 
-    private TestInterceptor interceptor;
-    private TransactionManager tm;
+	private TestInterceptor interceptor;
+	private TransactionManager tm;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { StrTestEntity.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { StrTestEntity.class };
+	}
 
-    @Override
-    protected void addConfigOptions(Map options) {
-        super.addConfigOptions( options );
+	@Override
+	protected void addConfigOptions(Map options) {
+		super.addConfigOptions( options );
 
-        TestInterceptor.reset();
+		TestInterceptor.reset();
 
-        this.interceptor = new TestInterceptor();
-        options.put( AvailableSettings.INTERCEPTOR, interceptor );
-        options.put( AvailableSettings.ALLOW_JTA_TRANSACTION_ACCESS, true );
+		this.interceptor = new TestInterceptor();
+		options.put( AvailableSettings.INTERCEPTOR, interceptor );
+		options.put( AvailableSettings.ALLOW_JTA_TRANSACTION_ACCESS, true );
 
-        TestingJtaBootstrap.prepare( options );
-        tm = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
-    }
+		TestingJtaBootstrap.prepare( options );
+		tm = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() throws Exception {
-        // Revision 1
-        EntityManager em = getEntityManager();
-        // Explicitly use manual flush to trigger separate temporary session write via Envers
-        em.unwrap( SessionImpl.class ).setHibernateFlushMode( FlushMode.MANUAL );
-        tm.begin();
-        StrTestEntity entity = new StrTestEntity( "Test" );
-        em.persist( entity );
-        em.flush();
-        tm.commit();
-    }
+	@Test
+	@Priority(10)
+	public void initData() throws Exception {
+		// Revision 1
+		EntityManager em = getEntityManager();
+		// Explicitly use manual flush to trigger separate temporary session write via Envers
+		em.unwrap( SessionImpl.class ).setHibernateFlushMode( FlushMode.MANUAL );
+		tm.begin();
+		StrTestEntity entity = new StrTestEntity( "Test" );
+		em.persist( entity );
+		em.flush();
+		tm.commit();
+	}
 
-    @Test
-    public void testInterceptorInvocations() throws Exception {
-        // Expect the interceptor to have been created once and invoked twice, once for the original session
-        // and follow-up for the Envers temporary session.
-        final Map invocationMap = TestInterceptor.getBeforeCompletionCallbacks();
-        assertEquals( 1, invocationMap.size() );
-        assertEquals( invocationMap.values().stream().filter( v -> v == 2 ).count(), 1 );
-    }
+	@Test
+	public void testInterceptorInvocations() throws Exception {
+		// Expect the interceptor to have been created once and invoked twice, once for the original session
+		// and follow-up for the Envers temporary session.
+		final Map invocationMap = TestInterceptor.getBeforeCompletionCallbacks();
+		assertEquals( 1, invocationMap.size() );
+		assertEquals( invocationMap.values().stream().filter( v -> v == 2 ).count(), 1 );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionInterceptorTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionInterceptorTransactionTest.java
index 9b072e04846a..c37a4a8bee74 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionInterceptorTransactionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/SessionInterceptorTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.tm;
 
@@ -30,45 +28,45 @@
  */
 public class SessionInterceptorTransactionTest extends BaseEnversJPAFunctionalTestCase {
 
-    private TransactionManager tm;
+	private TransactionManager tm;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { StrTestEntity.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { StrTestEntity.class };
+	}
 
-    @Override
-    protected void addConfigOptions(Map options) {
-        super.addConfigOptions( options );
+	@Override
+	protected void addConfigOptions(Map options) {
+		super.addConfigOptions( options );
 
-        TestInterceptor.reset();
+		TestInterceptor.reset();
 
-        options.put( AvailableSettings.SESSION_SCOPED_INTERCEPTOR, TestInterceptor.class.getName() );
-        options.put( AvailableSettings.ALLOW_JTA_TRANSACTION_ACCESS, "true" );
+		options.put( AvailableSettings.SESSION_SCOPED_INTERCEPTOR, TestInterceptor.class.getName() );
+		options.put( AvailableSettings.ALLOW_JTA_TRANSACTION_ACCESS, "true" );
 
-        TestingJtaBootstrap.prepare( options );
-        tm = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
-    }
+		TestingJtaBootstrap.prepare( options );
+		tm = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() throws Exception {
-        // Revision 1
-        EntityManager em = getEntityManager();
-        // Explicitly use manual flush to trigger separate temporary session write via Envers
-        em.unwrap( SessionImpl.class ).setHibernateFlushMode( FlushMode.MANUAL );
-        tm.begin();
-        StrTestEntity entity = new StrTestEntity( "Test" );
-        em.persist( entity );
-        em.flush();
-        tm.commit();
-    }
+	@Test
+	@Priority(10)
+	public void initData() throws Exception {
+		// Revision 1
+		EntityManager em = getEntityManager();
+		// Explicitly use manual flush to trigger separate temporary session write via Envers
+		em.unwrap( SessionImpl.class ).setHibernateFlushMode( FlushMode.MANUAL );
+		tm.begin();
+		StrTestEntity entity = new StrTestEntity( "Test" );
+		em.persist( entity );
+		em.flush();
+		tm.commit();
+	}
 
-    @Test
-    public void testInterceptorInvocations() throws Exception {
-        // The interceptor should only be created once and should only be invoked once.
-        final Map invocationMap = TestInterceptor.getBeforeCompletionCallbacks();
-        assertEquals( 1, invocationMap.size() );
-        assertEquals( invocationMap.values().stream().filter( v -> v == 1 ).count(), 1 );
-    }
+	@Test
+	public void testInterceptorInvocations() throws Exception {
+		// The interceptor should only be created once and should only be invoked once.
+		final Map invocationMap = TestInterceptor.getBeforeCompletionCallbacks();
+		assertEquals( 1, invocationMap.size() );
+		assertEquals( invocationMap.values().stream().filter( v -> v == 1 ).count(), 1 );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/TestInterceptor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/TestInterceptor.java
index 1d7a68278d62..d3db705a3110 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/TestInterceptor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tm/TestInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.integration.tm;
 
@@ -19,24 +17,24 @@
  */
 public class TestInterceptor implements Interceptor {
 
-    private static final Logger LOGGER = Logger.getLogger( TestInterceptor.class );
-    private static Map interceptorInvocations = new HashMap<>();
+	private static final Logger LOGGER = Logger.getLogger( TestInterceptor.class );
+	private static Map interceptorInvocations = new HashMap<>();
 
-    public TestInterceptor() {
-        interceptorInvocations.put( this, 0 );
-    }
+	public TestInterceptor() {
+		interceptorInvocations.put( this, 0 );
+	}
 
-    @Override
-    public void beforeTransactionCompletion(Transaction tx) {
-        interceptorInvocations.put( this, interceptorInvocations.get( this ) + 1 );
-        LOGGER.info( "Interceptor beforeTransactionCompletion invoked" );
-    }
+	@Override
+	public void beforeTransactionCompletion(Transaction tx) {
+		interceptorInvocations.put( this, interceptorInvocations.get( this ) + 1 );
+		LOGGER.info( "Interceptor beforeTransactionCompletion invoked" );
+	}
 
-    public static Map getBeforeCompletionCallbacks() {
-        return interceptorInvocations;
-    }
+	public static Map getBeforeCompletionCallbacks() {
+		return interceptorInvocations;
+	}
 
-    public static void reset() {
-        interceptorInvocations.clear();
-    }
+	public static void reset() {
+		interceptorInvocations.clear();
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
index 77450a2baf55..be698561ad4a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.hibernate.testing.cleaner.DatabaseCleaner;
 
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Selectable;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java
index 83d09e66b5b8..1667ea12dfdf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -13,9 +11,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.configuration.EnversSettings;
@@ -24,7 +20,6 @@
 import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.BeforeClassOnce;
 import org.hibernate.testing.ServiceRegistryBuilder;
-import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Before;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java
index c09de0917584..2c16342e9aaa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java
index dcd430bbe570..6bf99c1d4755 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -14,7 +12,6 @@
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -34,7 +31,6 @@
 
 import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.BeforeClassOnce;
-import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.hibernate.testing.junit4.Helper;
 import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/CustomRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/CustomRevisionEntityTest.java
index f22aec121e99..03b0c1fb64ac 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/CustomRevisionEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/CustomRevisionEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/DefaultAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/DefaultAuditTest.java
index ba1c03df19e1..e52415d4f649 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/DefaultAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/DefaultAuditTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -63,7 +61,7 @@ public void test(EntityManagerFactoryScope scope) {
 
 		//tag::envers-audited-revisions-example[]
 		List revisions = scope.fromTransaction( entityManager -> {
-			 return AuditReaderFactory.get(entityManager).getRevisions(
+			return AuditReaderFactory.get(entityManager).getRevisions(
 				Customer.class,
 				1L
 			);
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
index 796cdcc48266..f81a8d7d0bb9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
index 654c311d7547..cd6a778f6211 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -43,217 +41,217 @@
  */
 public class EntityTypeChangeAuditTest extends EntityManagerFactoryBasedFunctionalTest {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Customer.class,
-            CustomTrackingRevisionEntity.class
-        };
-    }
-
-    @Test
-    public void test() {
-        final EntityManagerFactory testEmf = produceEntityManagerFactory();
-
-        doInJPA( () -> testEmf, entityManager -> {
-            Customer customer = new Customer();
-            customer.setId(1L);
-            customer.setFirstName("John");
-            customer.setLastName("Doe");
-
-            entityManager.persist(customer);
-        });
-
-        doInJPA( () -> testEmf, entityManager -> {
-            //tag::envers-tracking-modified-entities-queries-example1[]
-                assertEquals(
-                    "org.hibernate.orm.test.envers.EntityTypeChangeAuditTest$Customer",
-                    AuditReaderFactory
-                        .get(entityManager)
-                        .getCrossTypeRevisionChangesReader()
-                        .findEntityTypes(1)
-                        .iterator().next()
-                        .getFirst()
-                   );
-            //end::envers-tracking-modified-entities-queries-example1[]
-        });
-
-        EntityManagerFactory entityManagerFactory = null;
-        try {
-            Map settings = buildSettings();
-            settings.put(
-                AvailableSettings.LOADED_CLASSES,
-                Arrays.asList(
-                    ApplicationCustomer.class,
-                    CustomTrackingRevisionEntity.class
-               )
-           );
-            settings.put(
-                    AvailableSettings.HBM2DDL_AUTO,
-                    "update"
-           );
-            entityManagerFactory =  Bootstrap.getEntityManagerFactoryBuilder(
-                new TestingPersistenceUnitDescriptorImpl(getClass().getSimpleName()),
-                settings
-           ).build().unwrap(SessionFactoryImplementor.class);
-
-            final EntityManagerFactory emf = entityManagerFactory;
-
-            doInJPA(() -> emf, entityManager -> {
-                ApplicationCustomer customer = entityManager.find(ApplicationCustomer.class, 1L);
-                customer.setLastName("Doe Jr.");
-            });
-
-            doInJPA(() -> emf, entityManager -> {
-                //tag::envers-tracking-modified-entities-queries-example2[]
-                assertEquals(
-                    "org.hibernate.orm.test.envers.EntityTypeChangeAuditTest$ApplicationCustomer",
-                    AuditReaderFactory
-                    .get(entityManager)
-                    .getCrossTypeRevisionChangesReader()
-                    .findEntityTypes(2)
-                    .iterator().next()
-                    .getFirst()
-               );
-                //end::envers-tracking-modified-entities-queries-example2[]
-            });
-        }
-        finally {
-            if (entityManagerFactory != null) {
-                entityManagerFactory.close();
-            }
-            testEmf.close();
-        }
-    }
-
-    //tag::envers-tracking-modified-entities-revchanges-before-rename-example[]
-    @Audited
-    @Entity(name = "Customer")
-    public static class Customer {
-
-        @Id
-        private Long id;
-
-        private String firstName;
-
-        private String lastName;
-
-        @Temporal(TemporalType.TIMESTAMP)
-        @Column(name = "created_on")
-        @CreationTimestamp
-        private Date createdOn;
-
-        //Getters and setters are omitted for brevity
-    //end::envers-tracking-modified-entities-revchanges-before-rename-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public String getLastName() {
-            return lastName;
-        }
-
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-
-        public Date getCreatedOn() {
-            return createdOn;
-        }
-
-        public void setCreatedOn(Date createdOn) {
-            this.createdOn = createdOn;
-        }
-    //tag::envers-tracking-modified-entities-revchanges-before-rename-example[]
-    }
-    //end::envers-tracking-modified-entities-revchanges-before-rename-example[]
-
-    //tag::envers-tracking-modified-entities-revchanges-after-rename-example[]
-    @Audited
-    @Entity(name = "Customer")
-    public static class ApplicationCustomer {
-
-        @Id
-        private Long id;
-
-        private String firstName;
-
-        private String lastName;
-
-        @Temporal(TemporalType.TIMESTAMP)
-        @Column(name = "created_on")
-        @CreationTimestamp
-        private Date createdOn;
-
-        //Getters and setters are omitted for brevity
-    //end::envers-tracking-modified-entities-revchanges-after-rename-example[]
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public String getLastName() {
-            return lastName;
-        }
-
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-
-        public Date getCreatedOn() {
-            return createdOn;
-        }
-
-        public void setCreatedOn(Date createdOn) {
-            this.createdOn = createdOn;
-        }
-    //tag::envers-tracking-modified-entities-revchanges-after-rename-example[]
-    }
-    //end::envers-tracking-modified-entities-revchanges-after-rename-example[]
-
-    //tag::envers-tracking-modified-entities-revchanges-example[]
-    @Entity(name = "CustomTrackingRevisionEntity")
-    @Table(name = "TRACKING_REV_INFO")
-    @RevisionEntity
-    public static class CustomTrackingRevisionEntity extends DefaultRevisionEntity {
-
-        @ElementCollection
-        @JoinTable(
-            name = "REVCHANGES",
-            joinColumns = @JoinColumn(name = "REV")
-       )
-        @Column(name = "ENTITYNAME")
-        @ModifiedEntityNames
-        private Set modifiedEntityNames = new HashSet<>();
-
-        public Set getModifiedEntityNames() {
-            return modifiedEntityNames;
-        }
-    }
-    //end::envers-tracking-modified-entities-revchanges-example[]
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Customer.class,
+			CustomTrackingRevisionEntity.class
+		};
+	}
+
+	@Test
+	public void test() {
+		final EntityManagerFactory testEmf = produceEntityManagerFactory();
+
+		doInJPA( () -> testEmf, entityManager -> {
+			Customer customer = new Customer();
+			customer.setId(1L);
+			customer.setFirstName("John");
+			customer.setLastName("Doe");
+
+			entityManager.persist(customer);
+		});
+
+		doInJPA( () -> testEmf, entityManager -> {
+			//tag::envers-tracking-modified-entities-queries-example1[]
+				assertEquals(
+					"org.hibernate.orm.test.envers.EntityTypeChangeAuditTest$Customer",
+					AuditReaderFactory
+						.get(entityManager)
+						.getCrossTypeRevisionChangesReader()
+						.findEntityTypes(1)
+						.iterator().next()
+						.getFirst()
+				);
+			//end::envers-tracking-modified-entities-queries-example1[]
+		});
+
+		EntityManagerFactory entityManagerFactory = null;
+		try {
+			Map settings = buildSettings();
+			settings.put(
+				AvailableSettings.LOADED_CLASSES,
+				Arrays.asList(
+					ApplicationCustomer.class,
+					CustomTrackingRevisionEntity.class
+			)
+		);
+			settings.put(
+					AvailableSettings.HBM2DDL_AUTO,
+					"update"
+		);
+			entityManagerFactory =  Bootstrap.getEntityManagerFactoryBuilder(
+				new TestingPersistenceUnitDescriptorImpl(getClass().getSimpleName()),
+				settings
+		).build().unwrap(SessionFactoryImplementor.class);
+
+			final EntityManagerFactory emf = entityManagerFactory;
+
+			doInJPA(() -> emf, entityManager -> {
+				ApplicationCustomer customer = entityManager.find(ApplicationCustomer.class, 1L);
+				customer.setLastName("Doe Jr.");
+			});
+
+			doInJPA(() -> emf, entityManager -> {
+				//tag::envers-tracking-modified-entities-queries-example2[]
+				assertEquals(
+					"org.hibernate.orm.test.envers.EntityTypeChangeAuditTest$ApplicationCustomer",
+					AuditReaderFactory
+					.get(entityManager)
+					.getCrossTypeRevisionChangesReader()
+					.findEntityTypes(2)
+					.iterator().next()
+					.getFirst()
+			);
+				//end::envers-tracking-modified-entities-queries-example2[]
+			});
+		}
+		finally {
+			if (entityManagerFactory != null) {
+				entityManagerFactory.close();
+			}
+			testEmf.close();
+		}
+	}
+
+	//tag::envers-tracking-modified-entities-revchanges-before-rename-example[]
+	@Audited
+	@Entity(name = "Customer")
+	public static class Customer {
+
+		@Id
+		private Long id;
+
+		private String firstName;
+
+		private String lastName;
+
+		@Temporal(TemporalType.TIMESTAMP)
+		@Column(name = "created_on")
+		@CreationTimestamp
+		private Date createdOn;
+
+		//Getters and setters are omitted for brevity
+	//end::envers-tracking-modified-entities-revchanges-before-rename-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+		public Date getCreatedOn() {
+			return createdOn;
+		}
+
+		public void setCreatedOn(Date createdOn) {
+			this.createdOn = createdOn;
+		}
+	//tag::envers-tracking-modified-entities-revchanges-before-rename-example[]
+	}
+	//end::envers-tracking-modified-entities-revchanges-before-rename-example[]
+
+	//tag::envers-tracking-modified-entities-revchanges-after-rename-example[]
+	@Audited
+	@Entity(name = "Customer")
+	public static class ApplicationCustomer {
+
+		@Id
+		private Long id;
+
+		private String firstName;
+
+		private String lastName;
+
+		@Temporal(TemporalType.TIMESTAMP)
+		@Column(name = "created_on")
+		@CreationTimestamp
+		private Date createdOn;
+
+		//Getters and setters are omitted for brevity
+	//end::envers-tracking-modified-entities-revchanges-after-rename-example[]
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+		public Date getCreatedOn() {
+			return createdOn;
+		}
+
+		public void setCreatedOn(Date createdOn) {
+			this.createdOn = createdOn;
+		}
+	//tag::envers-tracking-modified-entities-revchanges-after-rename-example[]
+	}
+	//end::envers-tracking-modified-entities-revchanges-after-rename-example[]
+
+	//tag::envers-tracking-modified-entities-revchanges-example[]
+	@Entity(name = "CustomTrackingRevisionEntity")
+	@Table(name = "TRACKING_REV_INFO")
+	@RevisionEntity
+	public static class CustomTrackingRevisionEntity extends DefaultRevisionEntity {
+
+		@ElementCollection
+		@JoinTable(
+			name = "REVCHANGES",
+			joinColumns = @JoinColumn(name = "REV")
+	)
+		@Column(name = "ENTITYNAME")
+		@ModifiedEntityNames
+		private Set modifiedEntityNames = new HashSet<>();
+
+		public Set getModifiedEntityNames() {
+			return modifiedEntityNames;
+		}
+	}
+	//end::envers-tracking-modified-entities-revchanges-example[]
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
index 5e42271793fb..a54cff70a4ec 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -238,10 +236,10 @@ public static class CustomTrackingRevisionListener implements EntityTrackingRevi
 
 		@Override
 		public void entityChanged(Class entityClass,
-								  String entityName,
-								  Object entityId,
-								  RevisionType revisionType,
-								  Object revisionEntity) {
+								String entityName,
+								Object entityId,
+								RevisionType revisionType,
+								Object revisionEntity) {
 			String type = entityClass.getName();
 			((CustomTrackingRevisionEntity) revisionEntity).addModifiedEntityType(type);
 		}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java
index f811438455c2..933e3bfd606b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java
index 7f768a919021..4c65f0ea4b37 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java
index c40c87e49302..04a9e3bf4aca 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -20,7 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.hamcrest.Matchers;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModifiedFlagsAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModifiedFlagsAuditTest.java
index 469ed05d49f1..34adb2848a91 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModifiedFlagsAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModifiedFlagsAuditTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java
index 803f4526a5f7..21967a9bfe0f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditAdressCountryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditAdressCountryTest.java
index c86943c1e82f..7a1ad968d2f3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditAdressCountryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditAdressCountryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -20,7 +18,6 @@
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.transaction.TransactionUtil;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditTest.java
index 8ad370f61897..7e7fb795800f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -77,7 +75,7 @@ public void test(EntityManagerFactoryScope scope) {
 		});
 
 		List revisions = scope.fromTransaction( entityManager -> {
-			 return AuditReaderFactory.get(entityManager).getRevisions(
+			return AuditReaderFactory.get(entityManager).getRevisions(
 				Customer.class,
 				1L
 			);
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditWithModifiedFlagTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditWithModifiedFlagTest.java
index a2977d5a5961..b67c2aa3aea5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditWithModifiedFlagTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/QueryAuditWithModifiedFlagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
index 3845898c9fa2..92e6bb3ec8e8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ValidityStrategyAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ValidityStrategyAuditTest.java
index cac8c26fe44c..a060a7669f1b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ValidityStrategyAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ValidityStrategyAuditTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers;
 
@@ -72,7 +70,7 @@ public void test(EntityManagerFactoryScope scope) {
 		});
 
 		List revisions = scope.fromTransaction( entityManager -> {
-			 return AuditReaderFactory.get(entityManager).getRevisions(
+			return AuditReaderFactory.get(entityManager).getRevisions(
 				Customer.class,
 				1L
 			);
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java
index 53ffdfc162ce..dfa451963297 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java
index 6e4d1580bcc4..1ff26b1cfee2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java
index 2474fd82689b..5083245a51b9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
@@ -25,7 +23,7 @@ public class IntTestPrivSeqEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "IntTestPrivSeq")
 	@SequenceGenerator(name = "IntTestPrivSeq", sequenceName = "INTTESTPRIV_SEQ",
-					   allocationSize = 1, initialValue = 1)
+					allocationSize = 1, initialValue = 1)
 	private Integer id;
 
 	@Audited
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java
index a4ea27dd42a2..623bb98f5355 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java
index 24f8c8844a83..47758f03e7a6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java
index 2199617e12a6..eaac9bc0f4b5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java
index b899306381d7..03ae0fbaa0ee 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java
index 9f933a973b28..16dd99255a27 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java
index f410b8080122..9294986bb8cd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
@@ -26,7 +24,7 @@ public class StrTestPrivSeqEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "StrTestPrivSeq")
 	@SequenceGenerator(name = "StrTestPrivSeq", sequenceName = "STRTESTPRIV_SEQ",
-					   allocationSize = 1, initialValue = 1)
+					allocationSize = 1, initialValue = 1)
 	private Integer id;
 
 	@Audited
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java
index db216e09f015..3e761915b0e7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java
index 83f475e5caea..489c97261d64 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java
index 5a31e151a419..c04c9eece539 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java
index bee27de0f9bb..6296983693d0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java
index 37017265f0ac..7a24a3b85868 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java
index 2e6262a436bc..f92d0e02da6f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java
index 68d9f10bed3a..d8698ad7d326 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java
index 66f5c815ef45..83d151864c81 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java
index 09d0bbc9f8e2..2104b544c709 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java
index 4ecd20a3f14b..251e5911d483 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java
index 02fb12bd8e28..3141573a5b78 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java
index 78a3f32f4442..035a43eae131 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
@@ -14,7 +12,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
 import jakarta.persistence.Version;
 
 import org.hibernate.envers.Audited;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java
index 3ea6b0dfeae6..802a895dba54 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java
index 289c5e9ca3a4..0a1d9b15cfc4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java
index 92a436e8bc4e..ba4b3cc7f082 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java
index 7f155b013f51..a1cac7a7018a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java
index 3db7e033a303..734c7616d99a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java
index d7ff5a45a79f..5f06d5ef2470 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
index 3c526c4538e0..5d62487a7518 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
@@ -37,7 +35,7 @@ public class Component3 {
 								@AttributeOverride(name = "key", column = @Column(name = "notAudComp_key")),
 								@AttributeOverride(name = "value", column = @Column(name = "notAudComp_value")),
 								@AttributeOverride(name = "description",
-												   column = @Column(name = "notAudComp_description"))
+												column = @Column(name = "notAudComp_description"))
 						})
 	private Component4 nonAuditedComponent;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java
index 0dad3bb3e613..fc776453f831 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java
index 567cd81d90bc..df4e99235f41 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java
index 903a04366df1..53a19b108703 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java
index f8d913ad9aba..c23f98ae0159 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java
index f3f8197e1e9e..532a3bc3fabe 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java
index 9c26f50c6f50..44c9b76bdc8c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java
index f75f0d30a7a9..8ec7587daade 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java
index 27c72a4692c3..e616fdde0183 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java
index e6d1f3920ec4..3c2eed1d6aa0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java
index 23efeb2f3338..11db7b74fe9b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java
index 6248795f9fab..6bbdb36f2319 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java
index dc4ee0bea0a5..6c4e95a7c4c5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
index 8492492e4e49..8b3479e799e9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java
index eba119017316..40f43ced4a4b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java
index 2e3de4620381..86ee934208ec 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java
index e27ef49ceb65..54445f2bc37b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.converter;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java
index edeabd2ea4cc..d53d59246194 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.converter;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java
index 94afb0c212e7..7ce9540a4960 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.converter;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java
index f8b10a4a5976..a23684cfd1ab 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.converter;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java
index 58682cc176c7..150a40e039da 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java
index ebf1f6428039..7a8d4cfdf38d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java
index ac59f6e41ac0..355240832f4d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java
index 7db19e0a8a64..685a0a560616 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java
index 718c98a687e0..189596d3c0d4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java
index 5b7d685931e2..22bf22a34312 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java
index 667fcd73e46c..6fdce2ff0b64 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java
index 9cf89b5d1e3f..217722b9de16 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java
index ce4cd9331fda..508e79ad1824 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java
index ab3ce6394c55..7290fefddd9c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java
index 5065fb6d3811..5be468019ec3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java
index 6bfb9a6fdef9..8c733e74973f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java
index eb28373a0c75..1709e0eda206 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java
index 053c106cdd52..e9aa5bd02a4b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java
index 7a2e705582f3..e14e25f53c76 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java
index 0bfe272143d1..ad3b28eaed2a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java
index c2c623861761..9c2f440903aa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
@@ -70,4 +68,4 @@ public int hashCode() {
 	public String toString() {
 		return "MulId(" + id1 + ", " + id2 + ")";
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java
index d2ee219bdb5d..ccb059746677 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java
index 86c43a03dbb1..3c81f58870df 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java
index b73b5529be5d..c8d104bd6e6f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java
index 5778940570c6..9c189a289a2a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java
index 70fc161897b8..c544cba17294 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java
index 90fcd7f10a09..7d144edfe34c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java
index 8395b2596090..33b84a7eb4ab 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java
index 4ef31d6ac295..ba0956d0416b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java
index cccb94640362..e3adeb550e99 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java
index 0002db68610d..20e2c371247b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java
index 232db14feb59..a592d04f883c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.biowned;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java
index ba2e2b293fd9..da4748fd6f41 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.biowned;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java
index d834950c1917..a55a8eaa6973 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.sametable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java
index 8eb0e519face..3dc97a6e3282 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.sametable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java
index 9b8bfd33a03e..45db9947bf8e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.sametable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java
index ce18f0396da5..2d012b9ca6de 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
@@ -33,8 +31,8 @@ public class JoinTableEntity implements Serializable {
 
 	@ManyToMany
 	@JoinTable(name = "test_join_table",
-			   joinColumns = @JoinColumn(name = "assoc_id1"),
-			   inverseJoinColumns = @JoinColumn(name = "assoc_id2")
+			joinColumns = @JoinColumn(name = "assoc_id1"),
+			inverseJoinColumns = @JoinColumn(name = "assoc_id2")
 	)
 	private Set references = new HashSet();
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java
index bce82180c4b1..43ad0bd1b3f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
index 445dacfdbfe2..a5d3260b6570 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
index fc3c15f4f32f..79adab9872ce 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java
index 49b78e15f164..2128939cc4e6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java
index 8605ba2e83c1..d394b92d61c5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java
index 405342ac2795..5528f0f269d0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java
index 2fbe8b11df0d..98fc8636c440 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java
index 0e363ff7a59e..32828ce8422b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
index daba19b1e3e8..e1f4129ed666 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.manytoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java
index 59b675acb7de..177b87713ea4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java
index 63a6d0ddcbae..565b783940bb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java
index b9b7854fe2f8..5fc5542e0f31 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java
index ec6dfc15da38..792dba75cc28 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java
index 0af96aaba338..0d69f84be1f1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
@@ -17,8 +15,6 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.RelationTargetAuditMode;
 import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java
index 43b56e73a2e7..c4091818d980 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java
index 11ab218e5589..8a1d6ba6b4f8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
index 4b57464332b2..6bc14fdacc3f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
index 04c14c9ba269..68dab7e0b82e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
index 31adae75454b..2b5ee1bfd31e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java
index f6dac924ea6f..bfd2b5f51953 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
index fc34321de902..cacdaa280924 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
index 8ccc6eebb646..f3ddbdbf4ea3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
index 7be4d061ed80..2fa4e1830f19 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
index 7839ecc03fa8..a451fe68a2a9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
index edf89931965f..9f740d3fcc7c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
index 389ac67025ed..4837241de3aa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
index b1ff4e4625a3..537bef646d95 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java
index bb72d706db80..597e27cbc71a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
index 5654c3814a1d..f890cb3f128f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java
index af359b4b801a..5d35cc50fb80 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
index 844d0a94d0b6..c8e304fd2c3f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
index 60789d4bc368..02ae1e3b77a8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
index 9531bd12f889..353df5095fad 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
index c1583c3716da..7b0f9c389621 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
index 37751f585a27..5205d59768c8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java
index 0ef4fd39152f..8ab8f0344f59 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java
index cc732ad22eb2..4fafdf611f6c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java
index 8d08c6bd9d4f..2bf02e3f1b0b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java
index 827ebe0f9c64..2178f2952e8b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetomany.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java
index 1d9df4e62c61..ccf9e50eac43 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java
index 4698df6edffc..e8b5dcdd7378 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java
index 033b8bcfecf6..e07671c67efc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetoone;
 
@@ -77,4 +75,4 @@ public int hashCode() {
 	public String toString() {
 		return "BidirectionalEagerHbmRefEdPK(id = " + id + ", data = " + data + ")";
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java
index 9348062a3a96..ac150c9f6f9d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.onetoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java
index d2101dc1b1d1..1b206496468a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomDataRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java
index 3b55735e497d..12b85f7a4193 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -22,13 +20,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomDateRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomInstantRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomInstantRevEntity.java
index 2a7708aaca3e..a9524faa5851 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomInstantRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomInstantRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -22,65 +20,65 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-        strategy = "org.hibernate.id.enhanced.TableGenerator",
-        parameters = {
-                @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-                @Parameter(name = "initial_value", value = "1"),
-                @Parameter(name = "increment_size", value = "1"),
-                @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-        }
+		strategy = "org.hibernate.id.enhanced.TableGenerator",
+		parameters = {
+				@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+				@Parameter(name = "initial_value", value = "1"),
+				@Parameter(name = "increment_size", value = "1"),
+				@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+		}
 )
 @RevisionEntity
 public class CustomInstantRevEntity {
-    @Id
-    @GeneratedValue(generator = "EnversTestingRevisionGenerator")
-    @RevisionNumber
-    private int customId;
+	@Id
+	@GeneratedValue(generator = "EnversTestingRevisionGenerator")
+	@RevisionNumber
+	private int customId;
 
-    @RevisionTimestamp
-    private Instant instantTimestamp;
+	@RevisionTimestamp
+	private Instant instantTimestamp;
 
-    public int getCustomId() {
-        return customId;
-    }
+	public int getCustomId() {
+		return customId;
+	}
 
-    public void setCustomId(int customId) {
-        this.customId = customId;
-    }
+	public void setCustomId(int customId) {
+		this.customId = customId;
+	}
 
-    public Instant getInstantTimestamp() {
-        return instantTimestamp;
-    }
+	public Instant getInstantTimestamp() {
+		return instantTimestamp;
+	}
 
-    public void setInstantTimestamp(Instant instantTimestamp) {
-        this.instantTimestamp = instantTimestamp;
-    }
+	public void setInstantTimestamp(Instant instantTimestamp) {
+		this.instantTimestamp = instantTimestamp;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if ( this == o ) {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() ) {
-            return false;
-        }
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
 
-        CustomInstantRevEntity that = (CustomInstantRevEntity) o;
+		CustomInstantRevEntity that = (CustomInstantRevEntity) o;
 
-        if ( customId != that.customId ) {
-            return false;
-        }
-        if ( instantTimestamp != null ? !instantTimestamp.equals( that.instantTimestamp ) : that.instantTimestamp != null ) {
-            return false;
-        }
+		if ( customId != that.customId ) {
+			return false;
+		}
+		if ( instantTimestamp != null ? !instantTimestamp.equals( that.instantTimestamp ) : that.instantTimestamp != null ) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    @Override
-    public int hashCode() {
-        int result = customId;
-        result = 31 * result + (instantTimestamp != null ? instantTimestamp.hashCode() : 0);
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = customId;
+		result = 31 * result + (instantTimestamp != null ? instantTimestamp.hashCode() : 0);
+		return result;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomLocalDateTimeRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomLocalDateTimeRevEntity.java
index c3a9597317d4..2b90ace2a1ec 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomLocalDateTimeRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomLocalDateTimeRevEntity.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.envers.test.entities.reventity;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
@@ -25,56 +22,56 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-        strategy = "org.hibernate.id.enhanced.TableGenerator",
-        parameters = {
-                @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-                @Parameter(name = "initial_value", value = "1"),
-                @Parameter(name = "increment_size", value = "1"),
-                @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-        }
+		strategy = "org.hibernate.id.enhanced.TableGenerator",
+		parameters = {
+				@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+				@Parameter(name = "initial_value", value = "1"),
+				@Parameter(name = "increment_size", value = "1"),
+				@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+		}
 )
 @RevisionEntity
 public class CustomLocalDateTimeRevEntity {
-    @Id
-    @GeneratedValue(generator = "EnversTestingRevisionGenerator")
-    @RevisionNumber
-    private int id;
+	@Id
+	@GeneratedValue(generator = "EnversTestingRevisionGenerator")
+	@RevisionNumber
+	private int id;
 
-    @RevisionTimestamp
-    private LocalDateTime localDateTimestamp;
+	@RevisionTimestamp
+	private LocalDateTime localDateTimestamp;
 
-    public int getId() {
-        return id;
-    }
+	public int getId() {
+		return id;
+	}
 
-    public void setId(int id) {
-        this.id = id;
-    }
+	public void setId(int id) {
+		this.id = id;
+	}
 
-    public LocalDateTime getLocalDateTimestamp() {
-        return localDateTimestamp;
-    }
+	public LocalDateTime getLocalDateTimestamp() {
+		return localDateTimestamp;
+	}
 
-    public void setLocalDateTimestamp(LocalDateTime localDateTimestamp) {
-        this.localDateTimestamp = localDateTimestamp;
-    }
+	public void setLocalDateTimestamp(LocalDateTime localDateTimestamp) {
+		this.localDateTimestamp = localDateTimestamp;
+	}
 
-    @Override
-    public int hashCode() {
-        int result = id;
-        result = 31 * result + ( localDateTimestamp != null ? localDateTimestamp.hashCode() : 0 );
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = id;
+		result = 31 * result + ( localDateTimestamp != null ? localDateTimestamp.hashCode() : 0 );
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CustomLocalDateTimeRevEntity that = (CustomLocalDateTimeRevEntity) o;
-        return id == that.id && Objects.equals(localDateTimestamp, that.localDateTimestamp);
-    }
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		CustomLocalDateTimeRevEntity that = (CustomLocalDateTimeRevEntity) o;
+		return id == that.id && Objects.equals(localDateTimestamp, that.localDateTimestamp);
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java
index 1617506dc36e..43569bfbceb7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomPropertyAccessRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java
index 583509d799da..68cb8b5b02c2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java
index afae23160619..613cbaad786f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity;
 
@@ -22,13 +20,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomRevEntityColumnMapping {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
index 9a55bfb225bc..c64e817cdc67 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
@@ -31,13 +29,13 @@
 @Entity
 @Table(name = "AnnotatedTrackRevInfo")
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class AnnotatedTrackingRevisionEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
index e1741b202428..221ee8515c06 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
@@ -29,13 +27,13 @@
 @Entity
 @Table(name = "CustomTrackRevInfo")
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity(CustomTrackingRevisionListener.class)
 public class CustomTrackingRevisionEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
index 12a14a8799ad..122cbdd64ed9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
index 9f9def2a20b9..582caaed9bd0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
index b4abf8b5bbde..0cbb4f839727 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
index 1b3641d0232b..fc9a3429a293 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java
index 2c766d4ea143..61edb90617af 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java
index 751a77fb900f..8fec9c93272c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java
index 0374e32835cf..d980e1e9bd38 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.accesstype;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java
index 6da4cf9b4685..0cc783dfa807 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.accesstype;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java
index 7c4108b9c61d..3c2bfc34a417 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java
index da6445c9ef3a..5cc41993002a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java
index 508a15b48cec..20d9857999ba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java
index 6e1a124b14ec..2b34b0c97cb3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.accesstype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java
index 63664b43f1cd..cf96e9499db4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.accesstype;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java
index 287b0b0a5e3e..e2ca5c491fa0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.auditReader;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java
index a0f2339463a1..a4dcc7899d7d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.auditReader;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java
index c69906176f62..16d41cbde8f2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.auditReader;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java
index 22b071a2b379..38e05d6989f3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.auditReader;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java
index 7f92d0df2ffe..64a885c084c7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java
index 0e40752c712a..8d1450c131ca 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java
index 5676648f14a6..40fb84e6b42f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java
index 665d1d26aad9..3f4fa6b90049 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java
index 6272aceb4a95..a45e44ab8885 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java
index 2d1b2e415641..88bd6b4f3f27 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java
index 1d877fc86e1b..0ff878012966 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
@@ -13,7 +11,6 @@
 import org.hibernate.orm.test.envers.Priority;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
-import org.hibernate.orm.test.envers.integration.basic.ScalePrecisionEntity;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Assert;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java
index 27829351748a..8b14aaf45227 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java
index 998a224d4fd9..1fc036a7dc49 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java
index cbca45fdb566..3c676b2fd2cf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java
index 08f9cd6d9e49..c264628cc0c3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java
index 1195a869af5f..be8fb51e7117 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
@@ -31,4 +29,4 @@ public void testRevisionInfoTableNotCreated() {
 		Assert.assertEquals( 1, pcs.size() );
 		Assert.assertTrue( pcs.get( 0 ).getClassName().contains( "BasicTestEntity3" ) );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java
index 1971f4ce09ac..510f9bba98e5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java
index 7b5fefc0d506..3896b72a2f7d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java
index ca3842c73918..63ec907fcb1d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java
index 091b6fc20585..f295ae92f610 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java
index 5b3f31b2f867..dfd2b86e1026 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
@@ -34,203 +32,203 @@
  */
 @JiraKey(value = "HHH-8051")
 public class RelationTargetNotFoundConfigTest extends BaseEnversJPAFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Foo.class, Bar.class, FooBar.class };
-    }
-
-    @Override
-    protected void addConfigOptions(Map options) {
-        super.addConfigOptions( options );
-        options.put( EnversSettings.GLOBAL_RELATION_NOT_FOUND_LEGACY_FLAG, Boolean.FALSE );
-    }
-
-
-    @Test
-    public void testRelationTargetNotFoundAction() {
-        // Revision 1, initialize the data for test case
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final Bar bar = new Bar( 1 );
-            entityManager.persist( bar );
-
-            final FooBar fooBar1 = new FooBar( 1, "fooBar" );
-            entityManager.persist( fooBar1 );
-
-            final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
-            entityManager.persist( fooBar2 );
-
-            final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
-            entityManager.persist( foo );
-        } );
-
-        // This test verifies that everything is fine before doing various record manipulation changes.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get(entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getBar() );
-            assertNotNull( rev1.getFooBar() );
-            assertNotNull( rev1.getFooBar2() );
-        } );
-
-        // Simulate the removal of main data table data by removing FooBar1 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // This shouldn't fail because the audited entity data is cached in the audit table and exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getFooBar() );
-        } );
-
-        // Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference audit row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
-            assertNull( rev1.getFooBar2() );
-        } );
-
-        // this simulates the removal of a non-audited entity from the main table
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference non-audited row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
-            assertNull( rev1.getBar() );
-        } );
-    }
-
-    @Audited
-    @Entity(name = "Foo")
-    public static class Foo {
-        @Id
-        private Integer id;
-
-        @ManyToOne
-        @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-        private Bar bar;
-
-        @ManyToOne
-        private FooBar fooBar;
-
-        @ManyToOne
-        private FooBar fooBar2;
-
-        Foo() {
-            // Required by JPA
-        }
-
-        Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
-            this.id = id;
-            this.bar = bar;
-            this.fooBar = fooBar;
-            this.fooBar2 = fooBar2;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public Bar getBar() {
-            return bar;
-        }
-
-        public void setBar(Bar bar) {
-            this.bar = bar;
-        }
-
-        public FooBar getFooBar() {
-            return fooBar;
-        }
-
-        public void setFooBar(FooBar fooBar) {
-            this.fooBar = fooBar;
-        }
-
-        public FooBar getFooBar2() {
-            return fooBar2;
-        }
-
-        public void setFooBar2(FooBar fooBar2) {
-            this.fooBar2 = fooBar2;
-        }
-    }
-
-    @Entity(name = "Bar")
-    public static class Bar {
-        @Id
-        private Integer id;
-
-        Bar() {
-            // Required by JPA
-        }
-
-        Bar(Integer id) {
-            this.id = id;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Audited
-    @Entity(name = "FooBar")
-    public static class FooBar {
-        @Id
-        private Integer id;
-        private String name;
-
-        FooBar() {
-            // Required by JPA
-        }
-
-        FooBar(Integer id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Foo.class, Bar.class, FooBar.class };
+	}
+
+	@Override
+	protected void addConfigOptions(Map options) {
+		super.addConfigOptions( options );
+		options.put( EnversSettings.GLOBAL_RELATION_NOT_FOUND_LEGACY_FLAG, Boolean.FALSE );
+	}
+
+
+	@Test
+	public void testRelationTargetNotFoundAction() {
+		// Revision 1, initialize the data for test case
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final Bar bar = new Bar( 1 );
+			entityManager.persist( bar );
+
+			final FooBar fooBar1 = new FooBar( 1, "fooBar" );
+			entityManager.persist( fooBar1 );
+
+			final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
+			entityManager.persist( fooBar2 );
+
+			final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
+			entityManager.persist( foo );
+		} );
+
+		// This test verifies that everything is fine before doing various record manipulation changes.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get(entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getBar() );
+			assertNotNull( rev1.getFooBar() );
+			assertNotNull( rev1.getFooBar2() );
+		} );
+
+		// Simulate the removal of main data table data by removing FooBar1 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// This shouldn't fail because the audited entity data is cached in the audit table and exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getFooBar() );
+		} );
+
+		// Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference audit row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
+			assertNull( rev1.getFooBar2() );
+		} );
+
+		// this simulates the removal of a non-audited entity from the main table
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference non-audited row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
+			assertNull( rev1.getBar() );
+		} );
+	}
+
+	@Audited
+	@Entity(name = "Foo")
+	public static class Foo {
+		@Id
+		private Integer id;
+
+		@ManyToOne
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+		private Bar bar;
+
+		@ManyToOne
+		private FooBar fooBar;
+
+		@ManyToOne
+		private FooBar fooBar2;
+
+		Foo() {
+			// Required by JPA
+		}
+
+		Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
+			this.id = id;
+			this.bar = bar;
+			this.fooBar = fooBar;
+			this.fooBar2 = fooBar2;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public Bar getBar() {
+			return bar;
+		}
+
+		public void setBar(Bar bar) {
+			this.bar = bar;
+		}
+
+		public FooBar getFooBar() {
+			return fooBar;
+		}
+
+		public void setFooBar(FooBar fooBar) {
+			this.fooBar = fooBar;
+		}
+
+		public FooBar getFooBar2() {
+			return fooBar2;
+		}
+
+		public void setFooBar2(FooBar fooBar2) {
+			this.fooBar2 = fooBar2;
+		}
+	}
+
+	@Entity(name = "Bar")
+	public static class Bar {
+		@Id
+		private Integer id;
+
+		Bar() {
+			// Required by JPA
+		}
+
+		Bar(Integer id) {
+			this.id = id;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Audited
+	@Entity(name = "FooBar")
+	public static class FooBar {
+		@Id
+		private Integer id;
+		private String name;
+
+		FooBar() {
+			// Required by JPA
+		}
+
+		FooBar(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java
index 144810fffd74..c99fa09446b7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
@@ -34,208 +32,208 @@
  */
 @JiraKey(value = "HHH-8051")
 public class RelationTargetNotFoundLegacyTest extends BaseEnversJPAFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Foo.class, Bar.class, FooBar.class };
-    }
-
-    @Test
-    public void testRelationTargetNotFoundAction() {
-        // Revision 1, initialize the data for test case
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final Bar bar = new Bar( 1 );
-            entityManager.persist( bar );
-
-            final FooBar fooBar1 = new FooBar( 1, "fooBar" );
-            entityManager.persist( fooBar1 );
-
-            final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
-            entityManager.persist( fooBar2 );
-
-            final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
-            entityManager.persist( foo );
-        } );
-
-        // This test verifies that everything is fine before doing various record manipulation changes.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get(entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getBar() );
-            assertNotNull( rev1.getFooBar() );
-            assertNotNull( rev1.getFooBar2() );
-        } );
-
-        // Simulate the removal of main data table data by removing FooBar1 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // This shouldn't fail because the audited entity data is cached in the audit table and exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getFooBar() );
-        } );
-
-        // Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference audit row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            try {
-                // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
-                assertNull( rev1.getFooBar2() );
-                fail( "This expected an EntityNotFoundException to be thrown" );
-            }
-            catch ( Exception e ) {
-                assertTyping(EntityNotFoundException.class, e );
-            }
-        } );
-
-        // this simulates the removal of a non-audited entity from the main table
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference non-audited row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            try {
-                // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
-                assertNull( rev1.getBar() );
-                fail( "This expected an EntityNotFoundException to be thrown" );
-            }
-            catch ( Exception e ) {
-                assertTyping( EntityNotFoundException.class, e );
-            }
-        } );
-    }
-
-    @Audited
-    @Entity(name = "Foo")
-    public static class Foo {
-        @Id
-        private Integer id;
-
-        @ManyToOne
-        @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-        private Bar bar;
-
-        @ManyToOne
-        private FooBar fooBar;
-
-        @ManyToOne
-        private FooBar fooBar2;
-
-        Foo() {
-            // Required by JPA
-        }
-
-        Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
-            this.id = id;
-            this.bar = bar;
-            this.fooBar = fooBar;
-            this.fooBar2 = fooBar2;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public Bar getBar() {
-            return bar;
-        }
-
-        public void setBar(Bar bar) {
-            this.bar = bar;
-        }
-
-        public FooBar getFooBar() {
-            return fooBar;
-        }
-
-        public void setFooBar(FooBar fooBar) {
-            this.fooBar = fooBar;
-        }
-
-        public FooBar getFooBar2() {
-            return fooBar2;
-        }
-
-        public void setFooBar2(FooBar fooBar2) {
-            this.fooBar2 = fooBar2;
-        }
-    }
-
-    @Entity(name = "Bar")
-    public static class Bar {
-        @Id
-        private Integer id;
-
-        Bar() {
-            // Required by JPA
-        }
-
-        Bar(Integer id) {
-            this.id = id;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Audited
-    @Entity(name = "FooBar")
-    public static class FooBar {
-        @Id
-        private Integer id;
-        private String name;
-
-        FooBar() {
-            // Required by JPA
-        }
-
-        FooBar(Integer id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Foo.class, Bar.class, FooBar.class };
+	}
+
+	@Test
+	public void testRelationTargetNotFoundAction() {
+		// Revision 1, initialize the data for test case
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final Bar bar = new Bar( 1 );
+			entityManager.persist( bar );
+
+			final FooBar fooBar1 = new FooBar( 1, "fooBar" );
+			entityManager.persist( fooBar1 );
+
+			final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
+			entityManager.persist( fooBar2 );
+
+			final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
+			entityManager.persist( foo );
+		} );
+
+		// This test verifies that everything is fine before doing various record manipulation changes.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get(entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getBar() );
+			assertNotNull( rev1.getFooBar() );
+			assertNotNull( rev1.getFooBar2() );
+		} );
+
+		// Simulate the removal of main data table data by removing FooBar1 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// This shouldn't fail because the audited entity data is cached in the audit table and exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getFooBar() );
+		} );
+
+		// Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference audit row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			try {
+				// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
+				assertNull( rev1.getFooBar2() );
+				fail( "This expected an EntityNotFoundException to be thrown" );
+			}
+			catch ( Exception e ) {
+				assertTyping(EntityNotFoundException.class, e );
+			}
+		} );
+
+		// this simulates the removal of a non-audited entity from the main table
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference non-audited row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			try {
+				// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
+				assertNull( rev1.getBar() );
+				fail( "This expected an EntityNotFoundException to be thrown" );
+			}
+			catch ( Exception e ) {
+				assertTyping( EntityNotFoundException.class, e );
+			}
+		} );
+	}
+
+	@Audited
+	@Entity(name = "Foo")
+	public static class Foo {
+		@Id
+		private Integer id;
+
+		@ManyToOne
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+		private Bar bar;
+
+		@ManyToOne
+		private FooBar fooBar;
+
+		@ManyToOne
+		private FooBar fooBar2;
+
+		Foo() {
+			// Required by JPA
+		}
+
+		Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
+			this.id = id;
+			this.bar = bar;
+			this.fooBar = fooBar;
+			this.fooBar2 = fooBar2;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public Bar getBar() {
+			return bar;
+		}
+
+		public void setBar(Bar bar) {
+			this.bar = bar;
+		}
+
+		public FooBar getFooBar() {
+			return fooBar;
+		}
+
+		public void setFooBar(FooBar fooBar) {
+			this.fooBar = fooBar;
+		}
+
+		public FooBar getFooBar2() {
+			return fooBar2;
+		}
+
+		public void setFooBar2(FooBar fooBar2) {
+			this.fooBar2 = fooBar2;
+		}
+	}
+
+	@Entity(name = "Bar")
+	public static class Bar {
+		@Id
+		private Integer id;
+
+		Bar() {
+			// Required by JPA
+		}
+
+		Bar(Integer id) {
+			this.id = id;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Audited
+	@Entity(name = "FooBar")
+	public static class FooBar {
+		@Id
+		private Integer id;
+		private String name;
+
+		FooBar() {
+			// Required by JPA
+		}
+
+		FooBar(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java
index f9ec97f008ea..3553d16241a1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
@@ -32,196 +30,196 @@
  */
 @JiraKey(value = "HHH-8051")
 public class RelationTargetNotFoundTest extends BaseEnversJPAFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Foo.class, Bar.class, FooBar.class };
-    }
-
-    @Test
-    public void testRelationTargetNotFoundAction() {
-        // Revision 1, initialize the data for test case
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final Bar bar = new Bar( 1 );
-            entityManager.persist( bar );
-
-            final FooBar fooBar1 = new FooBar( 1, "fooBar" );
-            entityManager.persist( fooBar1 );
-
-            final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
-            entityManager.persist( fooBar2 );
-
-            final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
-            entityManager.persist( foo );
-        } );
-
-        // This test verifies that everything is fine before doing various record manipulation changes.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get(entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getBar() );
-            assertNotNull( rev1.getFooBar() );
-            assertNotNull( rev1.getFooBar2() );
-        } );
-
-        // Simulate the removal of main data table data by removing FooBar1 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // This shouldn't fail because the audited entity data is cached in the audit table and exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            assertNotNull( rev1.getFooBar() );
-        } );
-
-        // Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference audit row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
-            assertNull( rev1.getFooBar2() );
-        } );
-
-        // this simulates the removal of a non-audited entity from the main table
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            // obviously we assume either there isn't a FK between tables or the users do something like this
-            entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
-            entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
-        } );
-
-        // Test querying history record where the reference non-audited row no longer exists.
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
-            final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
-            assertNotNull( rev1 );
-            // With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
-            assertNull( rev1.getBar() );
-        } );
-    }
-
-    @Audited(targetNotFoundAction = RelationTargetNotFoundAction.IGNORE)
-    @Entity(name = "Foo")
-    public static class Foo {
-        @Id
-        private Integer id;
-
-        @ManyToOne
-        @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
-        private Bar bar;
-
-        @ManyToOne
-        private FooBar fooBar;
-
-        @ManyToOne
-        private FooBar fooBar2;
-
-        Foo() {
-            // Required by JPA
-        }
-
-        Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
-            this.id = id;
-            this.bar = bar;
-            this.fooBar = fooBar;
-            this.fooBar2 = fooBar2;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public Bar getBar() {
-            return bar;
-        }
-
-        public void setBar(Bar bar) {
-            this.bar = bar;
-        }
-
-        public FooBar getFooBar() {
-            return fooBar;
-        }
-
-        public void setFooBar(FooBar fooBar) {
-            this.fooBar = fooBar;
-        }
-
-        public FooBar getFooBar2() {
-            return fooBar2;
-        }
-
-        public void setFooBar2(FooBar fooBar2) {
-            this.fooBar2 = fooBar2;
-        }
-    }
-
-    @Entity(name = "Bar")
-    public static class Bar {
-        @Id
-        private Integer id;
-
-        Bar() {
-            // Required by JPA
-        }
-
-        Bar(Integer id) {
-            this.id = id;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Audited
-    @Entity(name = "FooBar")
-    public static class FooBar {
-        @Id
-        private Integer id;
-        private String name;
-
-        FooBar() {
-            // Required by JPA
-        }
-
-        FooBar(Integer id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Foo.class, Bar.class, FooBar.class };
+	}
+
+	@Test
+	public void testRelationTargetNotFoundAction() {
+		// Revision 1, initialize the data for test case
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final Bar bar = new Bar( 1 );
+			entityManager.persist( bar );
+
+			final FooBar fooBar1 = new FooBar( 1, "fooBar" );
+			entityManager.persist( fooBar1 );
+
+			final FooBar fooBar2 = new FooBar( 2, "fooBar2" );
+			entityManager.persist( fooBar2 );
+
+			final Foo foo = new Foo( 1, bar, fooBar1, fooBar2 );
+			entityManager.persist( foo );
+		} );
+
+		// This test verifies that everything is fine before doing various record manipulation changes.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get(entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getBar() );
+			assertNotNull( rev1.getFooBar() );
+			assertNotNull( rev1.getFooBar2() );
+		} );
+
+		// Simulate the removal of main data table data by removing FooBar1 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo Set fooBar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM FooBar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// This shouldn't fail because the audited entity data is cached in the audit table and exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			assertNotNull( rev1.getFooBar() );
+		} );
+
+		// Simulate the removal of envers data via purge process by removing FooBar2 (an audited entity)
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.createNativeQuery( "DELETE FROM FooBar_AUD WHERE id = 2" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference audit row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException.
+			assertNull( rev1.getFooBar2() );
+		} );
+
+		// this simulates the removal of a non-audited entity from the main table
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			// obviously we assume either there isn't a FK between tables or the users do something like this
+			entityManager.createNativeQuery( "UPDATE Foo SET bar_id = NULL WHERE id = 1" ).executeUpdate();
+			entityManager.createNativeQuery( "DELETE FROM Bar WHERE id = 1" ).executeUpdate();
+		} );
+
+		// Test querying history record where the reference non-audited row no longer exists.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final Foo rev1 = auditReader.find( Foo.class, 1, 1 );
+			assertNotNull( rev1 );
+			// With RelationTargetNotFoundAction.ERROR, this would throw an EntityNotFoundException
+			assertNull( rev1.getBar() );
+		} );
+	}
+
+	@Audited(targetNotFoundAction = RelationTargetNotFoundAction.IGNORE)
+	@Entity(name = "Foo")
+	public static class Foo {
+		@Id
+		private Integer id;
+
+		@ManyToOne
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+		private Bar bar;
+
+		@ManyToOne
+		private FooBar fooBar;
+
+		@ManyToOne
+		private FooBar fooBar2;
+
+		Foo() {
+			// Required by JPA
+		}
+
+		Foo(Integer id, Bar bar, FooBar fooBar, FooBar fooBar2) {
+			this.id = id;
+			this.bar = bar;
+			this.fooBar = fooBar;
+			this.fooBar2 = fooBar2;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public Bar getBar() {
+			return bar;
+		}
+
+		public void setBar(Bar bar) {
+			this.bar = bar;
+		}
+
+		public FooBar getFooBar() {
+			return fooBar;
+		}
+
+		public void setFooBar(FooBar fooBar) {
+			this.fooBar = fooBar;
+		}
+
+		public FooBar getFooBar2() {
+			return fooBar2;
+		}
+
+		public void setFooBar2(FooBar fooBar2) {
+			this.fooBar2 = fooBar2;
+		}
+	}
+
+	@Entity(name = "Bar")
+	public static class Bar {
+		@Id
+		private Integer id;
+
+		Bar() {
+			// Required by JPA
+		}
+
+		Bar(Integer id) {
+			this.id = id;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Audited
+	@Entity(name = "FooBar")
+	public static class FooBar {
+		@Id
+		private Integer id;
+		private String name;
+
+		FooBar() {
+			// Required by JPA
+		}
+
+		FooBar(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java
index 1e845531711a..87bab3d1d2f5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java
index d575b56d83b2..45bf40ea126d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java
index d9fc83612d4d..9bf99afe51d7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java
index 850eaf479d94..86f6f7414ed7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java
index 0689ec997285..b889f201ab56 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java
index 06f75a0453a4..1a61f4ed716f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.basic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java
index a06be5a79ce5..affab46f41b6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.cache;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java
index 50dfa88374bf..21c93aadc1ff 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.cache;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java
index 7449c8ed8520..b2f56d4d0129 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.cache;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java
index 53c515f5d632..19918818a6e4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java
index 00bd6094d787..86e123d50cd7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
index 9cbf68e63789..b5bc3cc76083 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java
index 79402e195e3e..9c7981ec2d22 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java
index 2951dd2238e2..eb710e0f6fe3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java
index ec2a26113e14..3f7c6208f8a8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java
index 7b32678bb8e2..d2ae5d44515a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java
index 78ec584e70af..2c92d7ba2c46 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java
index 64fcf95d6bf5..256a1f25a430 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java
index 58d93a291c0d..90936f025f04 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java
index deb95c2ba9e2..8bc1914b8b0d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java
index fd802f30904c..1d0e63276ba0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java
index bdcae303978b..d8936c0fd065 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
index 2c0e9eca43d7..4bd52ea4d823 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
index 7c80e0ef14ac..82a503d160c7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java
index 373eac16874f..65490cf068a6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java
index ce31b2de1010..b21e702efd5f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java
index 9ddfcb2e3824..c9cfe5eeb2e9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java
index 248620a65627..d2415602087d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java
index 2072629189e8..0951eb4ecd2c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java
index b6f3d5a1e053..394d7f05d8e3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java
index f33ce6dde5fd..c013fb6cb198 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java
index 8c4628e734d1..ce672a1f3dbd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java
index 06b922169f0a..17ff79a89dda 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java
index 6f7c0f979d79..424743f9d2fb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java
index 3f845634f4da..c316cc7c634e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java
index efe6c5cea51f..82291ac50d44 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
@@ -33,7 +31,7 @@
  * This test verifies that when a map-based {@link ElementCollection} of {@link Embeddable} objects
  * are audited that the same number of audit rows are generated regardless whether the embeddable
  * implements proper {@code equals} and {@code hashCode} methods.
- * 
+ *
  * The {@link ValidityAuditStrategy} with equals/hashcode.
  *
  * +-----+---------+---------------+-----------+--------+--------+
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java
index 9d83ecde2bd6..3fd5f8242379 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
@@ -32,9 +30,9 @@
  * This test verifies that when a map-based {@link ElementCollection} of {@link Embeddable} objects
  * are audited that the same number of audit rows are generated regardless whether the embeddable
  * implements proper {@code equals} and {@code hashCode} methods.
- * 
+ *
  * The {@link ValidityAuditStrategy} with equals/hashcode.
- * 
+ *
  * +-----+---------+---------------+-----------+--------+--------+
  * | REV | REVTYPE | TESTENTITY_ID | EMBS1_KEY | REVEND | VALUE  |
  * +-----+---------+---------------+-----------+--------+--------+
@@ -43,9 +41,9 @@
  * | 2   | 0       | 1             | a         | null   | value3 |
  * | 2   | 2       | 1             | a         | null   | value1 |
  * +-----+---------+---------------+-----------+--------+--------+
- * 
+ *
  * The {@link org.hibernate.envers.strategy.DefaultAuditStrategy} with equals/hashcode.
- * 
+ *
  * +-----+---------+---------------+-----------+--------+
  * | REV | REVTYPE | TESTENTITY_ID | EMBS1_KEY | VALUE  |
  * +-----+---------+---------------+-----------+--------+
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java
index caa13e27458f..ca5ceb774e3f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java
index e82018e9842c..b4f730b7a036 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
@@ -97,4 +95,3 @@ public void testRevision3() {
 		assertEquals( new Type( 2, "T2" ), product.getItems().get( 0 ).getType() );
 	}
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java
index b90bb34a2295..30be22f490d6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java
index 339af58c3ccd..5f4d1e39e05a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java
index 10fefa49719a..529c356f8fa2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java
index 5a31da2bd537..7290761369ea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.embeddable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
index 61ddb1b89c85..1e8f23f22d25 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java
index 1e0dc35eb8bd..27fae21b37ea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java
index ad0b3d5dae83..7d509d662ac5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java
index 8ed2b2ce7047..5fa174c24762 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java
index 297db2c3375e..26bcdae0738f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java
index da911d495791..86d15fced8f8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java
index 66ab8d6b869a..254b5fed856a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java
index 6fc7169d6d63..b1d8c0b95340 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java
index 665898fee355..9043e2f205d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java
index 9a7c673b60c0..1872298c8152 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java
index b69ce60c77af..c160c5b3298d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java
index 33b23b27915d..b8afb424ff86 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java
index 48e6b5335a74..9a0b3811557c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java
index fb8f1f02ee5c..2a111c7d50f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.norevision;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java
index e2465c38c093..3cb3109b9b73 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java
index 6dc01afd59a5..3316a25f44d5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java
index bc4f479f33dd..f0eb74aae12c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java
index bb34049d248d..a610dd89acb7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.collections;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java
index df79986de4c6..377ae5d5017d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java
index f35d950ca60c..7ab40a6743c2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java
index ddbb017d5cae..2f0b2b6348ae 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
index e36d04d2c356..1f5b9127e599 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java
index e4aed4a6c217..da518f62962e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java
index fd298606af81..0ce3aab40be6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
index 6f745cd2c81f..ea96a22100f4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java
index 339ef5b240a1..d4947670dc2e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
@@ -96,4 +94,4 @@ public SimpleEntity getSimpleEntity() {
 	public void setSimpleEntity(SimpleEntity simpleEntity) {
 		this.simpleEntity = simpleEntity;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java
index 04483519deb0..f21168f5d0b1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java
index b08400e8fcbf..8e835b91f383 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java
index 8d4213ded661..845137970914 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java
index 17b9342102ac..1c4425e69be5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java
index 115e67664a5a..7328ec06bc69 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java
index 9b46593d9303..28581c901291 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java
index 87b06a70e0fa..85274d4095bf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java
index 1c4e16b57ea5..40d03dc42279 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java
index 512a13f3429e..7fd531155db4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java
index 72e562fe8000..d0f2149125f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java
index 299dd22dfd11..3e961e4512d0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.dynamic;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractAuditedEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractAuditedEmbeddable.java
index c21f7c8fef9c..8b8314b11f23 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractAuditedEmbeddable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractAuditedEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -20,52 +18,52 @@
 @Audited
 public abstract class AbstractAuditedEmbeddable {
 
-    /**
-     * Initial Value
-     */
-    protected static final int UNDEFINED = -1;
+	/**
+	 * Initial Value
+	 */
+	protected static final int UNDEFINED = -1;
 
-    private int code = UNDEFINED;
+	private int code = UNDEFINED;
 
 
-    protected AbstractAuditedEmbeddable() {
-        this( UNDEFINED );
-    }
+	protected AbstractAuditedEmbeddable() {
+		this( UNDEFINED );
+	}
 
-    /**
-     * Constructor with code
-     */
-    public AbstractAuditedEmbeddable(int code) {
-        this.code = code;
-    }
+	/**
+	 * Constructor with code
+	 */
+	public AbstractAuditedEmbeddable(int code) {
+		this.code = code;
+	}
 
-    public int getCode() {
-        return code;
-    }
+	public int getCode() {
+		return code;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + code;
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + code;
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if ( this == obj ) {
-            return true;
-        }
-        if ( obj == null ) {
-            return false;
-        }
-        if ( getClass() != obj.getClass() ) {
-            return false;
-        }
-        AbstractAuditedEmbeddable other = (AbstractAuditedEmbeddable) obj;
-        if ( code != other.code ) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( obj == null ) {
+			return false;
+		}
+		if ( getClass() != obj.getClass() ) {
+			return false;
+		}
+		AbstractAuditedEmbeddable other = (AbstractAuditedEmbeddable) obj;
+		if ( code != other.code ) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java
index d73fc851ee2c..4b952fa93da5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredData.java
index 9acfdae56ad5..68eedf54de8e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -17,51 +15,51 @@
 @Audited
 public class AuditedEmbeddableWithDeclaredData extends AbstractAuditedEmbeddable {
 
-    private String codeArt;
+	private String codeArt;
 
-    public AuditedEmbeddableWithDeclaredData(int code, String codeArt) {
-        super( code );
-        this.codeArt = codeArt;
-    }
+	public AuditedEmbeddableWithDeclaredData(int code, String codeArt) {
+		super( code );
+		this.codeArt = codeArt;
+	}
 
-    // Needed for @Embeddable
-    protected AuditedEmbeddableWithDeclaredData() {
-        this( UNDEFINED, null );
-    }
+	// Needed for @Embeddable
+	protected AuditedEmbeddableWithDeclaredData() {
+		this( UNDEFINED, null );
+	}
 
-    public String getCodeart() {
-        return codeArt;
-    }
+	public String getCodeart() {
+		return codeArt;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ( ( codeArt == null ) ? 0 : codeArt.hashCode() );
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + ( ( codeArt == null ) ? 0 : codeArt.hashCode() );
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if ( this == obj ) {
-            return true;
-        }
-        if ( !super.equals( obj ) ) {
-            return false;
-        }
-        if ( getClass() != obj.getClass() ) {
-            return false;
-        }
-        AuditedEmbeddableWithDeclaredData other = (AuditedEmbeddableWithDeclaredData) obj;
-        if ( codeArt == null ) {
-            if ( other.codeArt != null ) {
-                return false;
-            }
-        }
-        else if ( !codeArt.equals( other.codeArt ) ) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( !super.equals( obj ) ) {
+			return false;
+		}
+		if ( getClass() != obj.getClass() ) {
+			return false;
+		}
+		AuditedEmbeddableWithDeclaredData other = (AuditedEmbeddableWithDeclaredData) obj;
+		if ( codeArt == null ) {
+			if ( other.codeArt != null ) {
+				return false;
+			}
+		}
+		else if ( !codeArt.equals( other.codeArt ) ) {
+			return false;
+		}
+		return true;
+	}
 
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredDataTest.java
index 9cfd031da9d7..0ee4c3e3e85d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredDataTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithDeclaredDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -25,53 +23,53 @@
 @JiraKey("HHH-17189")
 public class AuditedEmbeddableWithDeclaredDataTest extends BaseEnversJPAFunctionalTestCase {
 
-    private long id;
+	private long id;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                EntityWithAuditedEmbeddableWithDeclaredData.class,
-                AbstractAuditedEmbeddable.class,
-                AuditedEmbeddableWithDeclaredData.class
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				EntityWithAuditedEmbeddableWithDeclaredData.class,
+				AbstractAuditedEmbeddable.class,
+				AuditedEmbeddableWithDeclaredData.class
+		};
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() {
-        this.id = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-          final EntityWithAuditedEmbeddableWithDeclaredData entity = new EntityWithAuditedEmbeddableWithDeclaredData();
-          entity.setName( "Entity 1" );
-          entity.setValue( new AuditedEmbeddableWithDeclaredData( 42, "Data" ) );
+	@Test
+	@Priority(10)
+	public void initData() {
+		this.id = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+		final EntityWithAuditedEmbeddableWithDeclaredData entity = new EntityWithAuditedEmbeddableWithDeclaredData();
+		entity.setName( "Entity 1" );
+		entity.setValue( new AuditedEmbeddableWithDeclaredData( 42, "Data" ) );
 
-          entityManager.persist(entity);
-          return entity.getId();
-        } );
-    }
+		entityManager.persist(entity);
+		return entity.getId();
+		} );
+	}
 
-    @Test
-    public void testEmbeddableThatExtendsAuditedMappedSuperclass() {
-        TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-            final EntityWithAuditedEmbeddableWithDeclaredData entity = entityManager.find(
-                    EntityWithAuditedEmbeddableWithDeclaredData.class,
-                    id
-            );
+	@Test
+	public void testEmbeddableThatExtendsAuditedMappedSuperclass() {
+		TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+			final EntityWithAuditedEmbeddableWithDeclaredData entity = entityManager.find(
+					EntityWithAuditedEmbeddableWithDeclaredData.class,
+					id
+			);
 
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
 
-            final List revisions = auditReader.getRevisions( EntityWithAuditedEmbeddableWithDeclaredData.class, id );
-            assertThat( revisions ).hasSize( 1 );
+			final List revisions = auditReader.getRevisions( EntityWithAuditedEmbeddableWithDeclaredData.class, id );
+			assertThat( revisions ).hasSize( 1 );
 
-            final EntityWithAuditedEmbeddableWithDeclaredData entityRevision1 = auditReader.find(
-                    EntityWithAuditedEmbeddableWithDeclaredData.class,
-                    id,
-                    revisions.get( 0 )
-            );
-            assertThat( entityRevision1.getName() ).isEqualTo( entity.getName() );
+			final EntityWithAuditedEmbeddableWithDeclaredData entityRevision1 = auditReader.find(
+					EntityWithAuditedEmbeddableWithDeclaredData.class,
+					id,
+					revisions.get( 0 )
+			);
+			assertThat( entityRevision1.getName() ).isEqualTo( entity.getName() );
 
-            // All fields should be audited because the mapped superclass is annotated
-            assertThat( entity.getValue().getCodeart() ).isEqualTo( entityRevision1.getValue().getCodeart() );
-            assertThat( entityRevision1.getValue().getCode() ).isEqualTo( 42 );
-        } );
-    }
+			// All fields should be audited because the mapped superclass is annotated
+			assertThat( entity.getValue().getCodeart() ).isEqualTo( entityRevision1.getValue().getCodeart() );
+			assertThat( entityRevision1.getValue().getCode() ).isEqualTo( 42 );
+		} );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredData.java
index 69cfc23af033..5585b55cae4a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -17,11 +15,11 @@
 @Audited
 public class AuditedEmbeddableWithNoDeclaredData extends AbstractAuditedEmbeddable {
 
-    public AuditedEmbeddableWithNoDeclaredData(int code) {
-        super( code );
-    }
+	public AuditedEmbeddableWithNoDeclaredData(int code) {
+		super( code );
+	}
 
-    // Needed for @Embeddable
-    protected AuditedEmbeddableWithNoDeclaredData() {
-    }
+	// Needed for @Embeddable
+	protected AuditedEmbeddableWithNoDeclaredData() {
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredDataTest.java
index 670d77a3cca6..149dec7bc550 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredDataTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AuditedEmbeddableWithNoDeclaredDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -25,53 +23,53 @@
 @JiraKey("HHH-17189")
 public class AuditedEmbeddableWithNoDeclaredDataTest extends BaseEnversJPAFunctionalTestCase {
 
-    private long id;
+	private long id;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                EntityWithAuditedEmbeddableWithNoDeclaredData.class,
-                AbstractAuditedEmbeddable.class,
-                AuditedEmbeddableWithDeclaredData.class,
-                AuditedEmbeddableWithNoDeclaredData.class,
-        };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				EntityWithAuditedEmbeddableWithNoDeclaredData.class,
+				AbstractAuditedEmbeddable.class,
+				AuditedEmbeddableWithDeclaredData.class,
+				AuditedEmbeddableWithNoDeclaredData.class,
+		};
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() {
-        this.id = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-          final EntityWithAuditedEmbeddableWithNoDeclaredData entity = new EntityWithAuditedEmbeddableWithNoDeclaredData();
-          entity.setName( "Entity 1" );
-          entity.setValue( new AuditedEmbeddableWithNoDeclaredData( 42 ) );
+	@Test
+	@Priority(10)
+	public void initData() {
+		this.id = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+		final EntityWithAuditedEmbeddableWithNoDeclaredData entity = new EntityWithAuditedEmbeddableWithNoDeclaredData();
+		entity.setName( "Entity 1" );
+		entity.setValue( new AuditedEmbeddableWithNoDeclaredData( 42 ) );
 
-          entityManager.persist(entity);
-          return entity.getId();
-        } );
-    }
+		entityManager.persist(entity);
+		return entity.getId();
+		} );
+	}
 
-    @Test
-    public void testEmbeddableThatExtendsAuditedMappedSuperclass() {
-        TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-            final EntityWithAuditedEmbeddableWithNoDeclaredData entity = entityManager.find(
-                    EntityWithAuditedEmbeddableWithNoDeclaredData.class,
-                    id
-            );
+	@Test
+	public void testEmbeddableThatExtendsAuditedMappedSuperclass() {
+		TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+			final EntityWithAuditedEmbeddableWithNoDeclaredData entity = entityManager.find(
+					EntityWithAuditedEmbeddableWithNoDeclaredData.class,
+					id
+			);
 
-            final AuditReader auditReader = AuditReaderFactory.get( entityManager );
+			final AuditReader auditReader = AuditReaderFactory.get( entityManager );
 
-            final List revisions = auditReader.getRevisions( EntityWithAuditedEmbeddableWithNoDeclaredData.class, id );
-            assertThat( revisions ).hasSize( 1 );
+			final List revisions = auditReader.getRevisions( EntityWithAuditedEmbeddableWithNoDeclaredData.class, id );
+			assertThat( revisions ).hasSize( 1 );
 
-            final EntityWithAuditedEmbeddableWithNoDeclaredData entityRevision1 = auditReader.find(
-                    EntityWithAuditedEmbeddableWithNoDeclaredData.class,
-                    id,
-                    revisions.get( 0 )
-            );
-            assertThat( entityRevision1.getName() ).isEqualTo( entity.getName() );
+			final EntityWithAuditedEmbeddableWithNoDeclaredData entityRevision1 = auditReader.find(
+					EntityWithAuditedEmbeddableWithNoDeclaredData.class,
+					id,
+					revisions.get( 0 )
+			);
+			assertThat( entityRevision1.getName() ).isEqualTo( entity.getName() );
 
-            // All fields should be audited because the mapped superclass is annotated
-            assertThat( entityRevision1.getValue().getCode() ).isEqualTo( 42 );
-        } );
-    }
+			// All fields should be audited because the mapped superclass is annotated
+			assertThat( entityRevision1.getValue().getCode() ).isEqualTo( 42 );
+		} );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java
index 0d6ad8f52fed..c3f7754d3a0a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java
index 73b09c1b37d0..2e230df0d6d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java
index 8f130941798b..6afb2c9600a8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java
index 747bc5e57966..4281aae63bff 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithDeclaredData.java
index 63eaa14c2094..2534f580321d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -26,63 +24,63 @@
 @Audited
 public class EntityWithAuditedEmbeddableWithDeclaredData {
 
-    @Id
-    @GeneratedValue
-    private long id;
+	@Id
+	@GeneratedValue
+	private long id;
 
-    @Column(name = "NAME", length = 100)
-    private String name;
+	@Column(name = "NAME", length = 100)
+	private String name;
 
-    @Embedded
-    private AuditedEmbeddableWithDeclaredData value;
+	@Embedded
+	private AuditedEmbeddableWithDeclaredData value;
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 
-    public void setId(long id) {
-        this.id = id;
-    }
+	public void setId(long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public AuditedEmbeddableWithDeclaredData getValue() {
-        return value;
-    }
+	public AuditedEmbeddableWithDeclaredData getValue() {
+		return value;
+	}
 
-    public void setValue(AuditedEmbeddableWithDeclaredData value) {
-        this.value = value;
-    }
+	public void setValue(AuditedEmbeddableWithDeclaredData value) {
+		this.value = value;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) ( id ^ ( id >>> 32 ) );
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (int) ( id ^ ( id >>> 32 ) );
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if ( this == obj ) {
-            return true;
-        }
-        if ( obj == null ) {
-            return false;
-        }
-        if ( getClass() != obj.getClass() ) {
-            return false;
-        }
-        EntityWithAuditedEmbeddableWithDeclaredData other = (EntityWithAuditedEmbeddableWithDeclaredData) obj;
-        if ( id != other.id ) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( obj == null ) {
+			return false;
+		}
+		if ( getClass() != obj.getClass() ) {
+			return false;
+		}
+		EntityWithAuditedEmbeddableWithDeclaredData other = (EntityWithAuditedEmbeddableWithDeclaredData) obj;
+		if ( id != other.id ) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithNoDeclaredData.java
index a5b762434479..751d0f660fe9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithNoDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithAuditedEmbeddableWithNoDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
@@ -26,63 +24,63 @@
 @Audited
 public class EntityWithAuditedEmbeddableWithNoDeclaredData {
 
-    @Id
-    @GeneratedValue
-    private long id;
+	@Id
+	@GeneratedValue
+	private long id;
 
-    @Column(name = "NAME", length = 100)
-    private String name;
+	@Column(name = "NAME", length = 100)
+	private String name;
 
-    @Embedded
-    private AuditedEmbeddableWithNoDeclaredData value;
+	@Embedded
+	private AuditedEmbeddableWithNoDeclaredData value;
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 
-    public void setId(long id) {
-        this.id = id;
-    }
+	public void setId(long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public AuditedEmbeddableWithNoDeclaredData getValue() {
-        return value;
-    }
+	public AuditedEmbeddableWithNoDeclaredData getValue() {
+		return value;
+	}
 
-    public void setValue(AuditedEmbeddableWithNoDeclaredData value) {
-        this.value = value;
-    }
+	public void setValue(AuditedEmbeddableWithNoDeclaredData value) {
+		this.value = value;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) ( id ^ ( id >>> 32 ) );
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (int) ( id ^ ( id >>> 32 ) );
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if ( this == obj ) {
-            return true;
-        }
-        if ( obj == null ) {
-            return false;
-        }
-        if ( getClass() != obj.getClass() ) {
-            return false;
-        }
-        EntityWithAuditedEmbeddableWithNoDeclaredData other = (EntityWithAuditedEmbeddableWithNoDeclaredData) obj;
-        if ( id != other.id ) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( obj == null ) {
+			return false;
+		}
+		if ( getClass() != obj.getClass() ) {
+			return false;
+		}
+		EntityWithAuditedEmbeddableWithNoDeclaredData other = (EntityWithAuditedEmbeddableWithNoDeclaredData) obj;
+		if ( id != other.id ) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
index a3b84b66b03e..362a688fefee 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
index 095954b413c7..b7d2ef030ef8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.mappedsuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java
index 44812bcc9908..30f225f29d80 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java
index 0a3360b2945a..2a291ec06549 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java
index 724a75653542..c3853c9fb8a4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.components.relations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java
index f9e5ac377b08..7e03e9602148 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.customtype;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java
index 152e72150288..864978a818b5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java
index 0196631988b7..9bada0bc5698 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java
index 6359c8979455..6f7c60179342 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java
index 0529043007c4..7e25d6ede18b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.data;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java
index 7e86e3894490..93b8fc747f1d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.dynamicmodel;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java
index be0fcf9e5df7..31d74f606edc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.auditedEntity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
index 08d4a788fa53..a9cedd240d24 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.auditedEntity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java
index 2e6d25435c2b..8605f17b0a98 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java
index eba1266035b7..d13d52e2c8a0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
index 5a79867ffef2..e5858c68cf92 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java
index 2906720b3f69..7398a59b773e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java
index aadc327d4039..c2cd1f55ca4b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
index c6af09c1ee37..6a28329a936b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited;
 
@@ -131,4 +129,3 @@ public void testObtainEntityNameAuditedCollectionWithEntityNameInNewSession() {
 
 	}
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java
index 586a568c55d5..510c3f30c86f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java
index e34af096bef4..afc2584e340e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
index 6eb3475bc4ed..7d88c928f291 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited;
 
@@ -132,4 +130,3 @@ public void testObtainEntityNameCollectionWithEntityNameAndNotAuditedModeInNewSe
 
 
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java
index 52c48f20929f..1badce2efad6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java
index 18fac3e00c99..07bccb4c2065 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
index 1e28e0132de5..e8f4f4b2b215 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
index 8f2c334eeead..7bee4f748b49 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited;
 
@@ -61,11 +59,11 @@ public void testSingleDomainObjectToMultipleTablesMapping() {
 		Person ownerVer1 = getAuditReader().find( Person.class, "Personaje", ownerId, 1 );
 		Person driverVer1 = getAuditReader().find( Person.class, "Driveraje", driverId, 1 );
 
-        /* Check ids. */
+		/* Check ids. */
 		Assert.assertEquals( ownerVer1.getId(), carVer1.getOwner().getId() );
 		Assert.assertEquals( driverVer1.getId(), carVer1.getDriver().getId() );
 
-        /* Check object properties. */
+		/* Check object properties. */
 		Assert.assertEquals( "Lukasz", ownerVer1.getName() );
 		Assert.assertEquals( "Kinga", driverVer1.getName() );
 		Assert.assertEquals( 1, carVer1.getNumber() );
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java
index 8518d7857169..b6a889c7bf07 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java
index eec0313bfc35..225e8da14c19 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
index 3988534908fd..fad2c8da0475 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java
index 470a848d0d35..9758f12a38a1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java
index 7a710d53c38b..72cfb3b85c86 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java
index 6763039eb460..e5a9fe1e7756 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java
index 76e231557639..632161541302 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java
index 958d1bce3105..526c43a9f598 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java
index f734657ce055..2faec2ef0ee7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java
index 4dcee6ebb510..4ae08d3a1d6c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java
index 02f84a86723a..5a8ae0e37215 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java
index 9cf932aa7108..edeeb89a0360 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java
index f7849bca7ddd..c447b0163b90 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.flush;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java
index 3f121eeaa54b..9cf7460093ad 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.generated;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
index 060bc6f377d1..e3176bf93b90 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.generated;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java
index 0ecee1c73f69..3cc50dd86732 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java
index eed26f08efaf..72f0dd773e1a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java
index cec56717ebea..e2121b7f7ce9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java
index c48b3a218c43..11a4f861382d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java
index e5f90719d910..34231909daac 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java
index ec145c9ea5d2..e30bcbfc53ae 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hashcode;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java
index 90cd1050c1f9..90175579889f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.hbm.allAudited.joined;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java
index b00b181f8fad..b9a2a06bdb70 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java
index 00d81b975a69..a084e3044e3f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java
index f229bbb78abe..6bf40a50a599 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java
index fe81c2de23e8..05c17988ddac 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntity.java
index 609a4f37e8d3..24bdf38bbd4b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntityId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntityId.java
index 6c8025d41812..42d25aaa424a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntityId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CompositeEntityId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java
index 951e2f3b8524..220ea6987885 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java
index 9221d166ef26..d39c8c0da281 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java
index 2b274eb3c7c1..04aec74528cf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java
index 736c2362c57a..5260ad71a941 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java
index 38249e83f577..505cf7980425 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java
index ca3e7dd513e1..5a4cdd25dd46 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java
index d0ab6a0d34fd..3a2ded25f6dc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java
index e23847120462..299b903b52fe 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCode.java
index bb33f35bcad5..da94773ec42e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCode.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCode.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCodeId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCodeId.java
index 910c066e846a..08d802952bea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCodeId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/OwnerOfRelationCodeId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java
index bfe56abccc70..943d659fd887 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java
index ca33408d84af..762ace2e6f8e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java
index 88e7dbf9e7f7..ce257d2c301e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
@@ -29,10 +27,10 @@ public class PurchaseOrder implements Serializable {
 
 	@ManyToOne
 	@JoinColumns({
-						 @JoinColumn(name = "model", referencedColumnName = "model", nullable = true),
-						 @JoinColumn(name = "version", referencedColumnName = "version", nullable = true),
-						 @JoinColumn(name = "producer", referencedColumnName = "producer", nullable = true)
-				 })
+						@JoinColumn(name = "model", referencedColumnName = "model", nullable = true),
+						@JoinColumn(name = "version", referencedColumnName = "version", nullable = true),
+						@JoinColumn(name = "producer", referencedColumnName = "producer", nullable = true)
+				})
 	private Item item;
 
 	@Column(name = "NOTE")
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java
index 50f4fb39654a..cba5bfa12fe7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java
index 9247b0e61ce1..a0ad6384b4c3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java
index 8c1a7f46b887..d9dc9d8d87f0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java
index 7a252fd13684..b5fe8a449b44 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java
index 4b343efae79f..a3e4f4719446 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java
index 1ff6cfa58849..94f63bc58215 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java
index 66d1c4eed55d..6e421af17675 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java
index 625cf2396268..46a9630db964 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
 import java.util.List;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java
index 1b3f35b9bb85..2c4a007704b1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
 import java.io.Serializable;
@@ -6,63 +10,63 @@
  * Created by yinzara on 4/1/16.
  */
 public class ReferenceIdentifierClassId implements Serializable {
-    private Integer iiie;
-    private String type;
+	private Integer iiie;
+	private String type;
 
-    public ReferenceIdentifierClassId() {
-    }
+	public ReferenceIdentifierClassId() {
+	}
 
-    public ReferenceIdentifierClassId(Integer iiie, String type) {
-        this.iiie = iiie;
-        this.type = type;
-    }
+	public ReferenceIdentifierClassId(Integer iiie, String type) {
+		this.iiie = iiie;
+		this.type = type;
+	}
 
-    @Override
-    public boolean equals(Object o) {
-        if ( this == o ) {
-            return true;
-        }
-        if ( !(o instanceof ReferenceIdentifierClassId) ) {
-            return false;
-        }
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( !(o instanceof ReferenceIdentifierClassId) ) {
+			return false;
+		}
 
-        ReferenceIdentifierClassId that = (ReferenceIdentifierClassId) o;
+		ReferenceIdentifierClassId that = (ReferenceIdentifierClassId) o;
 
-        if ( iiie != null ? !iiie.equals( that.iiie) : that.iiie != null ) {
-            return false;
-        }
-        if ( type != null ? !type.equals( that.type ) : that.type != null ) {
-            return false;
-        }
+		if ( iiie != null ? !iiie.equals( that.iiie) : that.iiie != null ) {
+			return false;
+		}
+		if ( type != null ? !type.equals( that.type ) : that.type != null ) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    @Override
-    public int hashCode() {
-        int result = iiie != null ? iiie.hashCode() : 0;
-        result = 31 * result + (type != null ? type.hashCode() : 0);
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		int result = iiie != null ? iiie.hashCode() : 0;
+		result = 31 * result + (type != null ? type.hashCode() : 0);
+		return result;
+	}
 
-    @Override
-    public String toString() {
-        return "ReferenceIdentifierClassId(iiie = " + iiie + ", type = " + type + ")";
-    }
+	@Override
+	public String toString() {
+		return "ReferenceIdentifierClassId(iiie = " + iiie + ", type = " + type + ")";
+	}
 
-    public Integer getIiie() {
-        return iiie;
-    }
+	public Integer getIiie() {
+		return iiie;
+	}
 
-    public void setIiie(Integer iiie) {
-        this.iiie = iiie;
-    }
+	public void setIiie(Integer iiie) {
+		this.iiie = iiie;
+	}
 
-    public String getType() {
-        return type;
-    }
+	public String getType() {
+		return type;
+	}
 
-    public void setType(String type) {
-        this.type = type;
-    }
+	public void setType(String type) {
+		this.type = type;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java
index 71d5cf3003a5..c9660ffa6fd1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java
index 87d59aa5269c..1647f5a3a611 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java
index 42bfa6682b7d..7b5c4caf4f22 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java
index 4d3ba722ea57..616de2c83867 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.protectedmodifier;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java
index 79fa4b954a56..cb39bac408be 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.protectedmodifier;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java
index df247958acb5..c28246b9da8d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.ids.protectedmodifier;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java
index fa2e4e56cb3d..caaca59d45c3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java
index 80367d139a6d..5f9d8e785f1a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java
index 3a3977ad34cb..0b5c526878e9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java
index 50df3744f89a..cc42c6881178 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java
index 21b528c6461f..d030accf166f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java
index 7870cfdc10ef..ff01d6330576 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java
index 6700c6e85e06..7e7c15e23380 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java
index 1e48e325ecc3..966b52777f92 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java
index b4f013f0af5a..2fd7e8e4b8dc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
index 72dc126afb5e..ce8abc9712eb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java
index 72b8f8d93324..afe52fd87d9d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation;
 
 import java.util.Set;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
index a490a192dbd2..35f3fb6b4576 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java
index 009cbd26e308..10b30c7cfd2c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java
index ec48b422305d..7de9c0ff6fad 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java
index 4764fb2c0dd7..05ff4fb03896 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation;
 
 import java.io.Serializable;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java
index 1f88586136e4..ffa59ccb03d5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation;
 
 import java.io.Serializable;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
index c1a7a1ea0333..fcec5b8d7b3c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java
index 7503dc7eb0e4..9bbf00754250 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
index 7a1a59002dad..08b703ae6ba5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.primarykeyjoin;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
index a3fdc93e8dd5..b265230cb9bc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.primarykeyjoin;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java
index b5a5026198b6..3128d494ca5e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java
index d9ef51f660e4..eadf9d3347bf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java
index 6d6e3deeb5cc..73e82e8fa3a9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java
index a9d980abf79e..fbf05cf0fb6b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java
index bb20df7b2fb9..8ca6faaf1d93 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java
index 1fde6a4e3d1f..d6d857f4d706 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
 import java.util.Set;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java
index 6fc1ba6e05f2..ccea9c190f5a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java
index a43c57521cbe..bdf8577da3f3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
index 3f26c248f3d9..902e39245492 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
index e4fbd7662bf8..c13149cafd29 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional;
 
 import java.util.HashSet;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
index a7a161287d03..350f6a2e76f4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java
index 3878997e7871..e55e5d175ca8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
index b761f98dbe19..585667339478 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
index 1afd7587186e..d37c632c3e01 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java
index 8ceba61fe016..584c38e38f8d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java
index 4289e07f4259..5245cd8bdef3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
@@ -32,9 +30,9 @@ public abstract class AbstractCheckActivity extends AbstractActivity {
 	private Integer durationInMinutes;
 	@ManyToOne(targetEntity = AbstractActivity.class, cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
 	@JoinColumns({
-						 @JoinColumn(table = "ACTIVITY_CHECK", referencedColumnName = "id"),
-						 @JoinColumn(table = "ACTIVITY_CHECK", referencedColumnName = "id2")
-				 })
+						@JoinColumn(table = "ACTIVITY_CHECK", referencedColumnName = "id"),
+						@JoinColumn(table = "ACTIVITY_CHECK", referencedColumnName = "id2")
+				})
 	private Activity relatedActivity;
 
 	public Integer getDurationInMinutes() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/Activity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/Activity.java
index 02768c2f2a73..31afeede820e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/Activity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/Activity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java
index 26540af7a547..f7b85fead413 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java
index 05f9e4a0637f..9d32000ac088 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java
index a9028534f550..f048d0760e43 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java
index 9a2f783ce1d8..6c6dec6d8971 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java
index 30bfb0d2106d..f33017809d7f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java
index ec99c66cd32c..e080a6aff15f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java
index ff2cd53c9cb6..8a8f6b952111 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java
index 326c9303e881..3fad3c0ef58a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java
index f0fe05376f2a..48266a93fcd7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java
index 3ab5555636d1..06185b4fb679 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java
index 611f1e510e9d..d04b1d9e7504 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java
index ffde53a800c8..b073f3d1d6a5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
index c7b9d9b3a94e..8712d7ca66f5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
index b8581b53ea89..67435f62b9a4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java
index 65071acd0064..8856ab270a3b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java
index 2935c4a85a48..0bf89ab08386 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java
index 30486770a9e1..a9e175af0b5d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
index edcbb7ba7416..bdbc092cb4f7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java
index a9d06e1c8501..ae64e660139d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java
index 0d27908bd209..e66baf1ccf91 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java
index fb1e306fb580..203267b6c3ca 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java
index b5de873aef2a..d5057aee46c0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java
index 60ba49e16f0b..60e95dcd5ce1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java
index 84fe0b8ba5ec..824fe4aca964 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.single.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java
index 26bf71414353..c5bb1fe07f59 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java
index 538be3a83897..0ae3858b1d27 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java
index 9f19e0991885..41ccf0e74ffe 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java
index e4175c5c682f..341ebc3890bd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java
index 8990cdbc9442..afa9a2351781 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java
index 51438d458719..ebb4c1a6b562 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java
index f24f085a387d..25995ec7ad6f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
index a3e003920f14..1ad3c8ac15f9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
index 035caf2f09ce..244bc6fcfac7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
index 3926807685dd..dc1fe38fce37 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
index 267fd873f422..d9bc00f7ae6d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation;
 
 import java.util.Set;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java
index 91829a85e82b..92670160f6f5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation;
 
 import java.io.Serializable;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java
index ee169173f81b..2ef24790b062 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation;
 
 import java.io.Serializable;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
index 9535a96dcbb1..018895be1074 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
index 0a3149269014..aac5bc121ea8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java
index 381c1aff17f0..03ba15551347 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java
index dd3a70bfbdac..19aa2eb88627 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation;
 
 import jakarta.persistence.Basic;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
index d6f184bf4310..f1f0cf5beb47 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java
index c5700ca70f7a..7ecd83d16918 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation;
 
 import java.util.Set;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java
index 9a2e36af9a54..5589463a8fe0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java
index 1aa3ccc79d35..277675b08380 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java
index 727d031c7647..b70ba352dc5f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java
index fedc30e4cf74..7ceb76f2ce1e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.components;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
index bd9ea976da41..8e72c97fa294 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java
index cc920455e768..f9c5230862cc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited;
 
 import org.hibernate.envers.Audited;
-import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.SimpleInterface;
 
 /**
  * @author Hern�n Chanfreau
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
index 1b72360342ca..552ecddb9be6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited;
 
 
-import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.SimpleInterface;
 
 /**
  * @author Hern�n Chanfreau
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java
index e97e4bc57116..dc6cc17c3bd0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
index 088379b43403..4f051f5dd2b0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.subclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
index 95a7f33e2320..3190d75966d4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.union;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
index ac3a9fb65738..4c7be716b32e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
index 5630b7df9a97..5a9b9f8385f7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
index 9084db8e563e..7dbc4fbf3604 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
index 8bdbc2ce4172..bd66ac2576f4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
index f8c339c6a62f..ebc61deeb654 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.joined;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
index afd2c5bfc5eb..1043ac0729d4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.subclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
index d5653968d7d0..e393ceffdb47 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.union;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
index de5cafb2e3e9..bb9d2aec24ef 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
index 747b6f4eaca7..559d24a7ff48 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
index c41d6ab0547f..c5dff659335f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
index 61c0ff2a7bcd..9898d67d7055 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
index bdb5c756af4c..e34dad3d8bb7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.joined;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
index 420b3e6dbd53..d69211bf8628 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.subclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
index 5bdcc403ab2b..6e14483fd2e9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.union;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java
index 2af35d60d269..3dc38cbd0813 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java
index c334fbae3f4c..4a3e6ccb8b8b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java
index fcca754ddfd1..f5abdf80c510 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java
index 62f07861e15f..e177ea35d01d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.interfaces.relation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java
index 13a1962e2023..5183fe6d7b84 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java
index 221d732715d7..d88f2d08b4c7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java
index edfc2a8768e5..7d1750e3a064 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java
index 1474d983ae57..96d4373a257d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java
index b6d89034d641..e48e2944ab93 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java
index 9c04b018f24e..c88143b0cf68 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java
index 3db53d1bf557..0af656dcd77e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.jta;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java
index 6e4ece4e193d..f82e6af46d15 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.lazy;
 
@@ -91,10 +89,10 @@ public void testIsInitialized() {
 		MultipleCollectionEntity ret = res.get( 0 );
 
 		assertEquals( Hibernate.isInitialized( ret.getRefEntities1() ), false );
-		
+
 		Hibernate.initialize(ret.getRefEntities1());
-		
+
 		assertEquals( Hibernate.isInitialized( ret.getRefEntities1() ), true );
-		
+
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java
index 30fd422ef18b..193223e73fe0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.lazy;
 
@@ -84,11 +82,11 @@ public void testIsInitialized() {
 				.getResultList();
 
 		MultipleCollectionEntity ret = res.get( 0 );
-		
+
 		assertEquals( Hibernate.isInitialized( ret.getRefEntities1() ), false );
-		
+
 		Hibernate.initialize(ret.getRefEntities1());
-		
+
 		assertEquals( Hibernate.isInitialized( ret.getRefEntities1() ), true );
 
 	}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java
index ba49d4af912d..5d599ba6f17e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java
index efc98d606921..4ce2902c6b86 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java
index 3ccedb11a27e..d0cb0eaf8e52 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java
index 8b089f1f3ff2..0761850e525c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java
index e4c378c91470..d09b34dc2e78 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java
index 44a53ae6338c..c5f98d18cb53 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java
index 18a994bca67c..ef08be65da4d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
@@ -140,7 +138,7 @@ public void setaList(List aList) {
 			this.aList = aList;
 		}
 	}
-	
+
 	private static class EntityBNameMatcher extends BaseMatcher {
 
 		private final String expectedValue;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java
index ab85af715b9e..fd9d2f0cbe87 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java
index 98fae444d973..acc36c0aa336 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.biowned;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java
index fbb3dbaf56f8..fec3ec8fa6cd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
index eca2bbfadf29..657c495a835a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
index 9281d37547cb..09b67c392311 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
index 2831411a0b2c..03b5ca5e6488 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java
index 6719cdd247ef..75d8a6140ef5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
index 7d80f9fed8de..f509b33ec113 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.sametable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java
index bc6d58e44512..91bfa05ae71a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.ternary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java
index c7a2399fb959..8a432e43ee0f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.ternary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java
index c152ef9ae2b8..a867e06d34ff 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.ternary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java
index 307fe13e0eaf..adc8479328e4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java
index ab68d58a278d..b00f1bd8eed0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java
index 3e49b9d6a4b2..af616571660c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java
index e8c89418b1d7..1cca348b9360 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
index 61c62c151f54..929e90fcc4d9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
index f3f4673aea14..fb552a6187f4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java
index 6e6bfff8df40..10cc02e43f90 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java
index 65a6ebd7464b..0fcae5534f7f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java
index 737532ba7c54..1166ad201c43 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java
index 07045205d26d..d70c4fa31ac5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java
index a89e7d546adc..1bcb623a573e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java
index 5ba72f9145f2..2127a1f34271 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java
index 80ee85a753c3..817e9c39d3c5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
@@ -30,7 +28,7 @@ public class ManyToOneOwning implements Serializable {
 
 	@ManyToOne
 	@JoinTable(name = "many_to_one_join_table", joinColumns = @JoinColumn(name = "owning_id"),
-			   inverseJoinColumns = @JoinColumn(name = "owned_id"))
+			inverseJoinColumns = @JoinColumn(name = "owned_id"))
 	private OneToManyOwned references;
 
 	public ManyToOneOwning() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java
index e5f0df3bbe5d..e0be1cd0dde5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java
index 17126638e80e..1ab793ae6222 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.foreignkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java
index 99a5b77dc3a1..0cd98536a8ff 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.foreignkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java
index 5098cf5bdd93..a2469e37c888 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.foreignkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayerPK.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayerPK.java
index 62760e0d3a8d..5a17a4b56b39 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayerPK.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayerPK.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.foreignkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java
index d16c108f41a6..2a8e23fdee56 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.foreignkey;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
index 675ed4bc118d..50536b66e273 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytoone.unidirectional;
 
@@ -20,8 +18,6 @@
 import org.hibernate.proxy.LazyInitializer;
 import org.junit.Test;
 
-import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 
 /**
  * @author Tomasz Bech
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java
index 4be863d2a2c5..cfbc39ccff15 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.merge;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java
index 8b400c48cc4c..6b582edfc3fe 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.merge;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
index 4d819aad140d..b292381954ed 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
index ccc779d6f11a..78edaffed778 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
@@ -16,7 +14,7 @@
  * @author Michal Skowronek (mskowr at o2 dot pl)
  */
 public abstract class AbstractModifiedFlagsOneSessionTest extends
-														  AbstractOneSessionTest {
+														AbstractOneSessionTest {
 
 	@Override
 	protected void addProperties(Configuration configuration) {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java
index 4cb2665dc940..d0d9b29138c5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java
index e668ad5c78e5..ec9a87a3e0d5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
@@ -14,7 +12,6 @@
 import org.hibernate.orm.test.envers.integration.auditReader.AuditedTestEntity;
 import org.hibernate.orm.test.envers.integration.auditReader.NotAuditedTestEntity;
 
-import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest;
 import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumEntity;
 import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumOption;
 import org.junit.Test;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java
index 751a0ba6a595..b2909962a524 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
index c839c392d731..a030594ef606 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java
index 708d32fa80cf..18afaecb9658 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
@@ -10,7 +8,6 @@
 import jakarta.persistence.EntityManager;
 
 import org.hibernate.orm.test.envers.Priority;
-import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest;
 import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefEdEntity;
 import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefIngEntity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java
index db82f67fae6f..3b16df9b1dfa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java
index f1bbbc0b4d6c..af51b23094aa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
index 9a0136241d6d..46410961de9d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java
index cba4bdaddafd..f7f1f913e6d9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java
index aafe1b462722..a83fa21e45f2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
index 365eaaecf608..b0d90636c660 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java
index ab28ee89ad0e..346254f6d343 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
@@ -13,7 +11,6 @@
 import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity;
 import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E1;
 import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E2;
-import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest;
 
 import org.junit.Test;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java
index f560438b5be3..80041a34239e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
@@ -14,7 +12,6 @@
 import org.hibernate.orm.test.envers.entities.StrTestEntity;
 import org.hibernate.orm.test.envers.entities.components.Component1;
 import org.hibernate.orm.test.envers.entities.components.Component2;
-import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest;
 import org.hibernate.orm.test.envers.integration.modifiedflags.entities.PartialModifiedFlagsEntity;
 import org.hibernate.orm.test.envers.integration.modifiedflags.entities.WithModifiedFlagReferencingEntity;
 import org.junit.Test;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java
index ae9211073680..deddf126ce71 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java
index 946a5cf14ada..555fee61b7ba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java
index 0163cf3bb567..42cfeaf4c822 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java
index 21c677f5e835..f45532032649 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java
index 6240f3fef3af..65820a5b7b2a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java
index e0ecbcab6d2a..89053ab74ae1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java
index cc634400af32..2fd65170b14f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java
index a119b54768de..f3e1df0f172c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java
index 1c4716454dc2..83fdaff0b310 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java
index 727d4904c629..0f6c31d9deaa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java
index a8041386a84d..69da61ddd6be 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java
index fccd5926ef77..ab2ba952faef 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
@@ -20,36 +18,36 @@
 @Entity
 @Audited
 public class EnumEntity {
-    @Id
-    private Integer id;
+	@Id
+	private Integer id;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = "client_option")
-    @Audited(modifiedColumnName = "client_option_mod")
-    private EnumOption option;
+	@Enumerated(EnumType.STRING)
+	@Column(name = "client_option")
+	@Audited(modifiedColumnName = "client_option_mod")
+	private EnumOption option;
 
-    EnumEntity() {
+	EnumEntity() {
 
-    }
+	}
 
-    public EnumEntity(Integer id, EnumOption option) {
-        this.id = id;
-        this.option = option;
-    }
+	public EnumEntity(Integer id, EnumOption option) {
+		this.id = id;
+		this.option = option;
+	}
 
-    public Integer getId() {
-        return id;
-    }
+	public Integer getId() {
+		return id;
+	}
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    public EnumOption getOption() {
-        return option;
-    }
+	public EnumOption getOption() {
+		return option;
+	}
 
-    public void setOption(EnumOption option) {
-        this.option = option;
-    }
+	public void setOption(EnumOption option) {
+		this.option = option;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java
index 0b64357e2916..ccae06227358 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
@@ -10,6 +8,6 @@
  * @author Chris Cranford
  */
 public enum EnumOption {
-    A,
-    B,
+	A,
+	B,
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
index 9303bf33511b..439ce58c935b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java
index 4f3483cf312d..4e08b73803ad 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java
index 36faca5bb649..2e6f30c0a3c9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
index b281375a94ff..fd9e414325eb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ClientOption.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ClientOption.java
index 2f8d4a14a72e..2b241d288334 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ClientOption.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ClientOption.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
@@ -10,6 +8,6 @@
  * @author Chris Cranford
  */
 public enum ClientOption {
-    A,
-    B
+	A,
+	B
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java
index 9de63ea8e662..b79fb48b0213 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java
index b45f7d24c45b..719933b44789 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java
index 694224630644..a9230e5aac00 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java
index 92bd40124807..22fd3d4aac47 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java
index 0ed85d4e36a4..97a57c3e45dc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java
index 30b1396227d0..2cfc77a25438 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java
index 80fd1cb24c04..aa16af4bfbe9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java
index f96028b574c3..d5e98b79bd4e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.multiplerelations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java
index fc20d2697271..f7d3a9d97396 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.multiplerelations;
 
@@ -43,10 +41,10 @@ public class GroupMemberTest extends BaseEnversJPAFunctionalTestCase {
 	private Integer uniqueGroupId;
 	private Integer groupMemberId;
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-    	return new Class[] { GroupMember.class, MultiGroup.class, UniqueGroup.class };
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { GroupMember.class, MultiGroup.class, UniqueGroup.class };
+	}
 
 	@Test
 	@Priority(10)
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java
index e107694fceeb..2667686544c0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.multiplerelations;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java
index 170c298bb473..db3702133fe0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.multiplerelations;
 
@@ -34,8 +32,8 @@ public class Person implements Serializable {
 
 	@ManyToMany(cascade = {CascadeType.PERSIST})
 	@JoinTable(name = "PERSON_ADDRESS",
-			   joinColumns = {@JoinColumn(name = "personId", nullable = false)},
-			   inverseJoinColumns = {@JoinColumn(name = "addressId", nullable = false)})
+			joinColumns = {@JoinColumn(name = "personId", nullable = false)},
+			inverseJoinColumns = {@JoinColumn(name = "addressId", nullable = false)})
 	private Set
     addresses = new HashSet
    ();
 
 	@OneToMany(mappedBy = "landlord", cascade = {CascadeType.PERSIST}, orphanRemoval = true)
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java
index 597644023352..91a506d25f04 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java
index b4461b9fe5ff..e1ee37304eb5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
@@ -30,8 +28,8 @@ public class DetachedNamingTestEntity {
 	@Audited
 	@OneToMany
 	@JoinTable(name = "UNI_NAMING_TEST",
-			   joinColumns = @JoinColumn(name = "ID_1"),
-			   inverseJoinColumns = @JoinColumn(name = "ID_2"))
+			joinColumns = @JoinColumn(name = "ID_1"),
+			inverseJoinColumns = @JoinColumn(name = "ID_2"))
 	private Set collection;
 
 	public DetachedNamingTestEntity() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java
index 8d9fc55f564c..036fb29f5dbd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java
index bf5f9f130c6f..c83e7f29fbba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java
index a9a40c6dc49c..1f48bef4b6f1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java
index a7444f99d4e3..7b7f3a7d6dc3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java
index 6cea98aebc5f..6d05c7d45b7f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java
index 1b274af11688..d5745591a1fb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java
index 6a9f3c0448e4..9439c7cd1bd7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java
index d954c7e82d64..b9717bd92769 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java
index 03a9e468d50e..a5c00dbf49ac 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
@@ -31,11 +29,11 @@ public final class VersionsJoinTableRangeComponent range = new ArrayList();
 
 	// ********************** Accessor Methods ********************** //
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
index 9ea10de1a804..b1825e7d63dc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
@@ -41,16 +39,16 @@ public class VersionsJoinTableRangeComponentTestEntity {
 	 */
 	@Embedded
 	@AssociationOverride(name = "range",
-						 joinColumns = {
-								 @JoinColumn(name = "VJTRCTE1_ID",
-											 insertable = true,
-											 updatable = false,
-											 nullable = false)
-						 })
+						joinColumns = {
+								@JoinColumn(name = "VJTRCTE1_ID",
+											insertable = true,
+											updatable = false,
+											nullable = false)
+						})
 	@org.hibernate.envers.Audited
 	@AuditOverride(name = "range",
-				   auditJoinTable = @org.hibernate.envers.AuditJoinTable(name = "JOIN_TABLE_COMPONENT_1_AUD",
-																		 inverseJoinColumns = @JoinColumn(name = "VJTRTE_ID")))
+				auditJoinTable = @org.hibernate.envers.AuditJoinTable(name = "JOIN_TABLE_COMPONENT_1_AUD",
+																		inverseJoinColumns = @JoinColumn(name = "VJTRTE_ID")))
 	private VersionsJoinTableRangeComponent component1 = new VersionsJoinTableRangeComponent();
 
 	/**
@@ -59,17 +57,17 @@ public class VersionsJoinTableRangeComponentTestEntity {
 	 */
 	@Embedded
 	@AssociationOverride(name = "range",
-						 joinColumns = {
-								 @JoinColumn(name = "VJTRCTE2_ID",
-											 insertable = true,
-											 updatable = false,
-											 nullable = false)
-						 })
+						joinColumns = {
+								@JoinColumn(name = "VJTRCTE2_ID",
+											insertable = true,
+											updatable = false,
+											nullable = false)
+						})
 	@org.hibernate.envers.Audited
 	@AuditOverrides(value = {
 			@AuditOverride(name = "range",
-						   auditJoinTable = @org.hibernate.envers.AuditJoinTable(name = "JOIN_TABLE_COMPONENT_2_AUD",
-																				 inverseJoinColumns = @JoinColumn(name = "VJTRTAE_ID")))
+						auditJoinTable = @org.hibernate.envers.AuditJoinTable(name = "JOIN_TABLE_COMPONENT_2_AUD",
+																				inverseJoinColumns = @JoinColumn(name = "VJTRTAE_ID")))
 	})
 	private VersionsJoinTableRangeComponent component2 = new VersionsJoinTableRangeComponent();
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
index be7f8f99add5..5579bc53b358 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
@@ -20,7 +18,7 @@
 @Table(name = "RANGE_TEST_ALTERNATE_ENT")
 @org.hibernate.envers.Audited
 public class VersionsJoinTableRangeTestAlternateEntity extends
-													   VersionsJoinTableRangeTestEntitySuperClass {
+													VersionsJoinTableRangeTestEntitySuperClass {
 
 	private String alternateValue;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java
index 110236d68f4f..19a1a0a3fc1f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
@@ -21,7 +19,7 @@
 @Table(name = "RANGE_TEST_ENTITY")
 @org.hibernate.envers.Audited
 public class VersionsJoinTableRangeTestEntity extends
-											  VersionsJoinTableRangeTestEntitySuperClass {
+											VersionsJoinTableRangeTestEntitySuperClass {
 
 	@Column(name = "val")
 	private String value;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
index 9f306faa8d66..fbe019a0ad35 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java
index 23bf3fa3aadc..8c7b76a1342c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java
index bf60b1c07f33..117a5a8bfd0a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java
index c75c99f2b03a..965fdbe41cd8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
index 7af458aad315..3c1825cd1a3c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
index db7365535a9e..9ba394c21b7b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
@@ -32,9 +30,9 @@ public class JoinEmbIdNamingRefIngEntity {
 	@Audited
 	@ManyToOne
 	@JoinColumns({
-						 @JoinColumn(name = "XX_reference", referencedColumnName = "XX"),
-						 @JoinColumn(name = "YY_reference", referencedColumnName = "YY")
-				 })
+						@JoinColumn(name = "XX_reference", referencedColumnName = "XX"),
+						@JoinColumn(name = "YY_reference", referencedColumnName = "YY")
+				})
 	private JoinEmbIdNamingRefEdEntity reference;
 
 	public JoinEmbIdNamingRefIngEntity() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java
index b1e55790d50e..6223669233cc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
index 40ec08968ff9..51aaedf96506 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
index a14b5006458f..e53efef4cdc2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
@@ -37,9 +35,9 @@ public class JoinMulIdNamingRefIngEntity {
 	@Audited
 	@ManyToOne
 	@JoinColumns({
-						 @JoinColumn(name = "ID2_reference", referencedColumnName = "ID_2"),
-						 @JoinColumn(name = "ID1_reference", referencedColumnName = "ID_1")
-				 })
+						@JoinColumn(name = "ID2_reference", referencedColumnName = "ID_2"),
+						@JoinColumn(name = "ID1_reference", referencedColumnName = "ID_1")
+				})
 	private JoinMulIdNamingRefEdEntity reference;
 
 	public JoinMulIdNamingRefIngEntity() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java
index dca7a72b7034..a156524a8e46 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java
index 453ee46078a3..f66e677eef26 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.quotation;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java
index 35ceb3c98298..73c859133923 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naming.quotation;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import jakarta.persistence.EntityManager;
 
 import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java
index 78291fac2328..ebe6dd32bc08 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.nativequery;
 
@@ -49,4 +47,3 @@ public void testNativeQueryResultHandling() {
 	}
 
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java
index 4a9f089803ac..1d2f27092887 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.nativequery;
 
@@ -43,4 +41,3 @@ public void setStringField(String stringField) {
 		this.stringField = stringField;
 	}
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java
index 24ce47d2933e..8815fffec247 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.nativequery;
 
@@ -45,4 +43,3 @@ public void setStringField(String stringField) {
 		this.stringField = stringField;
 	}
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java
index ce4c4c70ac82..21c0e8af154c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naturalid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java
index d8c5496a7257..7b7d81bf036c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naturalid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java
index 8f86bfc73f42..1a442a8a183b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naturalid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java
index dbc3a069f308..fda1c1a9dbf5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.naturalid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java
index 31ea8021efc6..278e77b63344 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notinsertable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java
index f1a6676ac1c3..4fab1699b6a8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notinsertable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
index ad14577f2f71..3eb345475f82 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notinsertable.manytoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
index 401fd9e7cfe3..f0e77a0c7792 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notinsertable.manytoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java
index df11d109ed62..d01de354f7b5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notinsertable.manytoone;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java
index b7b636ba5ad2..50201a2b9635 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notupdatable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java
index d94d47a4bb43..670a4fd1a3aa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.notupdatable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java
index e628b467e0ce..f4ab1a779c9c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java
index f117204eabb5..84463fda698a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java
index eaaca086dfcf..ae90ead4fd6a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java
index eeacc457a837..1a3c5f0cd041 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java
index 4df1c3aea761..d09394dfb632 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java
index 830806da10c4..a71a076afa10 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java
index db8afb868364..c02e6fec8308 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java
index a1131459a500..bd47d6dc6937 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java
index 0071693d9902..957a9d0690a8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java
index 08c4a2411f28..9e4fb2fd60e0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.integration.onetomany;
 
 import java.util.Arrays;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java
index 2d3a0b1d4c75..4ac23405d9a5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java
index adad8c86ff94..83e24ea51623 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java
index 0a209bc792e4..808d088363dd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java
index 2123ea0a2f96..a5cbd128447a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java
index eebaa0b1f679..9d4f9f323580 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
index 4bf00ae608c5..48b9cf2923c9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java
index 8d1b40866ace..88b8cad15e9c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java
index c0648bd132d9..e8604c66ef27 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java
index 56c30f07778a..4f179fa5a6bb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java
index 3c72d5467659..b0b07da55fcd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
@@ -88,4 +86,4 @@ public void testHistoryOfParent() {
 		Assert.assertEquals( parent, ver2 );
 		Assert.assertEquals( parent.getCollection(), ver2.getCollection() );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java
index 3158ff962c5e..25b1e825fa4a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
index b44312ecc6bd..2082cfcdf571 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
index 13c3dc0042b4..03fc79fd67d6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
index 308d2499298d..73ec7f240f17 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java
index 9cd148145c50..09d03d9f84c5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
index 212cffe1c7a2..cc6a29065901 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.detached;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java
index aac6ccfd0f8d..ad98502fecea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java
index ddc232872681..e9cf584177b3 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.embeddedid;
 
@@ -12,9 +10,6 @@
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
 import org.hibernate.orm.test.envers.Priority;
-import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Constant;
-import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Person;
-import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.PersonTuple;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SkipForDialect;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java
index b58906c7914d..434cef4db627 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java
index d72e4f78ac5b..80d9c5dce0ea 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java
index 549d5145c2a6..acab20a970d7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.embeddedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java
index a4c03b025747..8013c6874053 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.hierarchy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java
index 102e0715d1be..9307c11b2044 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.hierarchy;
 
@@ -39,8 +37,8 @@ public class Node implements Serializable {
 	@AuditJoinTable(name = "NODES_JOIN_TABLE_AUD",
 					inverseJoinColumns = {@JoinColumn(name = "PARENT_ID", nullable = true, updatable = false)})
 	@JoinTable(name = "NODES_JOIN_TABLE",
-			   joinColumns = {@JoinColumn(name = "CHILD_ID", nullable = true, updatable = false)},
-			   inverseJoinColumns = {@JoinColumn(name = "PARENT_ID", nullable = true, updatable = false)})
+			joinColumns = {@JoinColumn(name = "CHILD_ID", nullable = true, updatable = false)},
+			inverseJoinColumns = {@JoinColumn(name = "PARENT_ID", nullable = true, updatable = false)})
 	private Node parent;
 
 	@OneToMany(mappedBy = "parent")
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java
index 70d811d4e11f..d97956ac28b5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java
index 5cec42441087..08ac42fb5a55 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java
index 032cfa646e92..14ff4baca306 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java
index 231a6201ebd4..fc7078461145 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.idclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java
index 3c55da041d28..63e870c3d0d4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
index 5d3bd7143bf6..48ccf8eb5898 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
index e2a51a2ca29f..38c0dd74e23f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
index e86838a35f03..f52636efe6b1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java
index a3c47580d47a..c0d5bf6b915e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java
index ba7577b7c65b..ba2bbdb52573 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.relatedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java
index 641561bf286d..85d372e41ca8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.relatedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java
index 5f410f6e6901..0f69a166acc6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetomany.relatedid;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java
index 4a8b8262e427..217104ee8b56 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java
index 8db5e09c02fa..fdfa19842d9a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java
index 6cc080379c70..19a017209fc5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java
index a74b2eb30cf7..899c12668ca7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java
index 7ed4a4a7d4a1..d31a2bc20f99 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java
index e1d2052147b2..5856c76d669b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java
index b6166a6f2b4a..de3d4deba870 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java
index b1cd2c75cb8a..6ae59ee62046 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java
index d8adf4850358..a1a8d33aaf1e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
index 04358c0c5f23..bd0046a23088 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
index e6b36285d2c3..9b0814abd23f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
index e451b4a075fa..36c07242799d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
index 31bd0c343fd5..798258d32c21 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
index f15640876c3d..01264d4d4b10 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
index e22308a63ea6..285c21a7bbf4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
index 7df1777196be..315e11ca87cd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
@@ -28,7 +26,7 @@ public class Account implements Serializable {
 	@Column(name = "ACCOUNT_ID")
 	@GeneratedValue(generator = "AccountForeignKeyGenerator")
 	@GenericGenerator(name = "AccountForeignKeyGenerator", strategy = "foreign",
-					  parameters = {@Parameter(name = "property", value = "owner")})
+					parameters = {@Parameter(name = "property", value = "owner")})
 	private Long accountId;
 
 	private String type;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
index 2d9901fe7e5f..ada37247d71a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
index 0c01ee59063a..b314be774e71 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
@@ -27,7 +25,7 @@ public class NotAuditedNoProxyPerson implements Serializable {
 	@Column(name = "PERSON_ID")
 	@GeneratedValue(generator = "NotAuditedNoProxyKeyGenerator")
 	@GenericGenerator(name = "NotAuditedNoProxyKeyGenerator", strategy = "foreign",
-					  parameters = {@Parameter(name = "property", value = "account")})
+					parameters = {@Parameter(name = "property", value = "account")})
 	private Long personId;
 
 	private String name;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedPerson.java
index d1bb7727cc22..64593ade4150 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedPerson.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
@@ -28,7 +26,7 @@ public class NotAuditedPerson implements Serializable {
 	@Column(name = "PERSON_ID")
 	@GeneratedValue(generator = "NotAuditedProxyKeyGenerator")
 	@GenericGenerator(name = "NotAuditedProxyKeyGenerator", strategy = "foreign",
-					  parameters = {@Parameter(name = "property", value = "account")})
+					parameters = {@Parameter(name = "property", value = "account")})
 	private Long personId;
 
 	private String name;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
index 0672c51dba44..bcb797eb8899 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
index 1bd82959aa43..9bd61cc9375e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java
index aa470e44962d..bc574e04c55e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java
index 3ded2c3516c2..65b270eb36f4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
index 91894454c91f..b13a49b29ea0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java
index d9e71e39551c..6d7ab06fbb82 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
index 404f959cc6d1..406d1eb57a58 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
index 190687565010..aee2e5b6041e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.onetoone.unidirectional;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java
index 29dc1b7b616d..c3b8609eb081 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.primitive;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java
index 202e9a66e7de..fe4146f61f95 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.properties;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java
index 6bee805df55b..7e0fee3211ca 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.properties;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java
index a440be3f8910..df1ff7d7b114 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.properties;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java
index ad9fa5b2da71..36a12b6a237d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.properties;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java
index 5a575b9365ae..66e59b7d4294 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.proxy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java
index 89f264230176..e9cba0577c44 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.proxy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java
index 90c05b82fd47..c281e544ae05 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.proxy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java
index dbf87e0b278b..af61878962fb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.proxy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java
index 2cbc9729ce74..54b6c79881f5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java
index 1abfb56efbb0..d44904b7b135 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java
index 0c6515b1bf3c..0b924b39b33f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java
index c95e6ab779dc..7ede6497f32e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java
index b915b3d4ab28..59d0bfc483c0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
@@ -17,9 +15,9 @@
  */
 @JiraKey( value = "HHH-13817" )
 public class AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest extends AssociationRevisionsOfEntitiesQueryTest {
-    @Override
-    protected void addSettings(Map settings) {
-        super.addSettings( settings );
-        settings.put( EnversSettings.STORE_DATA_AT_DELETE, true );
-    }
+	@Override
+	protected void addSettings(Map settings) {
+		super.addSettings( settings );
+		settings.put( EnversSettings.STORE_DATA_AT_DELETE, true );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java
index 9864a5ad894f..7692d882b47c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
@@ -31,162 +29,162 @@
  */
 @JiraKey( "HHH-13817" )
 public class AssociationRevisionsOfEntitiesQueryTest extends BaseEnversFunctionalTestCase {
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Template.class, TemplateType.class };
-    }
-
-    @Test
-    @Priority(10)
-    public void initData() {
-        doInHibernate( this::sessionFactory, session -> {
-            final TemplateType type1 = new TemplateType( 1, "Type1" );
-            final TemplateType type2 = new TemplateType( 2, "Type2" );
-            session.persist( type1 );
-            session.persist( type2 );
-
-            final Template template = new Template( 1, "Template1", type1 );
-            session.persist( template );
-        } );
-
-        doInHibernate( this::sessionFactory, session -> {
-            final TemplateType type = session.find( TemplateType.class, 2 );
-            final Template template = session.find( Template.class, 1 );
-            template.setName( "Template1-Updated" );
-            template.setTemplateType( type );
-            session.merge( template );
-        } );
-
-        doInHibernate( this::sessionFactory, session -> {
-            final Template template = session.find( Template.class, 1 );
-            session.remove( template );
-        } );
-    }
-
-    @Test
-    public void testRevisionsOfEntityWithAssociationQueries() {
-        doInHibernate( this::sessionFactory, session -> {
-            List results = getAuditReader().createQuery()
-                    .forRevisionsOfEntity( Template.class, true, true )
-                    .add( AuditEntity.id().eq( 1 ) )
-                    .traverseRelation( "templateType", JoinType.INNER )
-                    .add( AuditEntity.property( "name" ).eq( "Type1" ) )
-                    .up()
-                    .getResultList();
-            assertEquals( 1, results.size() );
-            assertEquals( "Template1", ( (Template) results.get( 0 ) ).getName() );
-        } );
-
-        doInHibernate( this::sessionFactory, session -> {
-            List results = getAuditReader().createQuery()
-                    .forRevisionsOfEntity( Template.class, true, true )
-                    .add( AuditEntity.id().eq( 1 ) )
-                    .traverseRelation( "templateType", JoinType.INNER )
-                    .add( AuditEntity.property("name" ).eq("Type2" ) )
-                    .up()
-                    .getResultList();
-
-            assertEquals( getConfiguration().isStoreDataAtDelete() ? 2 : 1, results.size() );
-            for ( Object result : results ) {
-                assertEquals( "Template1-Updated", ( (Template) result ).getName() );
-            }
-        } );
-    }
-
-    @Test
-    public void testAssociationQueriesNotAllowedWhenNotSelectingJustEntities() {
-        try {
-            doInHibernate( this::sessionFactory, session -> {
-                getAuditReader().createQuery()
-                        .forRevisionsOfEntity( Template.class, false, true )
-                        .add( AuditEntity.id().eq( 1 ) )
-                        .traverseRelation("templateType", JoinType.INNER )
-                        .add( AuditEntity.property( "name" ).eq( "Type1" ) )
-                        .up()
-                        .getResultList();
-            } );
-
-            fail( "Test should have thrown IllegalStateException due to selectEntitiesOnly=false" );
-        }
-        catch ( Exception e ) {
-            assertTyping( IllegalStateException.class, e );
-        }
-    }    
-    
-    @Entity(name = "TemplateType")
-    @Audited
-    public static class TemplateType {
-        @Id
-        private Integer id;
-        private String name;
-
-        TemplateType() {
-            this( null, null );
-        }
-
-        TemplateType(Integer id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
-
-    @Entity(name = "Template")
-    @Audited
-    public static class Template {
-        @Id
-        private Integer id;
-        private String name;
-        @ManyToOne
-        private TemplateType templateType;
-
-        Template() {
-            this( null, null, null );
-        }
-
-        Template(Integer id, String name, TemplateType type) {
-            this.id = id;
-            this.name = name;
-            this.templateType = type;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public TemplateType getTemplateType() {
-            return templateType;
-        }
-
-        public void setTemplateType(TemplateType templateType) {
-            this.templateType = templateType;
-        }
-    }    
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Template.class, TemplateType.class };
+	}
+
+	@Test
+	@Priority(10)
+	public void initData() {
+		doInHibernate( this::sessionFactory, session -> {
+			final TemplateType type1 = new TemplateType( 1, "Type1" );
+			final TemplateType type2 = new TemplateType( 2, "Type2" );
+			session.persist( type1 );
+			session.persist( type2 );
+
+			final Template template = new Template( 1, "Template1", type1 );
+			session.persist( template );
+		} );
+
+		doInHibernate( this::sessionFactory, session -> {
+			final TemplateType type = session.find( TemplateType.class, 2 );
+			final Template template = session.find( Template.class, 1 );
+			template.setName( "Template1-Updated" );
+			template.setTemplateType( type );
+			session.merge( template );
+		} );
+
+		doInHibernate( this::sessionFactory, session -> {
+			final Template template = session.find( Template.class, 1 );
+			session.remove( template );
+		} );
+	}
+
+	@Test
+	public void testRevisionsOfEntityWithAssociationQueries() {
+		doInHibernate( this::sessionFactory, session -> {
+			List results = getAuditReader().createQuery()
+					.forRevisionsOfEntity( Template.class, true, true )
+					.add( AuditEntity.id().eq( 1 ) )
+					.traverseRelation( "templateType", JoinType.INNER )
+					.add( AuditEntity.property( "name" ).eq( "Type1" ) )
+					.up()
+					.getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( "Template1", ( (Template) results.get( 0 ) ).getName() );
+		} );
+
+		doInHibernate( this::sessionFactory, session -> {
+			List results = getAuditReader().createQuery()
+					.forRevisionsOfEntity( Template.class, true, true )
+					.add( AuditEntity.id().eq( 1 ) )
+					.traverseRelation( "templateType", JoinType.INNER )
+					.add( AuditEntity.property("name" ).eq("Type2" ) )
+					.up()
+					.getResultList();
+
+			assertEquals( getConfiguration().isStoreDataAtDelete() ? 2 : 1, results.size() );
+			for ( Object result : results ) {
+				assertEquals( "Template1-Updated", ( (Template) result ).getName() );
+			}
+		} );
+	}
+
+	@Test
+	public void testAssociationQueriesNotAllowedWhenNotSelectingJustEntities() {
+		try {
+			doInHibernate( this::sessionFactory, session -> {
+				getAuditReader().createQuery()
+						.forRevisionsOfEntity( Template.class, false, true )
+						.add( AuditEntity.id().eq( 1 ) )
+						.traverseRelation("templateType", JoinType.INNER )
+						.add( AuditEntity.property( "name" ).eq( "Type1" ) )
+						.up()
+						.getResultList();
+			} );
+
+			fail( "Test should have thrown IllegalStateException due to selectEntitiesOnly=false" );
+		}
+		catch ( Exception e ) {
+			assertTyping( IllegalStateException.class, e );
+		}
+	}
+
+	@Entity(name = "TemplateType")
+	@Audited
+	public static class TemplateType {
+		@Id
+		private Integer id;
+		private String name;
+
+		TemplateType() {
+			this( null, null );
+		}
+
+		TemplateType(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "Template")
+	@Audited
+	public static class Template {
+		@Id
+		private Integer id;
+		private String name;
+		@ManyToOne
+		private TemplateType templateType;
+
+		Template() {
+			this( null, null, null );
+		}
+
+		Template(Integer id, String name, TemplateType type) {
+			this.id = id;
+			this.name = name;
+			this.templateType = type;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public TemplateType getTemplateType() {
+			return templateType;
+		}
+
+		public void setTemplateType(TemplateType templateType) {
+			this.templateType = templateType;
+		}
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java
index 07ee3193c3bb..afc0768db015 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java
index 65a6825cc90f..4fa277607c65 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java
index 60f802e71a88..90a79ed471da 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
@@ -132,5 +130,5 @@ public void testEntitiesWithANullRelatedIdAreNotReturnedMoreThanOnce() {
 		assertEquals( "Expected car3 to be returned but only once", 1, resultList.size() );
 		assertEquals( "Unexpected car at index 0", car3.getId(), resultList.get(0).getId() );
 	}
-	
+
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java
index 0a9d0a5f4974..7b17320d57cd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
index 38fce2f98de1..1ee31a7c8222 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java
index 62c8245dbfaa..9860224a938e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java
index 464705e6758d..cc37683f4ee2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java
index ca4ee2a9001e..6b53edd8abe1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java
index efa7c30f9a88..e398c895c30f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java
index 2de2fbf399af..ff7b198a149d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java
index a41293a4ac18..5d0f1b90b63c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java
index 183f2667729c..ab8dc3911346 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java
index 983daaff0133..61602674dbbb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java
index d56b001151f6..330ba0bbefbb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java
index 9b0366fad612..b5a83c0d44eb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
@@ -29,50 +27,50 @@
 @JiraKey( value = "HHH-14981" )
 public class NullPrecedenceTest extends BaseEnversJPAFunctionalTestCase {
 
-    Integer id1;
-    Integer id2;
+	Integer id1;
+	Integer id2;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { StrIntTestEntity.class };
+	}
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { StrIntTestEntity.class };
-    }
+	@Test
+	@Priority(10)
+	public void initData() {
+		// Revision 1
+		id1 = TransactionUtil.doInJPA(this::entityManagerFactory, entityManager -> {
+			StrIntTestEntity entity1 = new StrIntTestEntity( null, 1 );
+			entityManager.persist( entity1 );
+			return entity1.getId();
+		} );
+		// Revision 2
+		id2 = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+			StrIntTestEntity entity2 = new StrIntTestEntity( "two", 2 );
+			entityManager.persist( entity2 );
+			return entity2.getId();
+		} );
+	}
 
-    @Test
-    @Priority(10)
-    public void initData() {
-        // Revision 1
-        id1 = TransactionUtil.doInJPA(this::entityManagerFactory, entityManager -> {
-            StrIntTestEntity entity1 = new StrIntTestEntity( null, 1 );
-            entityManager.persist( entity1 );
-            return entity1.getId();
-        } );
-        // Revision 2
-        id2 = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-            StrIntTestEntity entity2 = new StrIntTestEntity( "two", 2 );
-            entityManager.persist( entity2 );
-            return entity2.getId();
-        } );
-    }
+	@Test
+	public void testNullPrecedenceFirst() {
+		List results = getAuditReader().createQuery().forRevisionsOfEntity( StrIntTestEntity.class, true, false )
+				.addProjection( AuditEntity.property( "number" ) )
+				.addOrder( AuditEntity.property( "str1" ).asc().nulls( NullPrecedence.FIRST ) )
+				.getResultList();
+		List expected = new ArrayList<>();
+		expected.addAll( Arrays.asList( 1, 2 ) );
+		Assert.assertEquals( expected, results );
+	}
 
-    @Test
-    public void testNullPrecedenceFirst() {
-        List results = getAuditReader().createQuery().forRevisionsOfEntity( StrIntTestEntity.class, true, false )
-                .addProjection( AuditEntity.property( "number" ) )
-                .addOrder( AuditEntity.property( "str1" ).asc().nulls( NullPrecedence.FIRST ) )
-                .getResultList();
-        List expected = new ArrayList<>();
-        expected.addAll( Arrays.asList( 1, 2 ) );
-        Assert.assertEquals( expected, results );
-    }
-    
-    @Test
-    public void testNullPrecedenceLast() {
-        List results = getAuditReader().createQuery().forRevisionsOfEntity( StrIntTestEntity.class, true, false )
-                .addProjection( AuditEntity.property( "number" ) )
-                .addOrder( AuditEntity.property( "str1" ).asc().nulls( NullPrecedence.LAST ) )
-                .getResultList();
-        List expected = new ArrayList<>();
-        expected.addAll( Arrays.asList( 2, 1 ) );
-        Assert.assertEquals( expected, results );
-    }    
+	@Test
+	public void testNullPrecedenceLast() {
+		List results = getAuditReader().createQuery().forRevisionsOfEntity( StrIntTestEntity.class, true, false )
+				.addProjection( AuditEntity.property( "number" ) )
+				.addOrder( AuditEntity.property( "str1" ).asc().nulls( NullPrecedence.LAST ) )
+				.getResultList();
+		List expected = new ArrayList<>();
+		expected.addAll( Arrays.asList( 2, 1 ) );
+		Assert.assertEquals( expected, results );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java
index 151533c39dc3..35e243d96bca 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java
index 5f00b695317f..190600df8697 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java
index e46b92721462..a71c136af90e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
@@ -382,30 +380,30 @@ public void testBetweenInsideDisjunction() {
 			Assert.assertTrue( (number >= 0 && number <= 5) || (number >= 20 && number <= 100) );
 		}
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-8495")
 	public void testIlike() {
 		StrIntTestEntity site1 = new StrIntTestEntity( "aBc", 10, id1 );
-		
+
 		StrIntTestEntity result = (StrIntTestEntity) getAuditReader().createQuery()
 				.forRevisionsOfEntity( StrIntTestEntity.class, true, true )
 				.add( AuditEntity.property( "str1" ).ilike( "abc" ) )
 				.getSingleResult();
-		
+
 		Assert.assertEquals( site1, result );
 	}
-	
+
 	@Test
 	@JiraKey(value = "HHH-8495")
 	public void testIlikeWithMatchMode() {
 		StrIntTestEntity site1 = new StrIntTestEntity( "aBc", 10, id1 );
-		
+
 		StrIntTestEntity result = (StrIntTestEntity) getAuditReader().createQuery()
 				.forRevisionsOfEntity( StrIntTestEntity.class, true, true )
 				.add( AuditEntity.property( "str1" ).ilike( "BC", MatchMode.ANYWHERE ) )
 				.getSingleResult();
-		
+
 		Assert.assertEquals( site1, result );
 	}
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java
index ba8b6a47560d..941f49d8ae9b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java
index eb6773ef5e4e..c1aba8713432 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.embeddables;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java
index 7d67dfa4196d..498ef676a93f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.embeddables;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java
index c7227fbaa305..a368410d8fac 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.embeddables;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java
index 61de4fd62ed5..363472692f87 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java
index 0807ba43b7ca..8970c814c783 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java
index 7600b2e61993..d3e97d2af8af 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.entities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java
index 429bcd921cd2..98fea1dd7625 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java
index 7a8b48b378b3..136eac46e1dc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java
index b2c010811a0b..3f2287430ea2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reference;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java
index b4bae37279dc..8d1639e50237 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reference;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java
index 046e3a2ceb47..4c9b9d7d63dd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reference;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java
index ab35aeebf06d..f7cc51fc7660 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
index 81836bfbbe79..7ddcfa2c8ee0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
index 18ac2f1c88e3..b4c5006ed9d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java
index a164d683ee50..f6ce418c9b29 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class CustomBoxedRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
index 347bba5dea33..c4a87a2a86a7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
index 77be8a07f615..1aedcf9195ee 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
index 568f4219c562..f3e47990e7bb 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -28,88 +26,88 @@
  * @author Chris Cranford
  */
 public class CustomInstantRevEntityTest extends BaseEnversJPAFunctionalTestCase {
-    private Integer id;
-    private Instant instant1;
-    private Instant instant2;
-    private Instant instant3;
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {StrTestEntity.class, CustomInstantRevEntity.class};
-    }
-
-    @Test
-    @Priority(10)
-    public void initData() throws InterruptedException {
-        instant1 = getCurrentInstant();
-
-        // Revision 1
-        EntityManager em = getEntityManager();
-        em.getTransaction().begin();
-        StrTestEntity entity = new StrTestEntity( "x" );
-        em.persist( entity );
-        id = entity.getId();
-        em.getTransaction().commit();
-
-        instant2 = getCurrentInstant();
-
-        // Revision 2
-        em.getTransaction().begin();
-        entity = em.find( StrTestEntity.class, id );
-        entity.setStr( "y" );
-        em.getTransaction().commit();
-
-        instant3 = getCurrentInstant();
-    }
-
-    @Test(expected = RevisionDoesNotExistException.class)
-    public void testInstant1() {
-        getAuditReader().getRevisionNumberForDate( new Date( instant1.toEpochMilli() ) );
-    }
-
-    @Test
-    @SkipForDialect(value = CockroachDialect.class, comment = "Fails because of int size")
-    public void testInstants() {
-        assertThat( getAuditReader().getRevisionNumberForDate( new Date( instant2.toEpochMilli() ) ).intValue() ).isEqualTo( 1 );
-        assertThat( getAuditReader().getRevisionNumberForDate( new Date( instant3.toEpochMilli() ) ).intValue() ).isEqualTo( 2 );
-
-        assertThat( getAuditReader().getRevisionNumberForDate( instant2 ).intValue() ).isEqualTo( 1 );
-        assertThat( getAuditReader().getRevisionNumberForDate( instant3 ).intValue() ).isEqualTo( 2 );
-    }
-
-    @Test
-    public void testInstantsForRevisions() {
-        final AuditReader reader = getAuditReader();
-        assertThat( reader.getRevisionNumberForDate( reader.getRevisionDate( 1 ) ).intValue() ).isEqualTo( 1 );
-        assertThat( reader.getRevisionNumberForDate( reader.getRevisionDate( 2 ) ).intValue() ).isEqualTo( 2 );
-    }
-
-    @Test
-    public void testRevisionsForInstants() {
-        final Instant revInstant1 = getAuditReader().findRevision( CustomInstantRevEntity.class, 1 ).getInstantTimestamp();
-        assertThat( revInstant1.toEpochMilli() ).isGreaterThan( instant1.toEpochMilli() );
-        assertThat( revInstant1.toEpochMilli() ).isLessThanOrEqualTo( instant2.toEpochMilli() );
-
-        final Instant revInstant2 = getAuditReader().findRevision( CustomInstantRevEntity.class, 2 ).getInstantTimestamp();
-        assertThat( revInstant2.toEpochMilli() ).isGreaterThan( instant2.toEpochMilli() );
-        assertThat( revInstant2.toEpochMilli() ).isLessThanOrEqualTo( instant3.toEpochMilli() );
-    }
-
-    @Test
-    public void testRevisionsCounts() {
-        assertThat( getAuditReader().getRevisions( StrTestEntity.class, id ) ).isEqualTo( Arrays.asList( 1, 2 ) );
-    }
-
-    @Test
-    public void testHistoryOfId1() {
-        assertThat( getAuditReader().find( StrTestEntity.class, id, 1 ) ).isEqualTo( new StrTestEntity( "x", id ) );
-        assertThat( getAuditReader().find( StrTestEntity.class, id, 2 ) ).isEqualTo( new StrTestEntity( "y", id ) );
-    }
-
-    private Instant getCurrentInstant() throws InterruptedException {
-        Instant now = Instant.now();
-        // Some databases default to second-based precision, sleep
-        Thread.sleep( 1100 );
-        return now;
-    }
+	private Integer id;
+	private Instant instant1;
+	private Instant instant2;
+	private Instant instant3;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {StrTestEntity.class, CustomInstantRevEntity.class};
+	}
+
+	@Test
+	@Priority(10)
+	public void initData() throws InterruptedException {
+		instant1 = getCurrentInstant();
+
+		// Revision 1
+		EntityManager em = getEntityManager();
+		em.getTransaction().begin();
+		StrTestEntity entity = new StrTestEntity( "x" );
+		em.persist( entity );
+		id = entity.getId();
+		em.getTransaction().commit();
+
+		instant2 = getCurrentInstant();
+
+		// Revision 2
+		em.getTransaction().begin();
+		entity = em.find( StrTestEntity.class, id );
+		entity.setStr( "y" );
+		em.getTransaction().commit();
+
+		instant3 = getCurrentInstant();
+	}
+
+	@Test(expected = RevisionDoesNotExistException.class)
+	public void testInstant1() {
+		getAuditReader().getRevisionNumberForDate( new Date( instant1.toEpochMilli() ) );
+	}
+
+	@Test
+	@SkipForDialect(value = CockroachDialect.class, comment = "Fails because of int size")
+	public void testInstants() {
+		assertThat( getAuditReader().getRevisionNumberForDate( new Date( instant2.toEpochMilli() ) ).intValue() ).isEqualTo( 1 );
+		assertThat( getAuditReader().getRevisionNumberForDate( new Date( instant3.toEpochMilli() ) ).intValue() ).isEqualTo( 2 );
+
+		assertThat( getAuditReader().getRevisionNumberForDate( instant2 ).intValue() ).isEqualTo( 1 );
+		assertThat( getAuditReader().getRevisionNumberForDate( instant3 ).intValue() ).isEqualTo( 2 );
+	}
+
+	@Test
+	public void testInstantsForRevisions() {
+		final AuditReader reader = getAuditReader();
+		assertThat( reader.getRevisionNumberForDate( reader.getRevisionDate( 1 ) ).intValue() ).isEqualTo( 1 );
+		assertThat( reader.getRevisionNumberForDate( reader.getRevisionDate( 2 ) ).intValue() ).isEqualTo( 2 );
+	}
+
+	@Test
+	public void testRevisionsForInstants() {
+		final Instant revInstant1 = getAuditReader().findRevision( CustomInstantRevEntity.class, 1 ).getInstantTimestamp();
+		assertThat( revInstant1.toEpochMilli() ).isGreaterThan( instant1.toEpochMilli() );
+		assertThat( revInstant1.toEpochMilli() ).isLessThanOrEqualTo( instant2.toEpochMilli() );
+
+		final Instant revInstant2 = getAuditReader().findRevision( CustomInstantRevEntity.class, 2 ).getInstantTimestamp();
+		assertThat( revInstant2.toEpochMilli() ).isGreaterThan( instant2.toEpochMilli() );
+		assertThat( revInstant2.toEpochMilli() ).isLessThanOrEqualTo( instant3.toEpochMilli() );
+	}
+
+	@Test
+	public void testRevisionsCounts() {
+		assertThat( getAuditReader().getRevisions( StrTestEntity.class, id ) ).isEqualTo( Arrays.asList( 1, 2 ) );
+	}
+
+	@Test
+	public void testHistoryOfId1() {
+		assertThat( getAuditReader().find( StrTestEntity.class, id, 1 ) ).isEqualTo( new StrTestEntity( "x", id ) );
+		assertThat( getAuditReader().find( StrTestEntity.class, id, 2 ) ).isEqualTo( new StrTestEntity( "y", id ) );
+	}
+
+	private Instant getCurrentInstant() throws InterruptedException {
+		Instant now = Instant.now();
+		// Some databases default to second-based precision, sleep
+		Thread.sleep( 1100 );
+		return now;
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
index 01a33e815d81..d25dddc68c6b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
index f72c16004f90..736f40ebca01 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java
index 4f3fcb478a91..812c0b2cbb47 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java
index 4c0a6a486efc..5d966d0441af 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java
index c68c8dfe23e4..539c72a4fd72 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity(TestExceptionRevisionListener.class)
 public class ExceptionListenerRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java
index 090f32919cf3..6390dc301967 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java
index ceb9b5bbc3a9..3a6ef8957a65 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java
index 42d50c2428df..26f2319650bc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
index 520bebf6753b..47756fdb0414 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java
index 9355999845bb..2acb196d07d2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -21,13 +19,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity(TestRevisionListener.class)
 public class ListenerRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
index 02ed94dae005..0d85a3c07497 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -33,61 +31,61 @@
  */
 @JiraKey( value = "HHH-10496" )
 public class LocalDateTimeTest extends BaseEnversJPAFunctionalTestCase {
-    private Instant timestampStart;
-    private Instant timestampEnd;
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                StrTestEntity.class,
-                CustomLocalDateTimeRevEntity.class
-        };
-    }
-
-    @Test
-    @Priority(10)
-    public void initData() {
-        EntityManager em = getEntityManager();
-        try {
-            timestampStart = Instant.now();
-
-            // some DBMs truncate time to seconds.
-            Thread.sleep( 1100 );
-
-            StrTestEntity entity = new StrTestEntity( "x" );
-
-            // Revision 1
-            em.getTransaction().begin();
-            em.persist( entity );
-            em.getTransaction().commit();
-
-            timestampEnd = Instant.now().plus( 1L, ChronoUnit.SECONDS );
-        }
-        catch( InterruptedException x ) {
-            fail( "Unexpected interrupted exception" );
-        }
-        finally {
-            em.close();
-        }
-    }
-
-    @Test
-    public void testTimestampsUsingDate() {
-        // expect just one revision prior to this timestamp.
-        assertEquals( 1, getAuditReader().getRevisionNumberForDate( Date.from( timestampEnd ) ) );
-    }
-
-    @Test
-    public void testRevisionEntityLocalDateTime() {
-        // get revision
-        CustomLocalDateTimeRevEntity revInfo = getAuditReader().findRevision( CustomLocalDateTimeRevEntity.class, 1 );
-        assertNotNull( revInfo );
-        // verify started before revision timestamp
-        final LocalDateTime started = LocalDateTime.ofInstant( timestampStart, ZoneId.systemDefault() );
-        assertTrue( started.isBefore( revInfo.getLocalDateTimestamp() ) );
-        // verify ended after revision timestamp
-        final LocalDateTime ended = LocalDateTime.ofInstant( timestampEnd, ZoneId.systemDefault() );
-        assertTrue( ended.isAfter( revInfo.getLocalDateTimestamp() ) );
-    }
+	private Instant timestampStart;
+	private Instant timestampEnd;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				StrTestEntity.class,
+				CustomLocalDateTimeRevEntity.class
+		};
+	}
+
+	@Test
+	@Priority(10)
+	public void initData() {
+		EntityManager em = getEntityManager();
+		try {
+			timestampStart = Instant.now();
+
+			// some DBMs truncate time to seconds.
+			Thread.sleep( 1100 );
+
+			StrTestEntity entity = new StrTestEntity( "x" );
+
+			// Revision 1
+			em.getTransaction().begin();
+			em.persist( entity );
+			em.getTransaction().commit();
+
+			timestampEnd = Instant.now().plus( 1L, ChronoUnit.SECONDS );
+		}
+		catch( InterruptedException x ) {
+			fail( "Unexpected interrupted exception" );
+		}
+		finally {
+			em.close();
+		}
+	}
+
+	@Test
+	public void testTimestampsUsingDate() {
+		// expect just one revision prior to this timestamp.
+		assertEquals( 1, getAuditReader().getRevisionNumberForDate( Date.from( timestampEnd ) ) );
+	}
+
+	@Test
+	public void testRevisionEntityLocalDateTime() {
+		// get revision
+		CustomLocalDateTimeRevEntity revInfo = getAuditReader().findRevision( CustomLocalDateTimeRevEntity.class, 1 );
+		assertNotNull( revInfo );
+		// verify started before revision timestamp
+		final LocalDateTime started = LocalDateTime.ofInstant( timestampStart, ZoneId.systemDefault() );
+		assertTrue( started.isBefore( revInfo.getLocalDateTimestamp() ) );
+		// verify ended after revision timestamp
+		final LocalDateTime ended = LocalDateTime.ofInstant( timestampEnd, ZoneId.systemDefault() );
+		assertTrue( ended.isAfter( revInfo.getLocalDateTimestamp() ) );
+	}
 
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
index 0d1ed610fc1c..3fa8590f84ed 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java
index 8d9523e9267d..7db288f54272 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -22,13 +20,13 @@
  */
 @Entity
 @GenericGenerator(name = "EnversTestingRevisionGenerator",
-				  strategy = "org.hibernate.id.enhanced.TableGenerator",
-				  parameters = {
-						  @Parameter(name = "table_name", value = "REVISION_GENERATOR"),
-						  @Parameter(name = "initial_value", value = "1"),
-						  @Parameter(name = "increment_size", value = "1"),
-						  @Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
-				  }
+				strategy = "org.hibernate.id.enhanced.TableGenerator",
+				parameters = {
+						@Parameter(name = "table_name", value = "REVISION_GENERATOR"),
+						@Parameter(name = "initial_value", value = "1"),
+						@Parameter(name = "increment_size", value = "1"),
+						@Parameter(name = "prefer_entity_table_as_segment_value", value = "true")
+				}
 )
 @RevisionEntity
 public class LongRevNumberRevEntity {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java
index 4523b85aa578..2d64c0761cce 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -40,7 +38,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Test
 	public void testOracleSequenceOrder() {
-        EntityPersister persister = sessionFactory().getMappingMetamodel().getEntityDescriptor(SequenceIdRevisionEntity.class.getName());
+		EntityPersister persister = sessionFactory().getMappingMetamodel().getEntityDescriptor(SequenceIdRevisionEntity.class.getName());
 		IdentifierGenerator generator = persister.getIdentifierGenerator();
 		Assert.assertTrue( OrderedSequenceGenerator.class.isInstance( generator ) );
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java
index 3cb777333cf9..49cd5924f2ee 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java
index 267ad539c30a..4e1288305e6b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -19,4 +17,4 @@ public class OverrideDefaultRevListenerTest extends GloballyConfiguredRevListene
 	protected Class[] getAnnotatedClasses() {
 		return ArrayHelper.join( super.getAnnotatedClasses(), LongRevNumberRevEntity.class );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
index 1c8be0048068..28f8149469fc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java
index 18c1771f03dd..4d0918f124fd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
@@ -15,4 +13,4 @@ public class TestExceptionRevisionListener implements RevisionListener {
 	public void newRevision(Object revisionEntity) {
 		throw new RuntimeException( "forcing transaction failure!" );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java
index 91f31f361bb4..a1f2de582249 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java
index 1f90db4388d8..07c4d1f89dd4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.removal;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java
index f2b648d136de..8bf9949ba394 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.removal;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java
index 45a4e3072cac..53114eca1cba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.removal;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
index ad2b5d8ca7e8..b584cd28410a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
index f10ee4cdf18b..14bfe1b7bcd7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
index bc106326ef46..a21491aac5ae 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java
index e9fe03f88943..64065d25bf78 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
@@ -84,4 +82,4 @@ public void testModifiedEntityTypes() {
 		)
 				.equals( getAuditReader().getCrossTypeRevisionChangesReader().findEntityTypes( 2 ) );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
index 1c70c4b5a0d8..c5bef32946c4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
index 238cad129d28..4148ffdc3be7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java
index 1dfa239985bf..7a3920137877 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.revfordate;
 
@@ -76,7 +74,7 @@ public void initData() throws InterruptedException {
 	public void testTimestamps1() {
 		getAuditReader().getRevisionNumberForDate( new Date( timestamp1 ) );
 	}
-	
+
 	@Test(expected = RevisionDoesNotExistException.class)
 	public void testTimestampslWithFind() {
 		getAuditReader().find( StrTestEntity.class, id, new Date( timestamp1 ) );
@@ -89,7 +87,7 @@ public void testTimestamps() {
 		assert getAuditReader().getRevisionNumberForDate( new Date( timestamp3 ) ).intValue() == 2;
 		assert getAuditReader().getRevisionNumberForDate( new Date( timestamp4 ) ).intValue() == 3;
 	}
-	
+
 	@Test
 	@SkipForDialect(value = CockroachDialect.class, comment = "Fails because of int size")
 	public void testEntitiesForTimestamps() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java
index 0c12491cd003..c6c6d2d8fbba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.sameids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java
index 6a8f0d981dde..c11a3dcaad7b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.sameids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java
index 83368ba73544..3effe423029b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.sameids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java
index 2950f7155a63..e9986d4dd889 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java
@@ -1,18 +1,14 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import jakarta.persistence.EntityManager;
 
 import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
 import org.hibernate.orm.test.envers.Priority;
-import org.hibernate.mapping.Join;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java
index fceafb5d8474..07d101341cc9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java
index 0c5bf0042799..e03f83121cf5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java
index 27e13c0ccf0e..9aa7e7c074f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java
index 10cc1ec02a1b..c2c7d28442f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary.ids;
 
@@ -70,9 +68,9 @@ public void testHistoryOfId() {
 	@Test
 	public void testTableNames() {
 		Assert.assertEquals( "sec_embid_versions",
-				 metadata().getEntityBinding(
-			 "org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryEmbIdTestEntity_AUD"
-				 ).getJoins().get( 0 ).getTable().getName()
+				metadata().getEntityBinding(
+			"org.hibernate.orm.test.envers.integration.secondary.ids.SecondaryEmbIdTestEntity_AUD"
+				).getJoins().get( 0 ).getTable().getName()
 		);
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java
index c5935075ee6f..baf459f001d9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java
index 53054162d403..717519daa9fa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java
index beebc7f65275..1c48f0bc5ee1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.secondary.ids;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java
index c1edecf8a2fa..a00de4dd0dfd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.serialization;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AbstractRevisionEndTimestampTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AbstractRevisionEndTimestampTest.java
index 35009013f87c..cdf688c577fd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AbstractRevisionEndTimestampTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AbstractRevisionEndTimestampTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
@@ -24,22 +22,22 @@
  */
 public abstract class AbstractRevisionEndTimestampTest extends BaseEnversJPAFunctionalTestCase {
 
-    private static final String TIMESTAMP_FIELD = "REVEND_TSTMP";
+	private static final String TIMESTAMP_FIELD = "REVEND_TSTMP";
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void addConfigOptions(Map options) {
-        options.put( EnversSettings.AUDIT_TABLE_SUFFIX, "_AUD" );
-        options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME, TIMESTAMP_FIELD );
-        options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true" );
+	@Override
+	@SuppressWarnings("unchecked")
+	public void addConfigOptions(Map options) {
+		options.put( EnversSettings.AUDIT_TABLE_SUFFIX, "_AUD" );
+		options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME, TIMESTAMP_FIELD );
+		options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true" );
 		options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_LEGACY_PLACEMENT, "false" );
-    }
-    
+	}
+
 	@SuppressWarnings("unchecked")
 	protected List> getRevisions(Class clazz, Integer id) {
 		String sql = String.format( "SELECT e FROM %s_AUD e WHERE e.originalId.id = :id", clazz.getName() );
 		return getEntityManager().createQuery( sql ).setParameter( "id", id ).getResultList();
-	}    
+	}
 
 	protected void verifyRevisionEndTimestampsInSubclass(Class clazz, Integer id) {
 		final List> entities = getRevisions( clazz, id );
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java
index 6999966ee117..b9022c16bc8c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
@@ -33,7 +31,7 @@
  */
 @JiraKey( value = "HHH-12077" )
 public class AuditStraegySelectorTest {
-    
+
 	@Test
 	public void testAuditStrategySelectorNoneSpecified() {
 		testAuditStrategySelector( null, DefaultAuditStrategy.class );
@@ -41,30 +39,30 @@ public void testAuditStrategySelectorNoneSpecified() {
 
 	@Test
 	public void testAuditStrategySelectorDefaultSpecified() {
-        // test old implementations
+		// test old implementations
 		testAuditStrategySelector( "default", DefaultAuditStrategy.class );
 		testAuditStrategySelector( DefaultAuditStrategy.class.getSimpleName(), DefaultAuditStrategy.class );
 		testAuditStrategySelector( DefaultAuditStrategy.class.getName(), DefaultAuditStrategy.class );
 
-        // test new implementation
-        testAuditStrategySelector(
-                org.hibernate.envers.strategy.internal.DefaultAuditStrategy.class.getName(),
-                org.hibernate.envers.strategy.internal.DefaultAuditStrategy.class
-        );
+		// test new implementation
+		testAuditStrategySelector(
+				org.hibernate.envers.strategy.internal.DefaultAuditStrategy.class.getName(),
+				org.hibernate.envers.strategy.internal.DefaultAuditStrategy.class
+		);
 	}
 
 	@Test
 	public void testAuditStrategySelectorValiditySpecified() {
-        // test old implementations
+		// test old implementations
 		testAuditStrategySelector( "validity", ValidityAuditStrategy.class );
 		testAuditStrategySelector( ValidityAuditStrategy.class.getSimpleName(), ValidityAuditStrategy.class );
 		testAuditStrategySelector( ValidityAuditStrategy.class.getName(), ValidityAuditStrategy.class );
 
-        // test new implementation
-        testAuditStrategySelector(
-                org.hibernate.envers.strategy.internal.ValidityAuditStrategy.class.getName(),
-                org.hibernate.envers.strategy.internal.ValidityAuditStrategy.class
-        );
+		// test new implementation
+		testAuditStrategySelector(
+				org.hibernate.envers.strategy.internal.ValidityAuditStrategy.class.getName(),
+				org.hibernate.envers.strategy.internal.ValidityAuditStrategy.class
+		);
 	}
 
 	private void testAuditStrategySelector(String propertyValue, Class expectedStrategyClass) {
@@ -76,11 +74,11 @@ private void testAuditStrategySelector(String propertyValue, Class.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java
index da84ecb55da6..5591ce392048 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
@@ -40,7 +38,7 @@ protected Class[] getAnnotatedClasses() {
 		return new Class[] { StrTestEntity.class };
 	}
 
-    @Override
+	@Override
 	protected void addConfigOptions(Map options) {
 		super.addConfigOptions( options );
 		options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true" );
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java
index 285707a86d3a..5835eff54a1f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
@@ -278,5 +276,5 @@ public boolean equals(Object object) {
 			Executive that = (Executive) object;
 			return !( title != null ? !title.equals( that.title ) : that.title != null );
 		}
-	}    
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
index 95e3b67ef8b0..1bb23e692cae 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
@@ -35,23 +33,23 @@
 @RequiresAuditStrategy( value = ValidityAuditStrategy.class, jiraKey = "HHH-6210" )
 public class RevisionEndTimestampTypeTest extends BaseEnversJPAFunctionalTestCase {
 
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { StrTestEntity.class };
-    }
-
-    @Override
-    protected void addConfigOptions(Map options) {
-        options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true" );
-    }
-
-    @Test
-    public void testRevisionEndTimestampIsLongType() {
-        // get the entity and verify the revision end timestamp property exists
-        final PersistentClass clazz = metadata().getEntityBinding( StrTestEntity.class.getName() + "_AUD" );
-
-        final Property property = clazz.getProperty( "REVEND_TSTMP" );
-        assertTyping( BasicType.class, property.getType() );
-        assertEquals( Timestamp.class, ( (BasicType) property.getType() ).getJavaType() );
-    }
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { StrTestEntity.class };
+	}
+
+	@Override
+	protected void addConfigOptions(Map options) {
+		options.put( EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true" );
+	}
+
+	@Test
+	public void testRevisionEndTimestampIsLongType() {
+		// get the entity and verify the revision end timestamp property exists
+		final PersistentClass clazz = metadata().getEntityBinding( StrTestEntity.class.getName() + "_AUD" );
+
+		final Property property = clazz.getProperty( "REVEND_TSTMP" );
+		assertTyping( BasicType.class, property.getType() );
+		assertEquals( Timestamp.class, ( (BasicType) property.getType() ).getJavaType() );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java
index 1f703ec10bbe..d11f8590138a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java
index cd42a4cfbab9..a295fbee4d4c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyPartialFlushCountTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyPartialFlushCountTest.java
index 5351f4e7564a..38c8e43ebfc2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyPartialFlushCountTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyPartialFlushCountTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.envers.integration.strategy;
 
 import jakarta.persistence.EntityManager;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
index bdbed5e2a48a..44fac39926cf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
index 060d52a02f2f..5f1aa8c0223f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
index f93810662f94..c4b30a9104e5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
index aed69775b822..411afd3c9022 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
index 9b5492b1c45b..85eb4f184767 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
index bd3349321f9d..2f25001e7917 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
index c7a81851408a..fbf455044e2e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
index 20e5feb11f75..660f6b0d355c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
index 42ed3df73dce..c224d28062b6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
index 02c04db9baa7..097b9f6d3d2c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
index bfdad336c542..629ecb3df36c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
index 232b75529eef..917c48710146 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
index 9c5325800e51..781759e229c6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
index 09ae99e3e4e7..5b979fc2212f 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java
index a02ea48c0ae1..5e5a2ddbb1fa 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java
index a1c4d332f921..2fbbef4ac704 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
index 8a834869f003..d550e04c8906 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java
index 4a686f74b447..5293d5fa9c21 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java
index 6c510c76a0ec..2784969dc09b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java
index e4251a3691bf..c48fc084c9bd 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
index acdd6ab12c82..be6960ac6ff7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
index 61f1dd62d570..dc90a2daf853 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java
index 5414e1635c11..722820d71bda 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
@@ -35,431 +33,431 @@
  * @author Chris Cranford
  */
 public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase {
-    private Integer simpleId;
-    private Integer simpleOverrideId;
-    private Integer simplePropertyId;
-    private Integer fullOverrideId;
-    private Integer notAuditedId;
-    private Integer overridedId;
-    private Integer auditedId;
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-                AuditedEmbeddable.class,
-                AuditedEmbeddableOverrideEntity.class,
-                FullOverrideEmbeddable.class,
-                FullOverrideEmbeddableEntity.class,
-                NotAuditedEmbeddableEntity.class,
-                OverrideEmbeddable.class,
-                OverrideEmbeddableEntity.class,
-                SimpleAbstractMappedSuperclass.class,
-                SimpleEmbeddable.class,
-                SimpleEmbeddableEntity.class,
-                SimpleEmbeddableWithOverrideEntity.class,
-                SimpleEmbeddableWithPropertyOverrideEntity.class
-        };
-    }
-
-    @Test
-    @Priority( 10 )
-    public void initData() {
-        EntityManager entityManager = getEntityManager();
-        try {
-
-            // entity 1
-            SimpleEmbeddableEntity simple = new SimpleEmbeddableEntity();
-            simple.setEmbeddable( new SimpleEmbeddable() );
-            simple.getEmbeddable().setStrValue( "strValueSimple" );
-            simple.getEmbeddable().setIntValue( 5 );
-
-            // entity 2
-            SimpleEmbeddableWithOverrideEntity simpleOverride = new SimpleEmbeddableWithOverrideEntity();
-            simpleOverride.setEmbeddable( new SimpleEmbeddable() );
-            simpleOverride.getEmbeddable().setStrValue( "strValueSimpleOverride" );
-            simpleOverride.getEmbeddable().setIntValue( 10 );
-
-            // entity 3
-            SimpleEmbeddableWithPropertyOverrideEntity simpleProperty = new SimpleEmbeddableWithPropertyOverrideEntity();
-            simpleProperty.setEmbeddable( new SimpleEmbeddable() );
-            simpleProperty.getEmbeddable().setStrValue( "strValueSimpleMapped" );
-            simpleProperty.getEmbeddable().setIntValue( 15 );
-
-            // entity 4
-            FullOverrideEmbeddableEntity fullOverride = new FullOverrideEmbeddableEntity();
-            fullOverride.setEmbeddable( new FullOverrideEmbeddable() );
-            fullOverride.getEmbeddable().setStrValue( "strValueFull" );
-            fullOverride.getEmbeddable().setIntValue( 20 );
-
-            // entity 5
-            NotAuditedEmbeddableEntity notAudited = new NotAuditedEmbeddableEntity();
-            notAudited.setEmbeddable( new FullOverrideEmbeddable() );
-            notAudited.getEmbeddable().setStrValue( "strValueNotAudited" );
-            notAudited.getEmbeddable().setIntValue( 25 );
-
-            // entity 6
-            OverrideEmbeddableEntity overrided = new OverrideEmbeddableEntity();
-            overrided.setEmbeddable( new OverrideEmbeddable() );
-            overrided.getEmbeddable().setStrValue( "strValueOver" );
-            overrided.getEmbeddable().setIntValue( 30 );
-
-            // entity 7
-            AuditedEmbeddableOverrideEntity audited = new AuditedEmbeddableOverrideEntity();
-            audited.setEmbeddable( new AuditedEmbeddable() );
-            audited.getEmbeddable().setStrValue( "strValueAudited" );
-            audited.getEmbeddable().setIntValue( 35 );
-            audited.getEmbeddable().setValue( 1024 );
-
-            entityManager.getTransaction().begin();
-            entityManager.persist( simple );
-            entityManager.persist( simpleOverride );
-            entityManager.persist( simpleProperty );
-            entityManager.persist( fullOverride );
-            entityManager.persist( notAudited );
-            entityManager.persist( overrided );
-            entityManager.persist( audited );
-            entityManager.getTransaction().commit();
-
-            this.simpleId = simple.getId();
-            this.simpleOverrideId = simpleOverride.getId();
-            this.simplePropertyId = simpleProperty.getId();
-            this.fullOverrideId = fullOverride.getId();
-            this.notAuditedId = notAudited.getId();
-            this.overridedId = overrided.getId();
-            this.auditedId = audited.getId();
-        }
-        finally {
-            entityManager.close();
-        }
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9228" )
-    public void testAuditOverrideOnAuditedEmbeddable() {
-        final PersistentClass clazz = getPersistentClass( AuditedEmbeddableOverrideEntity.class, auditedId, 1 );
-        assertTrue( clazz.hasProperty( "name" ) );
-        // verify non-audited fields are excluded from mappings.
-        assertFalse( clazz.hasProperty( "embeddable_value" ) );
-        assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
-        assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableWithFullAudit() {
-        final PersistentClass clazz = getPersistentClass( FullOverrideEmbeddableEntity.class, fullOverrideId, 1 );
-        assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
-        assertTrue( clazz.hasProperty( "embeddable_strValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableWithNoAudited() {
-        final PersistentClass clazz = getPersistentClass( NotAuditedEmbeddableEntity.class, notAuditedId, 1 );
-        // not mapped because @NotAudited should override any other behavior.
-        assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
-        assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableWithAuditOverride() {
-        final PersistentClass clazz = getPersistentClass( OverrideEmbeddableEntity.class, overridedId, 1 );
-        assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
-        assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableNoAuditOverrides() {
-        final PersistentClass clazz = getPersistentClass( SimpleEmbeddableEntity.class, simpleId, 1 );
-        assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
-        assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableWithAuditOverrideForMappedSuperclass() {
-        final PersistentClass clazz = getPersistentClass(
-                SimpleEmbeddableWithOverrideEntity.class,
-                simpleOverrideId,
-                1
-        );
-        assertTrue( clazz.hasProperty( "embeddable_strValue" ) );
-        assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
-    }
-
-    @Test
-    @JiraKey( value = "HHH-9229" )
-    public void testEmptyEmbeddableWithPropertyAuditOverride() {
-        final PersistentClass clazz = getPersistentClass(
-                SimpleEmbeddableWithPropertyOverrideEntity.class,
-                simplePropertyId,
-                1
-        );
-        assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
-        assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
-    }
-
-    // represents a @MappedSuperclass with no overrides
-    @MappedSuperclass
-    public static abstract class SimpleAbstractMappedSuperclass {
-        private String strValue;
-        private Integer intValue;
-
-        public Integer getIntValue() {
-            return intValue;
-        }
-
-        public void setIntValue(Integer intValue) {
-            this.intValue = intValue;
-        }
-
-        public String getStrValue() {
-            return strValue;
-        }
-
-        public void setStrValue(String strValue) {
-            this.strValue = strValue;
-        }
-    }
-
-    // an embeddable that should introduce no audited properties
-    @Embeddable
-    public static class SimpleEmbeddable extends SimpleAbstractMappedSuperclass {
-
-    }
-
-    // an embeddable that should introduce 'intValue' as audited based on audit overrides locally
-    @Embeddable
-    @AuditOverride(forClass = SimpleAbstractMappedSuperclass.class, name = "intValue")
-    public static class OverrideEmbeddable extends SimpleAbstractMappedSuperclass {
-
-    }
-
-    // an embedddable that introduces all audited values base don audit overrides locally.
-    @Embeddable
-    @AuditOverride(forClass = SimpleAbstractMappedSuperclass.class)
-    public static class FullOverrideEmbeddable extends SimpleAbstractMappedSuperclass {
-
-    }
-
-    @Embeddable
-    @Audited
-    public static class AuditedEmbeddable extends SimpleAbstractMappedSuperclass {
-        @Column(name = "val")
-        private Integer value;
-
-        public Integer getValue() {
-            return value;
-        }
-
-        public void setValue(Integer value) {
-            this.value = value;
-        }
-    }
-
-    @Entity(name = "aeoe")
-    @Audited
-    public static class AuditedEmbeddableOverrideEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        private String name;
-        @Embedded
-        @AuditOverrides({
-                @AuditOverride(name = "value", isAudited = false),
-                @AuditOverride(forClass = SimpleAbstractMappedSuperclass.class, isAudited = false)
-        })
-        private AuditedEmbeddable embeddable;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public AuditedEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(AuditedEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "naee")
-    @Audited
-    public static class NotAuditedEmbeddableEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        @NotAudited
-        private FullOverrideEmbeddable embeddable;
-
-        public FullOverrideEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(FullOverrideEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "foee")
-    @Audited
-    public static class FullOverrideEmbeddableEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        private FullOverrideEmbeddable embeddable;
-
-        public FullOverrideEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(FullOverrideEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "oee")
-    @Audited
-    public static class OverrideEmbeddableEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        private OverrideEmbeddable embeddable;
-
-        public OverrideEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(OverrideEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "sewpoe")
-    @Audited
-    public static class SimpleEmbeddableWithPropertyOverrideEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        @AuditOverride(name = "intValue", forClass = SimpleAbstractMappedSuperclass.class)
-        private SimpleEmbeddable embeddable;
-
-        public SimpleEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(SimpleEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    @Entity(name = "see")
-    @Audited
-    public static class SimpleEmbeddableEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        private SimpleEmbeddable embeddable;
-
-        public SimpleEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(SimpleEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-
-    @Entity(name = "sewoe")
-    @Audited
-    public static class SimpleEmbeddableWithOverrideEntity {
-        @Id
-        @GeneratedValue
-        private Integer id;
-        @Embedded
-        @AuditOverride(forClass = SimpleAbstractMappedSuperclass.class)
-        private SimpleEmbeddable embeddable;
-
-        public SimpleEmbeddable getEmbeddable() {
-            return embeddable;
-        }
-
-        public void setEmbeddable(SimpleEmbeddable embeddable) {
-            this.embeddable = embeddable;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-    }
-
-    private PersistentClass getPersistentClass(Class clazz, Object id, Number revision) {
-        final Object entity = getAuditReader().find( clazz, id, revision );
-        return metadata().getEntityBinding( getAuditReader().getEntityName( id, revision, entity ) + "_AUD" );
-    }
+	private Integer simpleId;
+	private Integer simpleOverrideId;
+	private Integer simplePropertyId;
+	private Integer fullOverrideId;
+	private Integer notAuditedId;
+	private Integer overridedId;
+	private Integer auditedId;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				AuditedEmbeddable.class,
+				AuditedEmbeddableOverrideEntity.class,
+				FullOverrideEmbeddable.class,
+				FullOverrideEmbeddableEntity.class,
+				NotAuditedEmbeddableEntity.class,
+				OverrideEmbeddable.class,
+				OverrideEmbeddableEntity.class,
+				SimpleAbstractMappedSuperclass.class,
+				SimpleEmbeddable.class,
+				SimpleEmbeddableEntity.class,
+				SimpleEmbeddableWithOverrideEntity.class,
+				SimpleEmbeddableWithPropertyOverrideEntity.class
+		};
+	}
+
+	@Test
+	@Priority( 10 )
+	public void initData() {
+		EntityManager entityManager = getEntityManager();
+		try {
+
+			// entity 1
+			SimpleEmbeddableEntity simple = new SimpleEmbeddableEntity();
+			simple.setEmbeddable( new SimpleEmbeddable() );
+			simple.getEmbeddable().setStrValue( "strValueSimple" );
+			simple.getEmbeddable().setIntValue( 5 );
+
+			// entity 2
+			SimpleEmbeddableWithOverrideEntity simpleOverride = new SimpleEmbeddableWithOverrideEntity();
+			simpleOverride.setEmbeddable( new SimpleEmbeddable() );
+			simpleOverride.getEmbeddable().setStrValue( "strValueSimpleOverride" );
+			simpleOverride.getEmbeddable().setIntValue( 10 );
+
+			// entity 3
+			SimpleEmbeddableWithPropertyOverrideEntity simpleProperty = new SimpleEmbeddableWithPropertyOverrideEntity();
+			simpleProperty.setEmbeddable( new SimpleEmbeddable() );
+			simpleProperty.getEmbeddable().setStrValue( "strValueSimpleMapped" );
+			simpleProperty.getEmbeddable().setIntValue( 15 );
+
+			// entity 4
+			FullOverrideEmbeddableEntity fullOverride = new FullOverrideEmbeddableEntity();
+			fullOverride.setEmbeddable( new FullOverrideEmbeddable() );
+			fullOverride.getEmbeddable().setStrValue( "strValueFull" );
+			fullOverride.getEmbeddable().setIntValue( 20 );
+
+			// entity 5
+			NotAuditedEmbeddableEntity notAudited = new NotAuditedEmbeddableEntity();
+			notAudited.setEmbeddable( new FullOverrideEmbeddable() );
+			notAudited.getEmbeddable().setStrValue( "strValueNotAudited" );
+			notAudited.getEmbeddable().setIntValue( 25 );
+
+			// entity 6
+			OverrideEmbeddableEntity overrided = new OverrideEmbeddableEntity();
+			overrided.setEmbeddable( new OverrideEmbeddable() );
+			overrided.getEmbeddable().setStrValue( "strValueOver" );
+			overrided.getEmbeddable().setIntValue( 30 );
+
+			// entity 7
+			AuditedEmbeddableOverrideEntity audited = new AuditedEmbeddableOverrideEntity();
+			audited.setEmbeddable( new AuditedEmbeddable() );
+			audited.getEmbeddable().setStrValue( "strValueAudited" );
+			audited.getEmbeddable().setIntValue( 35 );
+			audited.getEmbeddable().setValue( 1024 );
+
+			entityManager.getTransaction().begin();
+			entityManager.persist( simple );
+			entityManager.persist( simpleOverride );
+			entityManager.persist( simpleProperty );
+			entityManager.persist( fullOverride );
+			entityManager.persist( notAudited );
+			entityManager.persist( overrided );
+			entityManager.persist( audited );
+			entityManager.getTransaction().commit();
+
+			this.simpleId = simple.getId();
+			this.simpleOverrideId = simpleOverride.getId();
+			this.simplePropertyId = simpleProperty.getId();
+			this.fullOverrideId = fullOverride.getId();
+			this.notAuditedId = notAudited.getId();
+			this.overridedId = overrided.getId();
+			this.auditedId = audited.getId();
+		}
+		finally {
+			entityManager.close();
+		}
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9228" )
+	public void testAuditOverrideOnAuditedEmbeddable() {
+		final PersistentClass clazz = getPersistentClass( AuditedEmbeddableOverrideEntity.class, auditedId, 1 );
+		assertTrue( clazz.hasProperty( "name" ) );
+		// verify non-audited fields are excluded from mappings.
+		assertFalse( clazz.hasProperty( "embeddable_value" ) );
+		assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
+		assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableWithFullAudit() {
+		final PersistentClass clazz = getPersistentClass( FullOverrideEmbeddableEntity.class, fullOverrideId, 1 );
+		assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
+		assertTrue( clazz.hasProperty( "embeddable_strValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableWithNoAudited() {
+		final PersistentClass clazz = getPersistentClass( NotAuditedEmbeddableEntity.class, notAuditedId, 1 );
+		// not mapped because @NotAudited should override any other behavior.
+		assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
+		assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableWithAuditOverride() {
+		final PersistentClass clazz = getPersistentClass( OverrideEmbeddableEntity.class, overridedId, 1 );
+		assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
+		assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableNoAuditOverrides() {
+		final PersistentClass clazz = getPersistentClass( SimpleEmbeddableEntity.class, simpleId, 1 );
+		assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
+		assertFalse( clazz.hasProperty( "embeddable_intValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableWithAuditOverrideForMappedSuperclass() {
+		final PersistentClass clazz = getPersistentClass(
+				SimpleEmbeddableWithOverrideEntity.class,
+				simpleOverrideId,
+				1
+		);
+		assertTrue( clazz.hasProperty( "embeddable_strValue" ) );
+		assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
+	}
+
+	@Test
+	@JiraKey( value = "HHH-9229" )
+	public void testEmptyEmbeddableWithPropertyAuditOverride() {
+		final PersistentClass clazz = getPersistentClass(
+				SimpleEmbeddableWithPropertyOverrideEntity.class,
+				simplePropertyId,
+				1
+		);
+		assertFalse( clazz.hasProperty( "embeddable_strValue" ) );
+		assertTrue( clazz.hasProperty( "embeddable_intValue" ) );
+	}
+
+	// represents a @MappedSuperclass with no overrides
+	@MappedSuperclass
+	public static abstract class SimpleAbstractMappedSuperclass {
+		private String strValue;
+		private Integer intValue;
+
+		public Integer getIntValue() {
+			return intValue;
+		}
+
+		public void setIntValue(Integer intValue) {
+			this.intValue = intValue;
+		}
+
+		public String getStrValue() {
+			return strValue;
+		}
+
+		public void setStrValue(String strValue) {
+			this.strValue = strValue;
+		}
+	}
+
+	// an embeddable that should introduce no audited properties
+	@Embeddable
+	public static class SimpleEmbeddable extends SimpleAbstractMappedSuperclass {
+
+	}
+
+	// an embeddable that should introduce 'intValue' as audited based on audit overrides locally
+	@Embeddable
+	@AuditOverride(forClass = SimpleAbstractMappedSuperclass.class, name = "intValue")
+	public static class OverrideEmbeddable extends SimpleAbstractMappedSuperclass {
+
+	}
+
+	// an embedddable that introduces all audited values base don audit overrides locally.
+	@Embeddable
+	@AuditOverride(forClass = SimpleAbstractMappedSuperclass.class)
+	public static class FullOverrideEmbeddable extends SimpleAbstractMappedSuperclass {
+
+	}
+
+	@Embeddable
+	@Audited
+	public static class AuditedEmbeddable extends SimpleAbstractMappedSuperclass {
+		@Column(name = "val")
+		private Integer value;
+
+		public Integer getValue() {
+			return value;
+		}
+
+		public void setValue(Integer value) {
+			this.value = value;
+		}
+	}
+
+	@Entity(name = "aeoe")
+	@Audited
+	public static class AuditedEmbeddableOverrideEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		private String name;
+		@Embedded
+		@AuditOverrides({
+				@AuditOverride(name = "value", isAudited = false),
+				@AuditOverride(forClass = SimpleAbstractMappedSuperclass.class, isAudited = false)
+		})
+		private AuditedEmbeddable embeddable;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public AuditedEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(AuditedEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "naee")
+	@Audited
+	public static class NotAuditedEmbeddableEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		@NotAudited
+		private FullOverrideEmbeddable embeddable;
+
+		public FullOverrideEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(FullOverrideEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "foee")
+	@Audited
+	public static class FullOverrideEmbeddableEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		private FullOverrideEmbeddable embeddable;
+
+		public FullOverrideEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(FullOverrideEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "oee")
+	@Audited
+	public static class OverrideEmbeddableEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		private OverrideEmbeddable embeddable;
+
+		public OverrideEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(OverrideEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "sewpoe")
+	@Audited
+	public static class SimpleEmbeddableWithPropertyOverrideEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		@AuditOverride(name = "intValue", forClass = SimpleAbstractMappedSuperclass.class)
+		private SimpleEmbeddable embeddable;
+
+		public SimpleEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(SimpleEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "see")
+	@Audited
+	public static class SimpleEmbeddableEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		private SimpleEmbeddable embeddable;
+
+		public SimpleEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(SimpleEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+
+	@Entity(name = "sewoe")
+	@Audited
+	public static class SimpleEmbeddableWithOverrideEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Embedded
+		@AuditOverride(forClass = SimpleAbstractMappedSuperclass.class)
+		private SimpleEmbeddable embeddable;
+
+		public SimpleEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(SimpleEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	private PersistentClass getPersistentClass(Class clazz, Object id, Number revision) {
+		final Object entity = getAuditReader().find( clazz, id, revision );
+		return metadata().getEntityBinding( getAuditReader().getEntityName( id, revision, entity ) + "_AUD" );
+	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java
index 80ae81bccbdf..863d135f93ed 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java
index 3fe648ba09be..2beffa5404cc 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java
index aee120f20525..f38c4d50279a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java
index a154102847a6..9f52cad98e8d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java
index 5be5fc3f1e96..bb6b9349043e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java
index 7acf1120f763..e6adfa869728 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditoverride;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java
index fbf450c34261..99751bfa52ad 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java
index 3d62289e657d..bac6ff976f4a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java
index a67af36db718..396897aeaf60 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
@@ -72,4 +70,3 @@ public void setChild(String child) {
 		this.child = child;
 	}
 }
-
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java
index 2c1696c83802..2b1b674c92d5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
index 4eae2ce7065c..a4134def0188 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
index 3b2835e1d777..289f11ca49b5 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java
index a55e1f0c7614..b506490633a1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java
index 59385256cb35..cc218d7284e0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java
index 7cbfcc935a32..9501ac843a7e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java
index dd3c3c67c441..5eb66d760539 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java
index 81d2f8927b72..fda868c36d82 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java
index 4811f1070a64..13d5be2168b9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java
index 0064d3b47229..508421bdcbd2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.superclass.auditparents;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java
index fff352c3cb2d..9da17fd2a277 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.tools;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java
index b4f814d6374d..4183ee7a8d0e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.tools;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java
index ca866246fc49..ad44e9b4d37c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integrator;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java
index b6e5f03c17a8..8a393fb2f38b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java
index 52c96b6b15c7..4d1c83096162 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
@@ -55,11 +53,11 @@ public long run(int numberOfRuns, List results) {
 
 			newEntityManager();
 
-            /*System.gc();
+			/*System.gc();
 			System.gc();
-            System.gc();
-            System.out.println(Runtime.getRuntime().freeMemory() + ", " + Runtime.getRuntime().totalMemory() + ", "
-                    + (Runtime.getRuntime().totalMemory()-Runtime.getRuntime().freeMemory()));*/
+			System.gc();
+			System.out.println(Runtime.getRuntime().freeMemory() + ", " + Runtime.getRuntime().totalMemory() + ", "
+					+ (Runtime.getRuntime().totalMemory()-Runtime.getRuntime().freeMemory()));*/
 		}
 
 		return total;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java
index 85ebb6be820d..0077eff89ede 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java
index c8bc67cdddf7..440fd2611082 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.performance;
 
 import java.io.IOException;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java
index 90a820819a19..fe4fca597914 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
@@ -113,4 +111,4 @@ private void checkEmptyAuditSessionCache(Session session, String... auditEntityN
 			);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java
index 133044e37efb..7768f811cf9a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.performance;
 
 import java.io.IOException;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java
index 3c442afe5acc..92760ed06934 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java
index 418d091bfaae..e9e7e1960a0b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.performance;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java
index 8c2b053e8b7e..a7bd87985011 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.performance.complex;
 
 import jakarta.persistence.CascadeType;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java
index 3473fe07ee3a..3248a68f7093 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.performance.complex;
 
 import java.util.Set;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java
index 35e2b5a452fb..0cad0b257b51 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.envers.performance.complex;
 
 import java.util.Date;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java
index 3ed0222e0cc6..d2a990398e05 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.tools;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java
index 8f014b0e878a..ea4338c4df30 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.tools;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java
index d22232f01eb9..2add39d94b1e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.various;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java
index f68198fb8f3c..4eab3cc6d28d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.various;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java
index 9da38b65a8b9..c89d4fe4f4db 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.various;
 
@@ -20,59 +18,59 @@
  */
 public class HsqlTest {
 	/*
-    Query generated by Hibernate from an old demo, when criteria was used:  (works)
-
-    select
-        this_.id as id2_0_,
-        this_._revision as column2_2_0_,
-        this_._revision_type as column3_2_0_,
-        this_.name as name2_0_,
-        this_.surname as surname2_0_,
-        this_.address_id as address6_2_0_
-    from
-        Person_versions this_
-    where
-        this_._revision = (
-            select
-                max(e2_._revision) as y0_
-            from
-                Person_versions e2_
-            where
-                e2_._revision<=1
-                and this_.id=e2_.id
-        )
-        and this_.id=1
-
-    Query generated by Hibernate from a new demo, when query generator is used:
-    (throws Column not found: ID in statement because of "person_ver0_.id=person_ver1_.id")    
-
-    select
-        person_ver0_.id as id3_,
-        person_ver0_._revision as column2_3_,
-        person_ver0_._revision_type as column3_3_,
-        person_ver0_.name as name3_,
-        person_ver0_.surname as surname3_,
-        person_ver0_.address_id as address6_3_
-    from
-        Person_versions person_ver0_
-    where
-        person_ver0_._revision_type<>2
-        and person_ver0_._revision=(
-            select
-                max(person_ver1_._revision)
-            from
-                Person_versions person_ver1_
-            where
-                person_ver1_._revision<=1
-                and person_ver0_.id=person_ver1_.id
-        )
-        and person_ver0_.id=1
-
-        Both queries work from HSQL console
-        (to run: java -cp hsqldb.jar org.hsqldb.util.DatabaseManager -user sa -url jdbc:hsqldb:file:/tmp/_versions_demo.db)
-
-        TODO: post hibernate bug
-     */
+	Query generated by Hibernate from an old demo, when criteria was used:  (works)
+
+	select
+		this_.id as id2_0_,
+		this_._revision as column2_2_0_,
+		this_._revision_type as column3_2_0_,
+		this_.name as name2_0_,
+		this_.surname as surname2_0_,
+		this_.address_id as address6_2_0_
+	from
+		Person_versions this_
+	where
+		this_._revision = (
+			select
+				max(e2_._revision) as y0_
+			from
+				Person_versions e2_
+			where
+				e2_._revision<=1
+				and this_.id=e2_.id
+		)
+		and this_.id=1
+
+	Query generated by Hibernate from a new demo, when query generator is used:
+	(throws Column not found: ID in statement because of "person_ver0_.id=person_ver1_.id")
+
+	select
+		person_ver0_.id as id3_,
+		person_ver0_._revision as column2_3_,
+		person_ver0_._revision_type as column3_3_,
+		person_ver0_.name as name3_,
+		person_ver0_.surname as surname3_,
+		person_ver0_.address_id as address6_3_
+	from
+		Person_versions person_ver0_
+	where
+		person_ver0_._revision_type<>2
+		and person_ver0_._revision=(
+			select
+				max(person_ver1_._revision)
+			from
+				Person_versions person_ver1_
+			where
+				person_ver1_._revision<=1
+				and person_ver0_.id=person_ver1_.id
+		)
+		and person_ver0_.id=1
+
+		Both queries work from HSQL console
+		(to run: java -cp hsqldb.jar org.hsqldb.util.DatabaseManager -user sa -url jdbc:hsqldb:file:/tmp/_versions_demo.db)
+
+		TODO: post hibernate bug
+	 */
 
 	public static void main(String[] argv) {
 		Map configurationOverrides = new HashMap();
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java
index 7b5c08144710..cb4fbcfc4c4e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.various;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java
index a928b667178c..3a39a7e3ec5e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
 import org.hibernate.dialect.Dialect;
 
-import org.junit.jupiter.api.extension.ExtensionContext;
 
 /**
  * Contract for things that expose a Dialect
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java
index 0d430e6def20..bd873bbdb5d6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java
index 51af4d195405..b724d7c57cab 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java
index 2f258ed8a77b..36ffb590d503 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java
index 57856b61d5ab..6cf38f3d8669 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java
index cd181249e5c0..49ffb5bbe4f6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/RequiresAuditStrategy.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/RequiresAuditStrategy.java
index 44aae8ab60bb..f3f3fd5f9e79 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/RequiresAuditStrategy.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/RequiresAuditStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java
index 9af8c31a973e..b8443d84be50 100644
--- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java
+++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.envers;
 
diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
index 3cda838061ed..7c72790e74d0 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticFeature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graalvm.internal;
 
diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
index 60e22aebb07d..dc0942b293e1 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graalvm.internal;
 
diff --git a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/CodeSource.java b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/CodeSource.java
index d54b5f691a7f..354c4d188d35 100644
--- a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/CodeSource.java
+++ b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/CodeSource.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graalvm.internal;
 
diff --git a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/JandexTestUtils.java b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/JandexTestUtils.java
index ff3c6842b542..90347ea7a14d 100644
--- a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/JandexTestUtils.java
+++ b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/JandexTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graalvm.internal;
diff --git a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
index 39830fa33d84..dac75c6ba277 100644
--- a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
+++ b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.graalvm.internal;
 
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
index 725976271bec..097ba75b94f8 100644
--- a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
+++ b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.hikaricp.internal;
 
 import java.sql.Connection;
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
index 1c11f6d8faf8..3ec65b9f3c41 100644
--- a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
+++ b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.hikaricp.internal;
 
 import java.util.Map;
@@ -21,7 +18,7 @@
 
 /**
  * Utility class to map Hibernate properties to HikariCP configuration properties.
- * 
+ *
  * @author Brett Wooldridge
  * @author Luca Burgazzoli
  * @author Brett Meyer
@@ -31,7 +28,7 @@ public class HikariConfigurationUtil {
 
 	/**
 	 * Create/load a HikariConfig from Hibernate properties.
-	 * 
+	 *
 	 * @param props a map of Hibernate properties
 	 * @return a HikariConfig
 	 */
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/StrategyRegistrationProviderImpl.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/StrategyRegistrationProviderImpl.java
index 06d266414043..0021d64f51ce 100644
--- a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/StrategyRegistrationProviderImpl.java
+++ b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/StrategyRegistrationProviderImpl.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.hikaricp.internal;
 
 import java.util.Collections;
-import java.util.List;
 
 import org.hibernate.boot.registry.selector.SimpleStrategyRegistrationImpl;
 import org.hibernate.boot.registry.selector.StrategyRegistration;
@@ -17,7 +14,7 @@
 /**
  * Provides the {@link HikariCPConnectionProvider} to the
  * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
- * 
+ *
  * @author Brett Meyer
  */
 public final class StrategyRegistrationProviderImpl implements StrategyRegistrationProvider {
diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java b/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java
index bd2c57bfb307..6a407ad2332c 100644
--- a/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java
+++ b/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
 
diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
index 37e52d32f2e7..2fad02779a00 100644
--- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
+++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.hikaricp;
 
diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java
index 3894f6a0f56a..85baaeb123cd 100644
--- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java
+++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.hikaricp;
 
diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java
index 509ce7916967..dc517fce3800 100644
--- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java
+++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.hikaricp;
 
diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/JavaModulePathIT.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/JavaModulePathIT.java
index 815462f2498a..8a425b42afb0 100644
--- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/JavaModulePathIT.java
+++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/JavaModulePathIT.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.integrationtest.java.module.test;
 
diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java
index d26f30827d49..92df4f36c096 100644
--- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java
+++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/ScannerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.integrationtest.java.module.test;
 
diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/TestScanEnvironment.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/TestScanEnvironment.java
index 709bf0c5cb41..75c6ccb45147 100644
--- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/TestScanEnvironment.java
+++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/TestScanEnvironment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.integrationtest.java.module.test;
 
diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java
index d2554b2a0e47..bc4dd35e6bba 100644
--- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java
+++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.integrationtest.java.module.test.entity;
 
diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java
index b2cdad4e053d..b82192412418 100644
--- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java
+++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.integrationtest.java.module.test.service;
 
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/ConfigSettings.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/ConfigSettings.java
index 1c62d013474a..531ffcb9a5cf 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/ConfigSettings.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/ConfigSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache;
 
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheHelper.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheHelper.java
index 38cff9102e71..1d87b7d9b578 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheHelper.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/JCacheHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache;
 
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/MissingCacheStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/MissingCacheStrategy.java
index edba1b44e695..79e783809834 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/MissingCacheStrategy.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/MissingCacheStrategy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache;
 
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
index ca74977e1647..eaff2a7d1ec9 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache.internal;
 
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheDomainDataRegionImpl.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheDomainDataRegionImpl.java
index 41e672ed222c..be5e64911c12 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheDomainDataRegionImpl.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheDomainDataRegionImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache.internal;
 
@@ -12,7 +10,6 @@
 import org.hibernate.cache.cfg.spi.EntityDataCachingConfig;
 import org.hibernate.cache.cfg.spi.NaturalIdDataCachingConfig;
 import org.hibernate.cache.spi.CacheKeysFactory;
-import org.hibernate.cache.spi.SecondLevelCacheLogger;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.access.EntityDataAccess;
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheRegionFactory.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheRegionFactory.java
index 9339bdb7d57c..8bae0fbe8dcc 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheRegionFactory.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheRegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache.internal;
 
@@ -28,7 +26,6 @@
 import org.hibernate.cache.jcache.MissingCacheStrategy;
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.cache.spi.DomainDataRegion;
-import org.hibernate.cache.spi.SecondLevelCacheLogger;
 import org.hibernate.cache.spi.support.DomainDataStorageAccess;
 import org.hibernate.cache.spi.support.RegionFactoryTemplate;
 import org.hibernate.cache.spi.support.RegionNameQualifier;
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/StrategyRegistrationProviderImpl.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/StrategyRegistrationProviderImpl.java
index 39c87d267317..74c9c6db5654 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/StrategyRegistrationProviderImpl.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/StrategyRegistrationProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.cache.jcache.internal;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java
index a6a0a764318e..9f19314120ad 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/FirstLevelCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/FirstLevelCacheTest.java
index b04c741f1994..15253ad6f92e 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/FirstLevelCacheTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/FirstLevelCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/NonStrictReadWriteCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/NonStrictReadWriteCacheTest.java
index eed5c687b2b8..7d920fbfa162 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/NonStrictReadWriteCacheTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/NonStrictReadWriteCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java
index d5879677e9f8..579b7bfc0fb3 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.caching;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/BaseFunctionalTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/BaseFunctionalTest.java
index 9b44d1ea8f71..7c62732052e1 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/BaseFunctionalTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/BaseFunctionalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/DomainDataRegionTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/DomainDataRegionTest.java
index 4f1b7937ce32..1e247495b0e6 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/DomainDataRegionTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/DomainDataRegionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
index 84ce207c8da3..f49ef757b2bc 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
@@ -252,4 +250,4 @@ public void testGeneralUsage() {
 		assertThat( "Cache Hit Count", queryStats.getCacheHitCount(), equalTo( 0L ) );
 		assertThat( "Cache Put Count", queryStats.getCachePutCount(), equalTo( 1L ) );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java
index a9b9550dcffe..dc36c8af044c 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheClasspathConfigUriTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheClasspathConfigUriTest.java
index 0b914c6289b3..25e9ca5924e1 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheClasspathConfigUriTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheClasspathConfigUriTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigRelativePathTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigRelativePathTest.java
index 7cac3545351c..7686a282b595 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigRelativePathTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigRelativePathTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigUrlTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigUrlTest.java
index 46d2841fa2fd..bea0ee790543 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigUrlTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheConfigUrlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheTransactionalCacheConcurrencyStrategyTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheTransactionalCacheConcurrencyStrategyTest.java
index 39ee054199f7..62a1c4afda6d 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheTransactionalCacheConcurrencyStrategyTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/JCacheTransactionalCacheConcurrencyStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/MissingCacheStrategyTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/MissingCacheStrategyTest.java
index 5274a4831666..02062834af1f 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/MissingCacheStrategyTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/MissingCacheStrategyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/QueryCacheWithFilterTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/QueryCacheWithFilterTest.java
index ec4361ec30a1..5fd330bdb91a 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/QueryCacheWithFilterTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/QueryCacheWithFilterTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.jcache;
 
 import java.util.List;
@@ -5,11 +9,8 @@
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.ParamDef;
-import org.hibernate.cache.spi.RegionFactory;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.query.Query;
-import org.hibernate.stat.CacheRegionStatistics;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -20,12 +21,10 @@
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java
index ac85e9b32d33..74bc8b30bb8c 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/StorageAccessTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/StorageAccessTest.java
index c38d65f470f4..8b35575e52d0 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/StorageAccessTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/StorageAccessTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/TestHelper.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/TestHelper.java
index 31b773a5945c..813284b5a1a2 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/TestHelper.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/TestHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache;
 
@@ -23,7 +21,6 @@
 import org.hibernate.cache.spi.RegionFactory;
 import org.hibernate.cache.spi.support.RegionNameQualifier;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.orm.test.jcache.domain.Item;
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Account.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Account.java
index abb21cb1c4e1..1dacc97936cc 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Account.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Account.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jcache.domain;
 
 public class Account {
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Event.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Event.java
index d412a20215af..0dad5b882fd2 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Event.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Event.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java
index ffcffd7e62dc..5e3f20ce73a7 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/HolidayCalendar.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/HolidayCalendar.java
index a20cc2e562ab..4d038160e177 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/HolidayCalendar.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/HolidayCalendar.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
@@ -73,4 +71,3 @@ protected void setId(Long id) {
 		this.id = id;
 	}
 }
-
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Item.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Item.java
index ce041f85205a..00e30b938016 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Item.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
@@ -34,4 +32,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Person.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Person.java
index f59eb64f1b0b..4f6ba7f98378 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Person.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Person.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jcache.domain;
 
 import java.util.ArrayList;
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/PhoneNumber.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/PhoneNumber.java
index 84e4f93c6af2..d48963faad10 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/PhoneNumber.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/PhoneNumber.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.orm.test.jcache.domain;
 
 import java.io.Serializable;
@@ -45,7 +42,7 @@ public int hashCode() {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result
-						 + ((numberType == null) ? 0 : numberType.hashCode());
+						+ ((numberType == null) ? 0 : numberType.hashCode());
 		result = prime * result + (int)(personId ^ (personId >>> 32));
 		result = prime * result + (int)(phone ^ (phone >>> 32));
 		return result;
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Product.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Product.java
index 07a8eed7b19f..74d2e97e073f 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Product.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java
index c4101141df6b..7866a36dd403 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
@@ -34,4 +32,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/VersionedItem.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/VersionedItem.java
index 21cbf971a255..b41f7ebeda16 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/VersionedItem.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/VersionedItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.jcache.domain;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java
index 75576f66b23b..fbfe3b016f19 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java
index 15b3642ae07b..b1ff20618a92 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java
index e844dfe2d0e2..7183e5dac0fb 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java
index f8d5cc926a06..bbb9c2cc3dc6 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java
index 26a0e66c1370..c9936a96a4d1 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java
index b54cf622677a..6597b232ac8f 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java
index e2e5cd653c5e..6c771fe7eb74 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java
index 3e2e1867819c..8794f7ef279f 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java
index 7f5d95cb7926..68e0e577ae95 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java
index fec0396b6f1e..50a74cde91b6 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java
index ae32d9959529..edcd5d4ae312 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java
index 624624ce5b68..e322ab3256d5 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java
index 16ab436707bd..2700b1468ae5 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java
index ce2f7e47491c..b49aedee1182 100644
--- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java
+++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr.internal;
 
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java
index fb6d8a28cc90..3a3429971db7 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcBatchExecutionEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcBatchExecutionEventTests.java
index f0e5a3117cda..13c8695d66ba 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcBatchExecutionEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcBatchExecutionEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcConnectionEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcConnectionEventTests.java
index 059d3ebfb510..8b4c34126dd8 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcConnectionEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcConnectionEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcPreparedStatementEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcPreparedStatementEventTests.java
index 482218dd1333..f2e70c386f75 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcPreparedStatementEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/JdbcPreparedStatementEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr;
 
 import java.time.Duration;
@@ -101,14 +105,14 @@ public void testJdbcPreparedStatementEventStoredProcedure(SessionFactoryScope sc
 					ProcedureCall call = session.createStoredProcedureCall("DB_OBJECT_SQL", String.class)
 							.registerStoredProcedureParameter(1, String.class, ParameterMode.IN)
 							.registerStoredProcedureParameter(2, String.class, ParameterMode.IN)
-							.setParameter(1, "USER")  
+							.setParameter(1, "USER")
 							.setParameter(2, "SA");
 					boolean hasResult = call.execute();
 					assertThat( hasResult ).isTrue();
 					Object createSa = call.getSingleResult();
 					assertThat( createSa ).isInstanceOf( String.class );
 					assertThat( ((String) createSa).toLowerCase( Locale.ROOT ) ).contains( "create user if not exists " );
-					
+
 					final List events = jfrEvents.events()
 							.filter(
 									recordedEvent ->
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/SessionEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/SessionEventTests.java
index e16a688bde32..6fb7188ec0e8 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/SessionEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/SessionEventTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.event.jfr;
 
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/CacheGetEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/CacheGetEventTests.java
index fe9ab1b1ac71..4809d6d3a9f2 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/CacheGetEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/CacheGetEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityInsertCachePutEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityInsertCachePutEventTests.java
index cdb2425065b6..9eea8c236684 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityInsertCachePutEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityInsertCachePutEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityUpdateCachePutEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityUpdateCachePutEventTests.java
index 72468c5e3f1d..85a5f87c4306 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityUpdateCachePutEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/EntityUpdateCachePutEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdGetCacheTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdGetCacheTests.java
index a12a36cfb273..32e8d58cfb8f 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdGetCacheTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdGetCacheTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdPutCacheTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdPutCacheTests.java
index 45dd2bdb89ed..5d2e0b6c6fc2 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdPutCacheTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/NaturalIdPutCacheTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/QueryCachePutEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/QueryCachePutEventTests.java
index 477651198bea..98949b90d9ce 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/QueryCachePutEventTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/cache/QueryCachePutEventTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.cache;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/AutoFlushTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/AutoFlushTests.java
index 6f545b530d6d..660766b24a40 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/AutoFlushTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/AutoFlushTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.flush;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/ExplicitFlushTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/ExplicitFlushTests.java
index 7b5f7a884124..aedd99112fdd 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/ExplicitFlushTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/ExplicitFlushTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.flush;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/FlushTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/FlushTests.java
index acf2a4ccfea4..48a91b70e968 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/FlushTests.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/FlushTests.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.flush;
 
 import java.util.List;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/PrePartialFlushTest.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/PrePartialFlushTest.java
index 09d224a773a7..704e9d82dbd2 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/PrePartialFlushTest.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/flush/PrePartialFlushTest.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.event.jfr.flush;
 
 import java.util.List;
 
-import org.hibernate.event.jfr.internal.FlushEvent;
 import org.hibernate.event.jfr.internal.PrePartialFlushEvent;
 
 import org.hibernate.testing.orm.junit.DomainModel;
diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/package-info.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/package-info.java
index 5496209cfda2..953787122fac 100644
--- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/package-info.java
+++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/package-info.java
@@ -2,4 +2,4 @@
  * Tests for Hibernate's JFR events.  Well the events are roduced on Java 11, the JfrUnit
  * framewqork used in testing only works on JDK 16+.
  */
-package org.hibernate.event.jfr;
\ No newline at end of file
+package org.hibernate.event.jfr;
diff --git a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java
index 98fbf135ff40..34838285d77e 100644
--- a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java
+++ b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateQueryMetrics.java b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateQueryMetrics.java
index 73447127a088..83369cb05bcf 100644
--- a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateQueryMetrics.java
+++ b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateQueryMetrics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.stat;
 
diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java
index 14cac2f77e4c..d99918d7227f 100644
--- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java
+++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.stat;
 
@@ -16,26 +14,26 @@
 @Entity
 @Table( name = "t_acct" )
 public class Account {
-    @EmbeddedId
-    private AccountId accountId;
-
-    @Basic( optional = false )
-    @NaturalId
-    private String shortCode;
-    
-    protected Account() {
-    }
-    
-    public Account(AccountId accountId, String shortCode) {
-        this.accountId = accountId;
-        this.shortCode = shortCode;
-    }
-
-    public AccountId getAccountId() {
-        return accountId;
-    }
-
-    public String getShortCode() {
-        return shortCode;
-    }
+	@EmbeddedId
+	private AccountId accountId;
+
+	@Basic( optional = false )
+	@NaturalId
+	private String shortCode;
+
+	protected Account() {
+	}
+
+	public Account(AccountId accountId, String shortCode) {
+		this.accountId = accountId;
+		this.shortCode = shortCode;
+	}
+
+	public AccountId getAccountId() {
+		return accountId;
+	}
+
+	public String getShortCode() {
+		return shortCode;
+	}
 }
diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java
index 755e243445b1..a1dad66ae4e1 100644
--- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java
+++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.stat;
 
@@ -10,34 +8,33 @@
 
 @Embeddable
 public class AccountId implements java.io.Serializable {
-    private final int id;
+	private final int id;
 
-    protected AccountId() {
-        this.id = 0;
-    }
-    
-    public AccountId(int id) {
-        this.id = id;
-    }
-    public int intValue() {
-        return id;
-    }
-    @Override
-    public int hashCode() {
-        return id;
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AccountId other = (AccountId) obj;
-        if (other != null && id != other.id)
-            return false;
-        return true;
-    }
-}
+	protected AccountId() {
+		this.id = 0;
+	}
 
+	public AccountId(int id) {
+		this.id = id;
+	}
+	public int intValue() {
+		return id;
+	}
+	@Override
+	public int hashCode() {
+		return id;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AccountId other = (AccountId) obj;
+		if (other != null && id != other.id)
+			return false;
+		return true;
+	}
+}
diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java
index fa4bee9a058e..23961137be93 100644
--- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java
+++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.stat;
 
diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java
index 2fbc27c655b5..575f42898044 100644
--- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java
+++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.stat;
 
@@ -21,7 +19,6 @@
 import io.micrometer.core.instrument.search.MeterNotFoundException;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
-import static org.junit.Assert.assertEquals;
 
 /**
  *  @author Erin Schnabel
diff --git a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolConnectionProvider.java b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolConnectionProvider.java
index 6ff2801812d1..d065190730fb 100644
--- a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolConnectionProvider.java
+++ b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxool.internal;
 
diff --git a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
index a51e1464a15c..07054861d516 100644
--- a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
+++ b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxool.internal;
 
diff --git a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/StrategyRegistrationProviderImpl.java b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/StrategyRegistrationProviderImpl.java
index 3b9e2c44fd33..150d7c32e777 100644
--- a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/StrategyRegistrationProviderImpl.java
+++ b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/StrategyRegistrationProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxool.internal;
 
@@ -16,7 +14,7 @@
 /**
  * Provides the {@link ProxoolConnectionProvider} to the
  * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
- * 
+ *
  * @author Brett Meyer
  */
 public final class StrategyRegistrationProviderImpl implements StrategyRegistrationProvider {
diff --git a/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolConnectionProviderTest.java b/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolConnectionProviderTest.java
index 7cb50a9c9242..ed240906b99a 100644
--- a/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolConnectionProviderTest.java
+++ b/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolConnectionProviderTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.proxool;
 
@@ -40,7 +38,7 @@ public void testPoolsClosed() {
 		StandardServiceRegistry serviceRegistryTwo = buildServiceRegistry( "pool-two" );
 		ConnectionProvider providerTwo = serviceRegistryTwo.getService( ConnectionProvider.class );
 		assertDefinedPools( "pool-one", "pool-two" );
-		
+
 		StandardServiceRegistryBuilder.destroy( serviceRegistry );
 		assertDefinedPools( "pool-two" );
 
diff --git a/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolTransactionIsolationConfigTest.java b/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolTransactionIsolationConfigTest.java
index b439bbc963cd..318498642d50 100644
--- a/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolTransactionIsolationConfigTest.java
+++ b/hibernate-proxool/src/test/java/org/hibernate/test/proxool/ProxoolTransactionIsolationConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.test.proxool;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/BaseSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/BaseSqmFunctionDescriptors.java
index e1f9e00f5722..bb7c5ce840cc 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/BaseSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/BaseSqmFunctionDescriptors.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial;
 
 import java.util.Collections;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/CommonSpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/CommonSpatialFunction.java
index 388ecf6510c0..248a97404989 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/CommonSpatialFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/CommonSpatialFunction.java
@@ -1,13 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
-import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeReference;
 import org.hibernate.type.StandardBasicTypes;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/FunctionKey.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/FunctionKey.java
index 0d9fda27bec4..0bac63b2817a 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/FunctionKey.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/FunctionKey.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 import java.util.Objects;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaType.java
index 4aeab72e2f5b..da5081f6c43f 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeolatteGeometryJavaType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeometryLiteralFormatter.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeometryLiteralFormatter.java
index a406fedb8b3f..3f853b6ccb24 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/GeometryLiteralFormatter.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/GeometryLiteralFormatter.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
index fd3d890cea2b..e21db256462b 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 import org.hibernate.internal.log.SubSystemLogging;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/HibernateSpatialConfigurationSettings.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/HibernateSpatialConfigurationSettings.java
index a16a1f5a8874..3ab7b2c29c91 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/HibernateSpatialConfigurationSettings.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/HibernateSpatialConfigurationSettings.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaType.java
index de749571c959..f995caac2dcf 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 import java.util.Locale;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/KeyedSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/KeyedSqmFunctionDescriptors.java
index ea1d42a0a37c..fdce5ba2647a 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/KeyedSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/KeyedSqmFunctionDescriptors.java
@@ -1,15 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 
 import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/Spatial.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/Spatial.java
index f9fddeac3d56..d53d64cf42e6 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/Spatial.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/Spatial.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 /**
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java
index 0e0194f22d11..306854f7975e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
index 616e458659cd..e9a443584350 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 /**
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
index 1467e3e62ab7..49dfc1ea8f78 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorImplementor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorImplementor.java
index dcdec13cc89c..d1fbf782eb7f 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorImplementor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorImplementor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.contributor;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorResolver.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorResolver.java
index 82e5fc62a5f6..9c7269f4f744 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorResolver.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/ContributorResolver.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.contributor;
 
 import java.util.HashMap;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialFunctionContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialFunctionContributor.java
index 6079fc77c675..d38603f14753 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialFunctionContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialFunctionContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.contributor;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialTypeContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialTypeContributor.java
index 1d1e0b82a613..7bf48d15b34b 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialTypeContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/contributor/SpatialTypeContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.contributor;
 
 import org.hibernate.boot.model.TypeContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/GeolatteSpatialCriteriaBuilder.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/GeolatteSpatialCriteriaBuilder.java
index 2a5718f965ca..b87728de5bcc 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/GeolatteSpatialCriteriaBuilder.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/GeolatteSpatialCriteriaBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/JTSSpatialCriteriaBuilder.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/JTSSpatialCriteriaBuilder.java
index ecfa6bfd3d49..e0420e0269d8 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/JTSSpatialCriteriaBuilder.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/JTSSpatialCriteriaBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/SpatialCriteriaBuilder.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/SpatialCriteriaBuilder.java
index dcc4fe6957a4..a77269be74d4 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/SpatialCriteriaBuilder.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/SpatialCriteriaBuilder.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria;
 
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaBuilderImpl.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaBuilderImpl.java
index 12af241e46f9..1b895ea1c224 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaBuilderImpl.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaBuilderImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.criteria.internal;
 
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaExtension.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaExtension.java
index 07b55699e8f8..d6a39413c600 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaExtension.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/GeolatteSpatialCriteriaExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria.internal;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaBuilderImpl.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaBuilderImpl.java
index df6134fa84ff..373385a7fb70 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaBuilderImpl.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria.internal;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaExtension.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaExtension.java
index 31570b73b483..eb3292d0efd3 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaExtension.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/JTSSpatialCriteriaExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria.internal;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/SpatialCriteriaBuilderImpl.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/SpatialCriteriaBuilderImpl.java
index 43d36ee515d8..9347a49b5f22 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/SpatialCriteriaBuilderImpl.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/criteria/internal/SpatialCriteriaBuilderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.criteria.internal;
 
@@ -11,7 +9,6 @@
 import org.hibernate.spatial.SpatialFunction;
 import org.hibernate.spatial.criteria.SpatialCriteriaBuilder;
 
-import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java
index f5436b485196..7b5b5de2f4a0 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.cockroachdb;
 
 import org.hibernate.dialect.CockroachDialect;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDbContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDbContributor.java
index dcca4f512529..ac595705929e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDbContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDbContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.cockroachdb;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/package-info.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/package-info.java
index 94f58799a86a..232113a738fc 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/package-info.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/cockroachdb/package-info.java
@@ -9,5 +9,3 @@
  * {@code SpatialDialect}s for CockroachDB
  */
 package org.hibernate.spatial.dialect.cockroachdb;
-
-
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2GeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2GeometryType.java
index 6631b318f6e7..45dec4c54274 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2GeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2GeometryType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.db2;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2SpatialDialect.java
index b617716426e4..96a999b7c7f3 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2SpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/db2/DB2SpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.db2;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISGeometryType.java
index d67d1b474f17..db3bda1edfe1 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISGeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISGeometryType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.h2gis;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
index 49fcda7d1ecd..e2023c32cc6b 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.h2gis;
 
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GisDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GisDialectContributor.java
index d99105e9641d..738fd1aedc82 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GisDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GisDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.h2gis;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2SqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2SqmFunctionDescriptors.java
index b6cfade4b0ec..497a89ee2098 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2SqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2SqmFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.h2gis;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAGeometryType.java
index 577b56ba1c6a..2f375aea1911 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAGeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAGeometryType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAPointType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAPointType.java
index 6ac71334554b..d03da00f1531 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAPointType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANAPointType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialAggregate.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialAggregate.java
index ee2946ec96fa..411c94044810 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialAggregate.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialAggregate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialDialect.java
index eeacc266fca7..f4d2d2dbf3af 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunction.java
index 753e4017c03f..a4b90a823247 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunction.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunctions.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunctions.java
index 450455415570..33a0786fb0a7 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunctions.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialFunctions.java
@@ -1,14 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
 public enum HANASpatialFunctions {
 	alphashape("ST_AlphaShape"),
-	
+
 	area("ST_Area"),
 
 	asewkb("ST_AsEWKB"),
@@ -24,7 +22,7 @@ public enum HANASpatialFunctions {
 	aswkb("ST_AsWKB"),
 
 	aswkt("ST_AsWKT"),
-	
+
 	centroid("ST_Centroid"),
 
 	convexhullaggr("ST_ConvexHullAggr"),
@@ -34,87 +32,87 @@ public enum HANASpatialFunctions {
 	coveredby("ST_CoveredBy"),
 
 	covers("ST_Covers"),
-	
+
 	endpoint("ST_EndPoint"),
 
 	envelopeaggr("ST_EnvelopeAggr"),
-	
+
 	exteriorring("ST_ExteriorRing"),
-	
+
 	geomfromewkb("ST_GeomFromEWKB"),
-	
+
 	geomfromewkt("ST_GeomFromEWKT"),
-	
+
 	geomfromtext("ST_GeomFromText"),
-	
+
 	geomfromwkb("ST_GeomFromWKB"),
-	
+
 	geomfromwkt("ST_GeomFromWKT"),
-	
+
 	geometryn("ST_GeometryN"),
-	
+
 	interiorringn("ST_InteriorRingN"),
-	
+
 	intersectionaggr("ST_IntersectionAggr"),
-	
+
 	intersectsrect("ST_IntersectsRect"),
-	
+
 	is3d("ST_Is3D"),
-	
+
 	isclosed("ST_IsClosed"),
-	
+
 	ismeasured("ST_IsMeasured"),
-	
+
 	isring("ST_IsRing"),
-	
+
 	isvalid("ST_IsValid"),
-	
+
 	length("ST_Length"),
-	
+
 	m("ST_M"),
-	
+
 	mmax("ST_MMax"),
-	
+
 	mmin("ST_MMin"),
-	
+
 	numgeometries("ST_NumGeometries"),
-	
+
 	numinteriorring("ST_NumInteriorRing"),
-	
+
 	numinteriorrings("ST_NumInteriorRings"),
-	
+
 	numpoints("ST_NumPoints"),
-	
+
 	orderingequals("ST_OrderingEquals"),
-	
+
 	perimeter("ST_Perimeter"),
-	
+
 	pointonsurface("ST_PointOnSurface"),
-	
+
 	pointn("ST_PointN"),
-	
+
 	snaptogrid("ST_SnapToGrid"),
-	
+
 	startpoint("ST_StartPoint"),
-	
+
 	unionaggr("ST_UnionAggr"),
-	
+
 	x("ST_X"),
-	
+
 	xmax("ST_XMax"),
-	
+
 	xmin("ST_XMin"),
-	
+
 	y("ST_Y"),
-	
+
 	ymax("ST_YMax"),
-	
+
 	ymin("ST_YMin"),
-	
+
 	z("ST_Z"),
-	
+
 	zmax("ST_ZMax"),
-	
+
 	zmin("ST_ZMin");
 
 	private final String functionName;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialUtils.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialUtils.java
index ed7fd99ab5f2..a1393c85385e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialUtils.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/hana/HANASpatialUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.hana;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBDialectContributor.java
index 5df0d9462c01..d76cfac8e3c9 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mariadb;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBSqmFunctionDescriptors.java
index 729960270566..2176c1d64a45 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mariadb/MariaDBSqmFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mariadb;
 
 import java.util.Arrays;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56InnoDBSpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56InnoDBSpatialDialect.java
index 723f79f3b69c..026f2aeb3c21 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56InnoDBSpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56InnoDBSpatialDialect.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mysql;
 
 /**
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56SpatialDialect.java
index 35358fe005cc..8e967824f0d7 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56SpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL56SpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.mysql;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5InnoDBSpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5InnoDBSpatialDialect.java
index 2589d48151af..5e26eda5c2da 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5InnoDBSpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5InnoDBSpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.mysql;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5SpatialDialect.java
index a3277104f3f8..14f94efca9aa 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5SpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQL5SpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.mysql;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLDialectContributor.java
index beb0b4a14a51..7b62924a2ea6 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mysql;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLGeometryJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLGeometryJdbcType.java
index c95896b907e3..e968544ac174 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLGeometryJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLGeometryJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mysql;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLSpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLSpatialDialect.java
index 58e87c02746f..5f5e11a7314a 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLSpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLSpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.mysql;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySqlSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySqlSqmFunctionDescriptors.java
index 7d9263a9e93c..1731dc14149f 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySqlSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySqlSqmFunctionDescriptors.java
@@ -1,16 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.mysql;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.List;
 import java.util.Set;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleDialectContributor.java
index 0d4456b04b79..44b91565c804 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOFunctionDescriptors.java
index cde118827933..9f3bc8437d11 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.Collections;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionDescriptors.java
index 64047afe6dd3..0be3affffe7d 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.Collections;
@@ -103,4 +100,3 @@ public Map asMap() {
 		return Collections.unmodifiableMap( map );
 	}
 }
-
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatial10gDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatial10gDialect.java
index a3d39c3fe63d..e115c083283a 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatial10gDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatial10gDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.oracle;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java
index f048118dca48..df34a304bb10 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSDO10gDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSDO10gDialect.java
index 2ce39463f0c9..57e87a4847e7 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSDO10gDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSDO10gDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.oracle;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java
index 3a1500ec468f..39381559ffb0 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java
index 7da7280b7276..2d5e405f03fe 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.sql.Types;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueBinder.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueBinder.java
index c613f381135f..fe97b9ee2457 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueBinder.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueBinder.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueExtractor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueExtractor.java
index 8e3cbad5c3d5..236a8799ef8e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueExtractor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueExtractor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java
index 0de0cea1f913..174df1fc496a 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOLIteralFormatter.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOLIteralFormatter.java
index 0ffddb564db0..9a9c7eb0b2b8 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOLIteralFormatter.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOLIteralFormatter.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import org.hibernate.dialect.Dialect;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java
index 26811b97a5c2..013a097f2aae 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java
index 5b243aaaffa6..574f47e11fa8 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java
index 679f44ead1c3..7084bfc1260e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractCastingPostGISJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractCastingPostGISJdbcType.java
index 2701c55c78f6..3518c489c960 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractCastingPostGISJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractCastingPostGISJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractPostGISJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractPostGISJdbcType.java
index 37f1eac92d29..b6530f6583d1 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractPostGISJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractPostGISJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import java.sql.CallableStatement;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeographyJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeographyJdbcType.java
index a111ba3c47aa..5475cf432005 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeographyJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeographyJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeometryJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeometryJdbcType.java
index 143b2ecb830f..972433c7b55e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeometryJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGCastingGeometryJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeographyJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeographyJdbcType.java
index 38ece3304f0e..f8a83b914cd3 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeographyJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeographyJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeometryJdbcType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeometryJdbcType.java
index 2c036577367e..bc83615998aa 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeometryJdbcType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeometryJdbcType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import org.hibernate.type.SqlTypes;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisDialectContributor.java
index 8253f232b66c..3dcf85b67eb5 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java
index 2b1d55be2209..e6925289166c 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java
@@ -1,19 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
-import java.util.Map;
 
-import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
-import org.hibernate.service.ServiceRegistry;
 
 @Deprecated
 public class PostgisPG10Dialect  extends PostgreSQLDialect {
@@ -27,4 +21,3 @@ public PostgisPG10Dialect() {
 	}
 
 }
-
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java
index c2c79d941119..ee84efac0999 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.postgis;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java
index 9fe871766203..52452b43f8fc 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.postgis;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java
index a403d60e1e10..e9dd56516528 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.postgis;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java
index 072ddc53cf99..bb694204338d 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/AbstractSqlServerGISType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/AbstractSqlServerGISType.java
index 95676e37f7f5..6e1b3edc178b 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/AbstractSqlServerGISType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/AbstractSqlServerGISType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.sqlserver;
 
 import java.sql.Blob;
@@ -14,8 +11,6 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.hibernate.spatial.GeometryLiteralFormatter;
-import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -26,7 +21,6 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
 import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.Wkt;
 import org.geolatte.geom.codec.db.sqlserver.Decoders;
 import org.geolatte.geom.codec.db.sqlserver.Encoders;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerDialectContributor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerDialectContributor.java
index 1169baec9e81..781f035d4e57 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerDialectContributor.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerDialectContributor.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.sqlserver;
 
 import org.hibernate.boot.model.FunctionContributions;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeographyType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeographyType.java
index 9b5113da6262..abafc48817bd 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeographyType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeographyType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.sqlserver;
 
 import org.hibernate.spatial.GeometryLiteralFormatter;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeometryType.java
index a1d0bc50ff72..3c1ca3a71f09 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeometryType.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeometryType.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.sqlserver;
 
 import org.hibernate.spatial.GeometryLiteralFormatter;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSpatialDialect.java
index a28c4ea95317..ed22688c7540 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSpatialDialect.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSpatialDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.sqlserver;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java
index f559c9a37969..e48d897e845e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.sqlserver;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialInitializer.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialInitializer.java
index 52eeba502d79..4d059923e0c1 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialInitializer.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialInitializer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
index acfee7f22d70..dd45d9ad6bd7 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java
index 7065be76254e..eff1b8102d0d 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/jts/EnvelopeAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.jts;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java
index 2dec3878778f..214db1ee10e6 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.predicate;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteSpatialPredicates.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteSpatialPredicates.java
index a5cce982dbd5..b18521caaf0f 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteSpatialPredicates.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteSpatialPredicates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.predicate;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java
index 5aa9a3c0ef26..e6913a070687 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.predicate;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSSpatialPredicates.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSSpatialPredicates.java
index 3ab70120c507..5eda38e642a6 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSSpatialPredicates.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSSpatialPredicates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.predicate;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/GeomCodec.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/GeomCodec.java
index 2b45c2e01538..e4639fcb2459 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/GeomCodec.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/GeomCodec.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial;
 
 import org.geolatte.geom.Geometry;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
index eea1977e834e..27c66c23fe58 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.hana;
 
 import java.lang.invoke.MethodHandles;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionTests.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionTests.java
index 26d3fcf71148..c3e4434892a6 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionTests.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/OracleSQLMMFunctionTests.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.dialect.oracle;
 
 import org.hibernate.dialect.OracleDialect;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/TestConnectionFinder.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/TestConnectionFinder.java
index 95cb29771b2d..b9a6f69a683c 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/TestConnectionFinder.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/TestConnectionFinder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.oracle;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java
index 605036147811..608d5c0e4ea3 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.oracle.hhh15669;
 
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/package-info.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/package-info.java
index 87bd4fa3549d..012da5c2078c 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/package-info.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Contains dialect specific tests
  */
-package org.hibernate.spatial.dialect;
\ No newline at end of file
+package org.hibernate.spatial.dialect;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisDistanceOperatorsTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisDistanceOperatorsTest.java
index 1a4b8da513f2..0b9e693c65a8 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisDistanceOperatorsTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisDistanceOperatorsTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis;
 
 import java.util.List;
@@ -174,4 +171,3 @@ static Neighbor from(Point pnt, Integer i) {
 		Point point;
 	}
 }
-
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisTest.java
index 3e9dede09cc9..ec61330b2beb 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisTest.java
@@ -1,15 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.postgis;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java
index c5c86ddff098..e72133c9fba6 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.dialect.postgis;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java
index 99938a055473..0ffc9b5f38ca 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis.hhh14523;
 
 import java.io.Serializable;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/package-info.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/package-info.java
index 318e0b1a092f..c6de5aa92649 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/package-info.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/package-info.java
@@ -6,4 +6,4 @@
  */
 
 //test case for bug HHH-14523
-package org.hibernate.spatial.dialect.postgis.hhh14523;
\ No newline at end of file
+package org.hibernate.spatial.dialect.postgis.hhh14523;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java
index c79bfdcad7a3..fe7075e1a4c9 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.dialect.postgis.hhh14932;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java
index d7da732368ad..3dc8941c8d5e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.geometry;
 
 import org.hibernate.testing.orm.junit.JiraKey;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/DecodeUtil.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/DecodeUtil.java
index ad8f8092beb5..61e204d784eb 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/DecodeUtil.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/DecodeUtil.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration;
 
 import org.hibernate.dialect.HANADialect;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/Model.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/Model.java
index 0f19fc00de2f..4e1aa4ea5263 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/Model.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/Model.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.integration;
 
 import java.util.function.Function;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java
index af2dd4cbcd93..8c554e648a2d 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration;
 
 import java.util.ArrayList;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java
index 1ed606c02e80..74db2d96a83f 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration;
 
 import java.util.HashMap;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialSchemaGeneration.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialSchemaGeneration.java
index af60d9be4e54..dfd5d4a69e0a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialSchemaGeneration.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialSchemaGeneration.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration;
 
 import java.io.File;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaBindingModeTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaBindingModeTest.java
index 9d6bbc7397be..1ddb9f092c62 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaBindingModeTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaBindingModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration.criteria;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaInlineModeTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaInlineModeTest.java
index 906530b13be4..e834e0e6dbce 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaInlineModeTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaInlineModeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration.criteria;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaSmokeTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaSmokeTest.java
index 03a9e8fc19cd..85b68d8a6cfc 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaSmokeTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaSmokeTest.java
@@ -1,23 +1,16 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration.criteria;
 
 import java.util.List;
 
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.query.Query;
 import org.hibernate.spatial.criteria.GeolatteSpatialCriteriaBuilder;
-import org.hibernate.spatial.criteria.JTSSpatialCriteriaBuilder;
 import org.hibernate.spatial.testing.IsSupportedBySpatial;
 import org.hibernate.spatial.testing.SpatialSessionFactoryAware;
-import org.hibernate.spatial.testing.SpatialTestBase;
-import org.hibernate.spatial.testing.datareader.TestSupport;
 import org.hibernate.spatial.testing.domain.GeomEntity;
-import org.hibernate.spatial.testing.domain.JtsGeomEntity;
 import org.hibernate.spatial.testing.domain.SpatialDomainModel;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -28,14 +21,7 @@
 
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
-import org.geolatte.geom.G2D;
-import org.geolatte.geom.Polygon;
 
-import static org.geolatte.geom.builder.DSL.g;
-import static org.geolatte.geom.builder.DSL.polygon;
-import static org.geolatte.geom.builder.DSL.ring;
-import static org.geolatte.geom.crs.CoordinateReferenceSystems.WGS84;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @DomainModel(modelDescriptorClasses = SpatialDomainModel.class)
 @SessionFactory
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaTest.java
index a8e442558b22..a5efe47502ff 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/criteria/SpatialCriteriaTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration.criteria;
 
@@ -149,4 +147,3 @@ public Args(String method, String regex, Model model) {
 		}
 	}
 }
-
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/BasicFunctionTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/BasicFunctionTest.java
index 86d8ccad2581..c139c32f471a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/BasicFunctionTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/BasicFunctionTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.functions;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java
index da1f5feebb01..72456c202d6d 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/CommonFunctionTests.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.functions;
 
 import java.util.ArrayList;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java
index 82c55b78eb18..eaaeed2af482 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/FunctionTestTemplate.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.integration.functions;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/RowObjectMapper.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/RowObjectMapper.java
index 5768718527c5..b3854335ac7b 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/RowObjectMapper.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/RowObjectMapper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.integration.functions;
 
@@ -96,5 +94,3 @@ public String toString() {
 				'}';
 	}
 }
-
-
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestGeometryConstructionWithParameter.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestGeometryConstructionWithParameter.java
index bae9f90a12a4..b7890f35fc33 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestGeometryConstructionWithParameter.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestGeometryConstructionWithParameter.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.functions;
 
 import java.util.Arrays;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestTemplates.java
index 04ad56777f90..f5a778ddf91e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/functions/TestTemplates.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.integration.functions;
 
 import java.util.Map;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/package-info.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/package-info.java
index 48be9f6fb7c7..eb9cb5aedf9a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/package-info.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/package-info.java
@@ -9,4 +9,4 @@
  * This is the main test package. It contains all integration tests that should work  (basically) the same
  * across all supported dialects.
  */
-package org.hibernate.spatial.integration;
\ No newline at end of file
+package org.hibernate.spatial.integration;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/PredicateSmokeTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/PredicateSmokeTest.java
index 893992da3522..987883c0fce7 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/PredicateSmokeTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/PredicateSmokeTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.predicates;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTest.java
index 73927423b2af..fddf1f2dedf0 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.predicates;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestBindingMode.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestBindingMode.java
index 3b3c86f502de..3fb9525d4c0b 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestBindingMode.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestBindingMode.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.predicates;
 
 import java.util.stream.Stream;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestInlineMode.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestInlineMode.java
index 627a7fa43200..e8decf5ca3ec 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestInlineMode.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/predicates/SpatialPredicatesTestInlineMode.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.integration.predicates;
 
 import java.util.stream.Stream;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java
index a54f60b1cec5..bc22f7626241 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.mapping;
 
 import org.hibernate.annotations.JdbcTypeCode;
@@ -115,4 +112,4 @@ public void setLineString(Point location) {
 			this.location = location;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java
index f172d30306cf..31da3c05589e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.mapping;
 
 import org.hibernate.metamodel.mapping.ModelPart;
@@ -93,4 +90,4 @@ public void setLineString(MultiLineString lineString) {
 			this.lineString = lineString;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
index d7313e36d6df..7a576369e47d 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.lang.invoke.MethodHandles;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java
index 033771de5899..ee2ec9ddb6a6 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.util.Locale;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HSReflectionUtil.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HSReflectionUtil.java
index 6dde5c7e6ab0..1e5def448741 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HSReflectionUtil.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HSReflectionUtil.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.lang.reflect.Method;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/IsSupportedBySpatial.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/IsSupportedBySpatial.java
index 338d955769e2..25332108fa74 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/IsSupportedBySpatial.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/IsSupportedBySpatial.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import org.hibernate.dialect.CockroachDialect;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLStatement.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLStatement.java
index d73d63d477ed..c464ac478368 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLStatement.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLStatement.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.sql.Connection;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLTemplate.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLTemplate.java
index d8060efae627..80d12b734565 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLTemplate.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/NativeSQLTemplate.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.util.Locale;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunction.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunction.java
index 0702759ce562..5b2930a7638f 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunction.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunction.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.lang.annotation.ElementType;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunctionExtension.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunctionExtension.java
index 7b59a15ebcdc..1d57db533473 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunctionExtension.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/RequiresFunctionExtension.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.util.Locale;
 import java.util.Optional;
 
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
-import org.hibernate.spatial.contributor.SpatialFunctionContributor;
 
 import org.hibernate.testing.orm.junit.JUnitHelper;
 import org.hibernate.testing.orm.junit.SessionFactoryExtension;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
index e995641302f9..130f606f370a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java
index 11e583e7c552..92c709918d28 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialSessionFactoryAware.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import java.sql.Connection;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTest.java
index 2aa0c0f7f678..432adff0bc7c 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing;
 
@@ -35,93 +33,93 @@
 @Ignore
 public class SpatialTest extends BaseEntityManagerFunctionalTestCase {
 
-    private final GeometryFactory geometryFactory = new GeometryFactory();
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] {
-            Event.class,
-        };
-    }
-
-    @Test
-    public void test() {
-        Long addressId = doInJPA( this::entityManagerFactory, entityManager -> {
-            //tag::spatial-types-point-creation-example[]
-            Event event = new Event();
-            event.setId( 1L);
-            event.setName( "Hibernate ORM presentation");
-            Point point = geometryFactory.createPoint( new Coordinate( 10, 5 ) );
-            event.setLocation( point );
-
-            entityManager.persist( event );
-            //end::spatial-types-point-creation-example[]
-            return event.getId();
-        });
-
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            Event event = entityManager.find( Event.class, addressId);
-            Coordinate coordinate = event.getLocation().getCoordinate();
-            assertEquals( 10.0d, coordinate.getOrdinate( Coordinate.X), 0.1);
-            assertEquals( 5.0d, coordinate.getOrdinate( Coordinate.Y), 0.1);
-        });
-
-        doInJPA( this::entityManagerFactory, entityManager -> {
-            Coordinate [] coordinates = new Coordinate[] {
-                new Coordinate(1,1), new Coordinate(20,1), new Coordinate(20,20),
-                new Coordinate(1,20), new Coordinate(1,1)
-            };
-            //tag::spatial-types-query-example[]
-            Polygon window = geometryFactory.createPolygon( coordinates );
-            Event event = entityManager.createQuery(
-                "select e " +
-                "from Event e " +
-                "where within(e.location, :window) = true", Event.class)
-            .setParameter("window", window)
-            .getSingleResult();
-            //end::spatial-types-query-example[]
-            Coordinate coordinate = event.getLocation().getCoordinate();
-            assertEquals( 10.0d, coordinate.getOrdinate( Coordinate.X), 0.1);
-            assertEquals( 5.0d, coordinate.getOrdinate( Coordinate.Y), 0.1);
-        });
-    }
+	private final GeometryFactory geometryFactory = new GeometryFactory();
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+			Event.class,
+		};
+	}
+
+	@Test
+	public void test() {
+		Long addressId = doInJPA( this::entityManagerFactory, entityManager -> {
+			//tag::spatial-types-point-creation-example[]
+			Event event = new Event();
+			event.setId( 1L);
+			event.setName( "Hibernate ORM presentation");
+			Point point = geometryFactory.createPoint( new Coordinate( 10, 5 ) );
+			event.setLocation( point );
+
+			entityManager.persist( event );
+			//end::spatial-types-point-creation-example[]
+			return event.getId();
+		});
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Event event = entityManager.find( Event.class, addressId);
+			Coordinate coordinate = event.getLocation().getCoordinate();
+			assertEquals( 10.0d, coordinate.getOrdinate( Coordinate.X), 0.1);
+			assertEquals( 5.0d, coordinate.getOrdinate( Coordinate.Y), 0.1);
+		});
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Coordinate [] coordinates = new Coordinate[] {
+				new Coordinate(1,1), new Coordinate(20,1), new Coordinate(20,20),
+				new Coordinate(1,20), new Coordinate(1,1)
+			};
+			//tag::spatial-types-query-example[]
+			Polygon window = geometryFactory.createPolygon( coordinates );
+			Event event = entityManager.createQuery(
+				"select e " +
+				"from Event e " +
+				"where within(e.location, :window) = true", Event.class)
+			.setParameter("window", window)
+			.getSingleResult();
+			//end::spatial-types-query-example[]
+			Coordinate coordinate = event.getLocation().getCoordinate();
+			assertEquals( 10.0d, coordinate.getOrdinate( Coordinate.X), 0.1);
+			assertEquals( 5.0d, coordinate.getOrdinate( Coordinate.Y), 0.1);
+		});
+	}
 
 //tag::spatial-types-mapping-example[]
 @Entity(name = "Event")
 public static class Event {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    private String name;
+	private String name;
 
-    private Point location;
+	private Point location;
 
-    //Getters and setters are omitted for brevity
+	//Getters and setters are omitted for brevity
 //end::spatial-types-mapping-example[]
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Point getLocation() {
-        return location;
-    }
+	public Point getLocation() {
+		return location;
+	}
 
-    public void setLocation(Point location) {
-        this.location = location;
-    }
+	public void setLocation(Point location) {
+		this.location = location;
+	}
 //tag::spatial-types-mapping-example[]
 }
 //end::spatial-types-mapping-example[]
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTestBase.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTestBase.java
index 53f06587527c..e2ae1dd12dc2 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTestBase.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialTestBase.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import org.hibernate.spatial.testing.datareader.TestSupport;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java
index 7f4b750246ae..1b39f01ec6e9 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing;
 
 import org.hibernate.dialect.CockroachDialect;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverter.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverter.java
index 795b4428cca3..6fbdaeb5b803 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverter.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.converter;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
index 2d5cc42311b8..08ef7c76ead9 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.converter;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/MyEntity.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/MyEntity.java
index 0ffd2912ae27..0f45269eb9eb 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/MyEntity.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.converter;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestData.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestData.java
index 214651970246..7a9e079059d1 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestData.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestData.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.datareader;
 
 import java.util.Collection;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataElement.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataElement.java
index 4bca14887d95..e196de1bef92 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataElement.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataElement.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.datareader;
 
 /**
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataReader.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataReader.java
index 1771c6d3cdb6..e0e0ba1f4564 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataReader.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestDataReader.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.datareader;
 
 import java.io.InputStream;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestSupport.java
index 433759d2952f..266c549b0f92 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/datareader/TestSupport.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.datareader;
 
 import java.util.ArrayList;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/NativeSQLTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/NativeSQLTemplates.java
index 1a9a137783b4..a944624840aa 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/NativeSQLTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/NativeSQLTemplates.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.dialects;
 
 import java.util.Collections;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/PredicateRegexes.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/PredicateRegexes.java
index 9eed82165103..ae88f6959b7e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/PredicateRegexes.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/PredicateRegexes.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects;
 
 import java.util.HashMap;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/cockroachdb/CockroachDBTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/cockroachdb/CockroachDBTestSupport.java
index c2c4fa6b78ee..e6ba8b849ec5 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/cockroachdb/CockroachDBTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/cockroachdb/CockroachDBTestSupport.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.cockroachdb;
 
 import org.hibernate.spatial.GeomCodec;
-import org.hibernate.spatial.dialect.postgis.PGGeometryJdbcType;
 import org.hibernate.spatial.testing.datareader.TestData;
 import org.hibernate.spatial.testing.datareader.TestSupport;
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
@@ -43,4 +39,4 @@ public GeomCodec codec() {
 		return in -> (Geometry) in;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java
index 07f9f417ecd0..d6ce5e7314eb 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.dialects.db2;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2TestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2TestSupport.java
index b63ad828fce7..f743c8c68425 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2TestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2TestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.db2;
 
 import org.hibernate.spatial.testing.datareader.TestData;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GISExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GISExpectationsFactory.java
index 2bcbf34d02e7..8b2b7a528815 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GISExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GISExpectationsFactory.java
@@ -1,12 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
-/**
- *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.dialects.h2gis;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GisTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GisTestSupport.java
index b50d07c590f8..0aa32eae8a4e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GisTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2gis/H2GisTestSupport.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.h2gis;
 
 import java.util.Map;
 
 import org.hibernate.spatial.CommonSpatialFunction;
 import org.hibernate.spatial.GeomCodec;
-import org.hibernate.spatial.dialect.h2gis.H2GISWkb;
 import org.hibernate.spatial.testing.AbstractExpectationsFactory;
 import org.hibernate.spatial.testing.datareader.TestData;
 import org.hibernate.spatial.testing.datareader.TestSupport;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java
index 81ad8113431c..e4ac08a0605f 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.hana;
 
 import java.sql.SQLException;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANATestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANATestSupport.java
index 4a20f916e246..66879a831ecb 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANATestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANATestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.hana;
 
 import org.hibernate.spatial.testing.datareader.TestData;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java
index 5a9d019507f9..923ec7940f76 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.mariadb;
 
 import org.hibernate.spatial.testing.dialects.mysql.MySQL8ExpectationsFactory;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBTestSupport.java
index 53751db715fb..23f34d95d392 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBTestSupport.java
@@ -1,17 +1,13 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.mariadb;
 
 import java.util.Map;
 
 import org.hibernate.spatial.CommonSpatialFunction;
 import org.hibernate.spatial.GeomCodec;
-import org.hibernate.spatial.dialect.mysql.MySQLGeometryJdbcType;
 import org.hibernate.spatial.testing.datareader.TestData;
 import org.hibernate.spatial.testing.datareader.TestSupport;
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java
index 90ebc322e582..2c25ee7ce395 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.dialects.mysql;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8TestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8TestSupport.java
index 691e4b8e68e5..d2bc40da2e3e 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8TestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8TestSupport.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.dialects.mysql;
 
-import org.hibernate.spatial.testing.AbstractExpectationsFactory;
 import org.hibernate.spatial.testing.datareader.TestData;
 
 /**
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java
index 03c06d332844..2680278643be 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.mysql;
 
 import org.hibernate.spatial.testing.AbstractExpectationsFactory;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLTestSupport.java
index b88527c5e627..082e2b428614 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLTestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.mysql;
 
 
@@ -13,7 +10,6 @@
 
 import org.hibernate.spatial.CommonSpatialFunction;
 import org.hibernate.spatial.GeomCodec;
-import org.hibernate.spatial.dialect.mysql.MySQLGeometryJdbcType;
 import org.hibernate.spatial.testing.datareader.TestData;
 import org.hibernate.spatial.testing.datareader.TestSupport;
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySqlNativeSqlTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySqlNativeSqlTemplates.java
index 414434575a9b..435835a16825 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySqlNativeSqlTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySqlNativeSqlTemplates.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.mysql;
 
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OraclePredicateRegexes.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OraclePredicateRegexes.java
index d9edc894ad2b..618a223aeade 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OraclePredicateRegexes.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OraclePredicateRegexes.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.oracle;
 
 import org.hibernate.spatial.testing.dialects.PredicateRegexes;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDONativeSqlTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDONativeSqlTemplates.java
index bafc22bfbfb4..5653bc5d0569 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDONativeSqlTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDONativeSqlTemplates.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.oracle;
 
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDOTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDOTestSupport.java
index 32b2201111c0..ed801353654d 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDOTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSDOTestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.oracle;
 
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSTNativeSqlTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSTNativeSqlTemplates.java
index f3dc8b43ee13..6e8be334b83a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSTNativeSqlTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/OracleSTNativeSqlTemplates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.spatial.testing.dialects.oracle;
 
@@ -67,7 +65,7 @@ public OracleSTNativeSqlTemplates() {
 				"select id, ST_GEOMETRY(t.GEOM).ST_DISJOINT(ST_GEOMETRY.FROM_WKT(:filter, 4326)) as result from %s t"
 		);
 		sqls.put( ST_RELATE,
-				  "select id, ST_GEOMETRY(t.GEOM).st_relate(st_geometry.from_wkt(:filter, 4326), 'DETERMINE') as result from %s t" );
+				"select id, ST_GEOMETRY(t.GEOM).st_relate(st_geometry.from_wkt(:filter, 4326), 'DETERMINE') as result from %s t" );
 		sqls.put(
 				ST_TOUCHES,
 				"select id, ST_GEOMETRY(t.GEOM).ST_TOUCHES(ST_GEOMETRY.FROM_WKT(:filter, 4326)) as result from %s t"
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java
index ce5bba17e692..18aeee70816f 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.oracle;
 
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java
index da8c466ba914..bfee99abfbe3 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.oracle;
 
 import java.util.List;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisNativeSQLTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisNativeSQLTemplates.java
index d645a8fdd4df..398f757f0d36 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisNativeSQLTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisNativeSQLTemplates.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.postgis;
 
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
 
 public class PostgisNativeSQLTemplates extends NativeSQLTemplates {
-}
\ No newline at end of file
+}
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisTestSupport.java
index 08ee2c7f4466..d8c84a17c1ab 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/postgis/PostgisTestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.postgis;
 
 
@@ -13,7 +10,6 @@
 
 import org.hibernate.spatial.CommonSpatialFunction;
 import org.hibernate.spatial.GeomCodec;
-import org.hibernate.spatial.dialect.postgis.PGGeometryJdbcType;
 import org.hibernate.spatial.testing.datareader.TestData;
 import org.hibernate.spatial.testing.datareader.TestSupport;
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SQLServerTestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SQLServerTestSupport.java
index 177815d3d0d0..538743e37c6c 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SQLServerTestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SQLServerTestSupport.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.sqlserver;
 
 import java.util.List;
@@ -18,7 +15,6 @@
 import org.hibernate.spatial.testing.dialects.PredicateRegexes;
 
 import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.db.sqlserver.Decoders;
 
 /**
  * @author Karel Maesen, Geovise BVBA
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerNativeSqlTemplates.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerNativeSqlTemplates.java
index 0f4c81f3c4cf..30e40345ae72 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerNativeSqlTemplates.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerNativeSqlTemplates.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.sqlserver;
 
 import org.hibernate.spatial.testing.dialects.NativeSQLTemplates;
@@ -28,7 +25,6 @@
 import static org.hibernate.spatial.CommonSpatialFunction.ST_ISEMPTY;
 import static org.hibernate.spatial.CommonSpatialFunction.ST_ISSIMPLE;
 import static org.hibernate.spatial.CommonSpatialFunction.ST_OVERLAPS;
-import static org.hibernate.spatial.CommonSpatialFunction.ST_RELATE;
 import static org.hibernate.spatial.CommonSpatialFunction.ST_SRID;
 import static org.hibernate.spatial.CommonSpatialFunction.ST_SYMDIFFERENCE;
 import static org.hibernate.spatial.CommonSpatialFunction.ST_TOUCHES;
@@ -56,7 +52,7 @@ public SqlServerNativeSqlTemplates() {
 				"select id, geom.STIntersects(geometry::::STGeomFromText(:filter, 4326)) as result from %s"
 		);
 		sqls.put( ST_CROSSES,
-				  "select id, geom.STCrosses(geometry::::STGeomFromText(:filter, 4326)) as result from %s"
+				"select id, geom.STCrosses(geometry::::STGeomFromText(:filter, 4326)) as result from %s"
 		);
 		sqls.put( ST_CONTAINS, "select id, geom.STContains(geometry::::STGeomFromText(:filter, 4326)) as result from %s" );
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerPredicateRegexes.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerPredicateRegexes.java
index 94e419af78dd..b71f53cd8cc3 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerPredicateRegexes.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/sqlserver/SqlServerPredicateRegexes.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.dialects.sqlserver;
 
 import org.hibernate.spatial.testing.dialects.PredicateRegexes;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntity.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntity.java
index 076a3aabd5ca..f2953ae05b8a 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntity.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntity.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.domain;
 
 import jakarta.persistence.Entity;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntityLike.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntityLike.java
index d6b0d6926ce1..a45cd8e2fafd 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntityLike.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/GeomEntityLike.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.domain;
 
 /**
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/JtsGeomEntity.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/JtsGeomEntity.java
index 4ee7eefb04c8..3719827fefd3 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/JtsGeomEntity.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/JtsGeomEntity.java
@@ -1,17 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
- */
-
 package org.hibernate.spatial.testing.domain;
 
 import jakarta.persistence.Entity;
@@ -25,7 +15,6 @@
 import org.geolatte.geom.codec.WktDecoder;
 import org.geolatte.geom.jts.JTS;
 import org.locationtech.jts.geom.Geometry;
-import org.locationtech.jts.io.ParseException;
 
 import static org.hibernate.spatial.integration.DecodeUtil.getWktDecoder;
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/SpatialDomainModel.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/SpatialDomainModel.java
index 1afcdc0739cc..b74a99eb49c3 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/SpatialDomainModel.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/domain/SpatialDomainModel.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.spatial.testing.domain;
 
 import org.hibernate.testing.orm.domain.AbstractDomainModelDescriptor;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java
index 42e83d45811e..730f1b45d6ba 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java
index af5978d3c95e..fe354d220dcf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java b/hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java
index f8333728f942..9b20d3b8180a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
index 78fc47e0f762..28f1954992fd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java b/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java
index 1dc0739a0c99..fab585c793e5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
index 4ac20085c630..e1da3b241f50 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java
index 5c8065f5bc1a..692d660c0d9a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java
index 3623c23b25cc..df911f62cd23 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java
index 0382b38102ab..f475f1628383 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java
index 32520b191f70..925a5d766bdf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
index 0bc71ced1c58..14e946a826bc 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
 import java.util.Map;
 import java.util.Properties;
 
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.Environment;
 import org.hibernate.internal.util.PropertiesHelper;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java
index 837bfa136e8b..9b48ef485d9a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java
index 39a2c3a34343..6867835131f2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java
index 1f7b348bd373..f69a9107f5d7 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java
index 0c66838d338c..1efa3ba8b685 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java b/hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java
index f771e17a2ca0..6de5140c8f0a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.async;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java
index e91b45eac65f..f98bef6a7018 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.async;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java b/hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java
index c989c0268474..e74c56246482 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.async;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java
index ae6c231ce0a1..b1d8329d50e1 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
index 2b15c5137b74..e8a27766c79a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderAccessTestingImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderAccessTestingImpl.java
index d50bdfb41f77..b4c40ffb2599 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderAccessTestingImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderAccessTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderServiceTestingImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderServiceTestingImpl.java
index 3e1f9932f319..fa3ec4b3d21e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderServiceTestingImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ClassLoaderServiceTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/DialectFactoryTestingImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/DialectFactoryTestingImpl.java
index 44eab2ea7f38..1d1feebfa28c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/DialectFactoryTestingImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/DialectFactoryTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ExtraJavaServicesClassLoaderService.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ExtraJavaServicesClassLoaderService.java
index 70dbfc66c1c4..057d1495e5ef 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ExtraJavaServicesClassLoaderService.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ExtraJavaServicesClassLoaderService.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/JdbcConnectionAccessImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/JdbcConnectionAccessImpl.java
index de1fb8ba3565..e42a7841a80c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/JdbcConnectionAccessImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/JdbcConnectionAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/MetadataBuildingContextTestingImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/MetadataBuildingContextTestingImpl.java
index 1fea61d22f83..6aa9b6e955b8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/MetadataBuildingContextTestingImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/MetadataBuildingContextTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ServiceRegistryTestingImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ServiceRegistryTestingImpl.java
index 7808d46a65ec..655c5b511403 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/ServiceRegistryTestingImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/ServiceRegistryTestingImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.boot;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/BytecodeEnhancerRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/BytecodeEnhancerRunner.java
index dfdd5218d863..a8128f6c525e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/BytecodeEnhancerRunner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/BytecodeEnhancerRunner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
@@ -22,7 +20,6 @@
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 import org.hibernate.bytecode.enhance.spi.UnloadedClass;
 import org.hibernate.bytecode.enhance.spi.UnloadedField;
-import org.hibernate.cfg.Environment;
 
 import org.hibernate.testing.junit4.CustomRunner;
 import org.junit.runner.Runner;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelector.java
index 3ab99fbf4058..118941fcdc0c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelectors.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelectors.java
index c27b42e7e0f5..790674e8d529 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelectors.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassEnhancementSelectors.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassSelector.java
index 7a170473a7cd..2c2cbba1392c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ClassSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/CustomEnhancementContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/CustomEnhancementContext.java
index b8c8a1121f26..4f09c3b9ddf6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/CustomEnhancementContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/CustomEnhancementContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementOptions.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementOptions.java
index 7853126bec3b..401bf139ec49 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementOptions.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementOptions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementSelector.java
index 2a598c49846d..8e85783e6a2d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestContext.java
index cdcb80dd6f2f..6e54a78f534d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestUtils.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestUtils.java
index 0e250319d049..93689779c0d0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestUtils.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancerTestUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EverythingSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EverythingSelector.java
index f2249fcac9c1..b44508a47ad4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EverythingSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EverythingSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelector.java
index 93bbded1f20d..95424c9f098b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelectors.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelectors.java
index bf11867a7841..ac21ffd74f8b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelectors.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/ImplEnhancementSelectors.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelector.java
index b0deaf901598..5251d0912cbb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelectors.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelectors.java
index c4c611d4015f..a4224466449e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelectors.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageEnhancementSelectors.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageSelector.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageSelector.java
index 1983607848df..eee112430355 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageSelector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/PackageSelector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhanced.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhanced.java
index d5ce2703c856..582b8a848904 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhanced.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhanced.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementExtension.java
index d71ba8e4c1ed..5c4eb3152bf8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementPostDiscoveryFilter.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementPostDiscoveryFilter.java
index abb4b9662653..61319d6ad1e2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementPostDiscoveryFilter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/BytecodeEnhancementPostDiscoveryFilter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedClassUtils.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedClassUtils.java
index 78cda58e4530..8a7c046d611e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedClassUtils.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedClassUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension.engine;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedEngineDescriptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedEngineDescriptor.java
index e8e279614cdf..b0631063ecc0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedEngineDescriptor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedEngineDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension.engine;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
index 0ec122aae6b2..b496bd328ce5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.bytecode.enhancement.extension.engine;
 
@@ -24,7 +22,6 @@
 import java.util.function.Supplier;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java
index 4ca58d4ccf11..ec08d944e6e3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.byteman;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
index b2056d71153e..cef5ddd33f25 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cache;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
index 3fa69abff08c..c97382f0130c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cache;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/StrategyRegistrationProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/StrategyRegistrationProviderImpl.java
index fdd916d9cec5..9ab9d0f311ca 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/StrategyRegistrationProviderImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/StrategyRegistrationProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cache;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/AbstractMySQLDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/AbstractMySQLDatabaseCleaner.java
index c4620a4b3d6c..ff6e97c1fa44 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/AbstractMySQLDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/AbstractMySQLDatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DB2DatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DB2DatabaseCleaner.java
index e33f1169a5fb..a287a892b8c8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DB2DatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DB2DatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleaner.java
index c4c1750d0253..562541afe1c9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleanerContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleanerContext.java
index f9496a27405c..420486f0d928 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleanerContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/DatabaseCleanerContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/H2DatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/H2DatabaseCleaner.java
index 48011298bfc6..5528cae2f904 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/H2DatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/H2DatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
index b61fdd70d661..069d48d989ca 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MariaDBDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MariaDBDatabaseCleaner.java
index 4d69f0869953..7b5eeb39dd37 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MariaDBDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MariaDBDatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL5DatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL5DatabaseCleaner.java
index cdb436d836e6..06dff9956739 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL5DatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL5DatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL8DatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL8DatabaseCleaner.java
index bcb81fdca041..627f7d2af5fa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL8DatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/MySQL8DatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
index b130e04419fb..5e18988a80e8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/PostgreSQLDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/PostgreSQLDatabaseCleaner.java
index 1b78d36f78bf..a31f935266c8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/PostgreSQLDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/PostgreSQLDatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
index d149073c6f79..bc7228aa6ceb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.cleaner;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/common/connections/BaseTransactionIsolationConfigTest.java b/hibernate-testing/src/main/java/org/hibernate/testing/common/connections/BaseTransactionIsolationConfigTest.java
index 3a40e3b643d2..3a41c860a63d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/common/connections/BaseTransactionIsolationConfigTest.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/common/connections/BaseTransactionIsolationConfigTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.common.connections;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
index ba3859717a7a..a79107919812 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.env;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java b/hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java
index 62084d462926..3c7278d3e786 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.env;
 
 import java.util.function.BiConsumer;
 
 import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
 import org.hibernate.cfg.JdbcSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/AssignableMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/AssignableMatcher.java
index 97e36ef58117..03719578b14f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/AssignableMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/AssignableMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveContainsMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveContainsMatcher.java
index b43cae044194..30257d7df876 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveContainsMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveContainsMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveStartsWithMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveStartsWithMatcher.java
index 22f6990c3655..eb3692166dda 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveStartsWithMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CaseInsensitiveStartsWithMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionElementMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionElementMatcher.java
index b36925ca12e5..44ec339c85d4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionElementMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionElementMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionEmptinessMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionEmptinessMatcher.java
index 3ea1b21c66d0..c6972674c58e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionEmptinessMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionEmptinessMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionMatchers.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionMatchers.java
index 3bd856e2f3c7..c6d32b351ba2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionMatchers.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionMatchers.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionSizeMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionSizeMatcher.java
index 86ad25a10116..ce5b9354708b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionSizeMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/CollectionSizeMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/HasNullElementsMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/HasNullElementsMatcher.java
index d9613e777855..8e74d9c37195 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/HasNullElementsMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/HasNullElementsMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/InitializationCheckMatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/InitializationCheckMatcher.java
index 404b94ce58c3..66808d0f23cd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/InitializationCheckMatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/hamcrest/InitializationCheckMatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.hamcrest;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ConnectionProviderDelegate.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ConnectionProviderDelegate.java
index 0313caa1a045..f068d87b590c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ConnectionProviderDelegate.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ConnectionProviderDelegate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java
index 7d35a8847eaa..b286ff4e5bdf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/DataSourceStub.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcMocks.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcMocks.java
index fc074d76aeea..3570e9354edd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcMocks.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcMocks.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
@@ -15,7 +13,6 @@
 import java.sql.SQLException;
 
 import org.hibernate.engine.jdbc.env.spi.AnsiSqlKeywords;
-import org.hibernate.internal.util.StringHelper;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcProperties.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcProperties.java
index 96f0b476255c..04e6d008f48a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcProperties.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcProperties.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcSpies.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcSpies.java
index 6cf5eb03d1d5..bc7713bffc8f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcSpies.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/JdbcSpies.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ResultSetUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ResultSetUtil.java
index 3e52d7373b01..79bd0f8c307f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ResultSetUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/ResultSetUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLServerSnapshotIsolationConnectionProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLServerSnapshotIsolationConnectionProvider.java
index 9f25d207951b..8fc4ac56da53 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLServerSnapshotIsolationConnectionProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLServerSnapshotIsolationConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
index 85ced4b382b6..0f198c0cbc85 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInterceptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInterceptor.java
index eecb5d6eef38..a50f5057cdc6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInterceptor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInterceptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerConnectionProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerConnectionProviderImpl.java
index b23aa4502d40..b40e77f8c9bb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerConnectionProviderImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerTypeCacheClearingIntegrator.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerTypeCacheClearingIntegrator.java
index c68d74eafea2..66a980ff90b0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerTypeCacheClearingIntegrator.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerTypeCacheClearingIntegrator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakException.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakException.java
index cc3c9f3972bb..9919b7764ee6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakException.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakUtil.java
index babb2052d4ce..ab24f13bf67c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/ConnectionLeakUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
@@ -12,7 +10,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.hibernate.dialect.Dialect;
 
 import org.hibernate.testing.jdbc.JdbcProperties;
 import org.hibernate.testing.orm.junit.DialectContext;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/H2IdleConnectionCounter.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/H2IdleConnectionCounter.java
index c40e0fdf6186..a7d261356b3e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/H2IdleConnectionCounter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/H2IdleConnectionCounter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/IdleConnectionCounter.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/IdleConnectionCounter.java
index 23f44353b8bf..e1b7fe36a967 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/IdleConnectionCounter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/IdleConnectionCounter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/MySQLIdleConnectionCounter.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/MySQLIdleConnectionCounter.java
index b96ef3dbaacf..194d74f548ae 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/MySQLIdleConnectionCounter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/MySQLIdleConnectionCounter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/OracleIdleConnectionCounter.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/OracleIdleConnectionCounter.java
index 7b89c9cbf675..0b0b54ee9f7e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/OracleIdleConnectionCounter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/OracleIdleConnectionCounter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/PostgreSQLIdleConnectionCounter.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/PostgreSQLIdleConnectionCounter.java
index fa799ff91397..d6997bceb4f8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/PostgreSQLIdleConnectionCounter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/leak/PostgreSQLIdleConnectionCounter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jdbc.leak;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
index f90e6ad9ae9d..3678dfa5bd8f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jta;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
index c53db36bafdb..d633cbd0a585 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jta;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
index 485a7f946b6b..7734b3c8d579 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jta;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaTransactionCoordinatorBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaTransactionCoordinatorBuilder.java
index 73f43811bcc8..c7f95cf037e2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaTransactionCoordinatorBuilder.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaTransactionCoordinatorBuilder.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.jta;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
index 12b34a6c9786..5400defadd82 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
index 6507cf98c4b3..2a0ea410aed6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
@@ -59,7 +57,6 @@
 
 import static java.lang.Thread.currentThread;
 import static org.hibernate.internal.util.config.ConfigurationHelper.resolvePlaceHolders;
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.Assert.fail;
 
 /**
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
index 81fb152683a6..f923818271bd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
@@ -59,7 +57,6 @@
 
 import static java.lang.Thread.currentThread;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.hibernate.testing.util.ServiceRegistryUtil.serviceRegistryBuilder;
 import static org.junit.Assert.fail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
index 099807d5fec1..f6aee818de58 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
index 20c7c31603e7..978f0e2577e5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java
index 796509578c78..988f78225fdd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
index 84d179e85210..4325a5065157 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java
index 0c718be1ec89..36967c53f1d9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
index 507a8a36c2e1..da5587f1d965 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
@@ -14,7 +12,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
@@ -30,11 +27,9 @@
 import org.hibernate.testing.orm.junit.DialectContext;
 import org.hibernate.testing.orm.junit.DialectFilterExtension;
 import org.hibernate.testing.orm.junit.SkipForDialectGroup;
-import org.hibernate.testing.orm.junit.TestingUtil;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
index 9d3d64191cda..f73c2223e28e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
index 87148c4b2796..895721e22503 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
index 14b61ddf3bee..8ca04d1a57b4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java
index e0976d50e345..d23479d12235 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
@@ -11,11 +9,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
index 45d3f5f287b2..f38ea2ddcf42 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java
index a7126423d671..5f3c1cf45caf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.junit4;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java
index e41d3d55c2a6..87f9a540da34 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
index ba0e3e2500a4..047a8b073568 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogListener.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogListener.java
index 40f4e39d5375..afdcb3384bd4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogListener.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LoggerInspectionRule.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LoggerInspectionRule.java
index 1548e71baa70..a9cadc1d4f4f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LoggerInspectionRule.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LoggerInspectionRule.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
index dbdfe4334e21..d51989d9be74 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TriggerOnPrefixLogListener.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TriggerOnPrefixLogListener.java
index 37b73452b2dc..4a3bed3e3353 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TriggerOnPrefixLogListener.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TriggerOnPrefixLogListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Triggerable.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/Triggerable.java
index 7d11df943d72..fe294af6a145 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Triggerable.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/Triggerable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/JournalingGenerationTarget.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/JournalingGenerationTarget.java
index 0abb06505e8d..2185b75cb6aa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/JournalingGenerationTarget.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/JournalingGenerationTarget.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/UnclosedFixtureResourcesLogging.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/UnclosedFixtureResourcesLogging.java
index 9526ee1d41e5..9a83de314a97 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/UnclosedFixtureResourcesLogging.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/UnclosedFixtureResourcesLogging.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/assertj/HibernateInitializedCondition.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/assertj/HibernateInitializedCondition.java
index a3d8364835d5..1fb7b5601146 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/assertj/HibernateInitializedCondition.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/assertj/HibernateInitializedCondition.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.assertj;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/AbstractDomainModelDescriptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/AbstractDomainModelDescriptor.java
index f09692aecbae..a102dcbab35a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/AbstractDomainModelDescriptor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/AbstractDomainModelDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java
index 47ce3c7dd0d2..7288267372da 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java
index a5c225e1a52b..a5890eebd304 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java
index e983d3f9de37..3a028d671c13 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java
@@ -1,13 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain;
 
 import java.util.Locale;
-import javax.money.CurrencyUnit;
 import javax.money.Monetary;
 import javax.money.MonetaryAmount;
 import jakarta.persistence.AttributeConverter;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/StandardDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/StandardDomainModel.java
index 3c76dbd005fa..3a1e58c301d4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/StandardDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/StandardDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java
index c2d8c6789b3b..6bab1f838d1c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java
@@ -1,14 +1,10 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
 import jakarta.persistence.Embeddable;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 
 @Embeddable
 public class Address {
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java
index b63088a3fb05..7dce47da8ea9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/AnimalDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/AnimalDomainModel.java
index d8fdf2250f87..8e712fd82cfa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/AnimalDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/AnimalDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java
index 781c52f361b3..c9be6effd626 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Classification.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Classification.java
index 429f2b5c9cba..cfb090d731ee 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Classification.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Classification.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java
index b48061b3c792..46b378f79289 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java
index 75120a386afb..fb60640e5aef 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java
index 6a428d6eb74b..70008582ba07 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
@@ -11,7 +9,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -33,7 +30,7 @@ public class Human extends Mammal {
 	private Name name;
 	private String nickName;
 	private double heightInches;
-	
+
 	private BigInteger bigIntegerValue;
 	private BigDecimal bigDecimalValue;
 	private int intValue;
@@ -149,7 +146,7 @@ public void setPets(Collection pets) {
 	public Map getFamily() {
 		return family;
 	}
-	
+
 
 	public void setFamily(Map family) {
 		this.family = family;
@@ -165,6 +162,6 @@ public Map getAddresses() {
 	public void setAddresses(Map addresses) {
 		this.addresses = addresses;
 	}
-	
-	
+
+
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java
index 479feb842a8a..a4d880f654d6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java
index 90cfd44e4815..eb0b911abc0c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
@@ -30,7 +28,7 @@ public void setPregnant(boolean pregnant) {
 	public Date getBirthdate() {
 		return birthdate;
 	}
-	
+
 
 	public void setBirthdate(Date birthdate) {
 		this.birthdate = birthdate;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java
index b0422ee30f86..e7ebb5f2c200 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
@@ -14,9 +12,9 @@ public class Name {
 	private String first;
 	private Character initial;
 	private String last;
-	
+
 	public Name() {}
-	
+
 	public Name(String first, Character initial, String last) {
 		this.first = first;
 		this.initial = initial;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java
index a76c60cd6218..ddd83c8157cd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java
index 57d9b76f80a3..0cc8fb9961d3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java
index ef505a504461..cdbf6b02fa00 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java
index 4a6b1fc00d78..dd90e2861193 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java
@@ -1,14 +1,11 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.animal;
 
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.persistence.CollectionTable;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Embedded;
@@ -20,7 +17,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
-import jakarta.persistence.MapKey;
 import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.OneToMany;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java
index f2ce6e3f5601..e40b8857e4b6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.contacts;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java
index 0cf49ba89f37..4b443e15e307 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.contacts;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/ContactsDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/ContactsDomainModel.java
index 1c151a6503ba..0d0399b4fc6b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/ContactsDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/ContactsDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.contacts;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java
index 5ae077cba16c..005ed8c7e1fc 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.contacts;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java
index 43d28281a9d5..b6d4f9559ec0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java
index 0d5d0788513d..9ae8ec61f82e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java
index 67c91c31477e..5525fbbe3670 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java
index 4a3a7d39182c..fedef55d8860 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java
index 12ea1af4a415..db901ae15215 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
@@ -399,4 +397,3 @@ public Gender convertToEntityAttribute(Character dbData) {
 		}
 	}
 }
-
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java
index ad942b2ede1c..86a1fc7c0125 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfDynamicComponent.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfDynamicComponent.java
index 6aa5038c705b..22b75e68c33e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfDynamicComponent.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfDynamicComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java
index 9822d00f826c..75615eea3ed1 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java
index fcc55d6c7aa5..fca48fe2b38e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java
index 365e6a5f594d..e7b6ba6161fa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java
index ab033d7b9a6b..cf2d2ded22e3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java
index d51a4d3afdea..56474d308ae5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
@@ -92,4 +90,3 @@ public void setSomeInteger(Integer someInteger) {
 		this.someInteger = someInteger;
 	}
 }
-
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java
index 7d795f3bbdc6..3e9b72a6e2fe 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java
index 8fa4cc980534..bb4aa2ea5efd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java
index 175457913fba..38f9396f6732 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java
index d42ca1b4f459..7dddebe2bd7c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java
index 8d3b5d49f07d..4b064c1de5a8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java
index 363fbb829975..edce3bf7c8d8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java
index d86fe54ffba0..3a05c77513e0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java
index eff2c74b0b13..4946457c8431 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java
index 6fc3f1a945d4..27ff460a31a2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java
index 064532d3c077..d142c18251eb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java
index f2755b8fa7dc..f6bfdf5f1a9a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValue.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValue.java
index 06097cf6ec9d..8b999fe32a5f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValue.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java
index 8a7fb005a360..ef84be312b87 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/GambitDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/GambitDomainModel.java
index 966a29bebf5d..8615145e4c71 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/GambitDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/GambitDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/MutableValue.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/MutableValue.java
index b933fdbb0e3d..fcaabc6d285c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/MutableValue.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/MutableValue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java
index 2e75d1642481..2cbe4c543342 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleBasicSortComparator.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleBasicSortComparator.java
index 9849c3754e0a..bfc57047dd2f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleBasicSortComparator.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleBasicSortComparator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java
index d9b0b70b1236..b47d46e43765 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java
index 7eb354529d23..b7ba86855ff8 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/VersionedEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/VersionedEntity.java
index b5c394fd1c7d..b9badbd0fd18 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/VersionedEntity.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/VersionedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.gambit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java
index 5b55a6fb5abe..4bfc9daa4887 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.helpdesk;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/HelpDeskDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/HelpDeskDomainModel.java
index 632d7eefa6a0..e4e8d226a02b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/HelpDeskDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/HelpDeskDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.helpdesk;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java
index 9be9d3aa0a45..ca7a79a8c916 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.helpdesk;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Status.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Status.java
index 484a4c7aed34..2fccb8c9ccaf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Status.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Status.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.helpdesk;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java
index 4e13815151ad..41ba3950fca9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.helpdesk;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Book.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Book.java
index dd4f4e154c46..d90a412cd479 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Book.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Book.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.library;
 
@@ -12,10 +10,8 @@
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.Basic;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/LibraryDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/LibraryDomainModel.java
index 2026d74ffcec..0c2b55e2df87 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/LibraryDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/LibraryDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.library;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Person.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Person.java
index 31c645688749..98e1cfebcdfa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Person.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/library/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.library;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java
index e9c0152daab9..80511d2b72e3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java
index 8b7b79960e39..05007a6fa60a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java
index 9ecd9b184d90..e6cd852d44e0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java
index b6e85b9d52c1..a81a5f934f61 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java
index 73f6c10fe5d8..c001a657648f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java
index 7c3b7a4465af..9d2d0efde1f0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java
index 63aa53153aed..07581ace78cc 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java
index d99e993fadbf..647d463e4e2d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java
index 8d223eaf51e7..7054b8b6e92b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/RetailDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/RetailDomainModel.java
index 255f650ef0fa..f2a72f459d6a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/RetailDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/RetailDomainModel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java
index 512a6eb09750..2a4b92a165e3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java
index 574d7401040f..dfb08242aba0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.retail;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Account.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Account.java
index dd556c83d965..80f153e253ae 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Account.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Account.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/AddressType.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/AddressType.java
index 9aded56dfcc9..037cce7e922b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/AddressType.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/AddressType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Call.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Call.java
index 9b2fe2ee119a..d3299c448863 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Call.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Call.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/CreditCardPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/CreditCardPayment.java
index 4092996fc6ca..7f41d080acb2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/CreditCardPayment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/CreditCardPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Image.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Image.java
index 875a088c660b..3888893991a2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Image.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Image.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Partner.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Partner.java
index 96a562026ab0..c19fee67a1a5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Partner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Partner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Payment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Payment.java
index 2b33b3bb9622..dd9488d89a8c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Payment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Payment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
index 73950adcf539..0e05980cdbac 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonNames.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonNames.java
index 7492035e204e..a84b909e5eb3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonNames.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonNames.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonPhoneCount.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonPhoneCount.java
index 1edc0e0d6add..b670c0269570 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonPhoneCount.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PersonPhoneCount.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Phone.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Phone.java
index cfa5931ed23b..1418a315402f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Phone.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PhoneType.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PhoneType.java
index 9a4a6cc437a1..ed0f52efffeb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PhoneType.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/PhoneType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/UserguideDomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/UserguideDomainModel.java
index 65bdb4a012dc..7147384354aa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/UserguideDomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/UserguideDomainModel.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
-import org.hibernate.boot.MetadataSources;
 
 import org.hibernate.testing.orm.domain.AbstractDomainModelDescriptor;
 import org.hibernate.testing.orm.domain.userguide.tooling.Customer;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/WireTransferPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/WireTransferPayment.java
index 22a5f9ece4a2..c8c722abc830 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/WireTransferPayment.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/WireTransferPayment.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Customer.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Customer.java
index 5eccccf3fe91..ca8794e89b68 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Customer.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide.tooling;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Item.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Item.java
index f01cf46f3efe..4a6f1c88e8d4 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Item.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide.tooling;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Order.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Order.java
index b182218072c2..95a15d5b27fa 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Order.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/tooling/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.domain.userguide.tooling;
 
@@ -47,4 +45,3 @@ public Order(Integer id, Customer customer, BigDecimal totalCost) {
 //tag::tooling-modelgen-model[]
 }
 //end::tooling-modelgen-model[]
-
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProvider.java
index b6ff4106def9..3b9dcbd07934 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProviderSettingProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProviderSettingProvider.java
index 845bcd2021eb..a7ac14ab154d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProviderSettingProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/PreparedStatementSpyConnectionProviderSettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java
index f8afc173ca95..1db94fc34ecf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jdbc;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java
index fcefbca58fd6..e006470155c1 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java
index a8a778f30014..a9f7303efd23 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java
index 581a9b086943..1d2b2164c1d9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java
index 5efbf992b84a..0ab711fe9e13 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
@@ -160,4 +158,3 @@ public  T fromTransaction(EntityManager entityManager, Function.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpected.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpected.java
index 878158dfa434..afd4271dc36e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpected.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpected.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java
index 064eb077e895..49f6cfda9e53 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedGroup.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedGroup.java
index 96cf3850e9e0..493dba326d7b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedGroup.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FunctionalEntityManagerFactoryTesting.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FunctionalEntityManagerFactoryTesting.java
index 1258e713046e..089b381e355b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FunctionalEntityManagerFactoryTesting.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FunctionalEntityManagerFactoryTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsBagProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsBagProvider.java
index b7eb3f8837f2..0278788d5380 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsBagProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsBagProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsListProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsListProvider.java
index 985cb333e96f..9bcaf093c2c0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsListProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ImplicitListAsListProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java
index 1a69859717a8..8f007f4a2eb2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jira.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jira.java
index e2824d8b0f7f..e66ff90df5b6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jira.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jira.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraGroup.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraGroup.java
index fcc46ec3fabe..7a6e2e96cbff 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraGroup.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKey.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKey.java
index 01a495a6ae70..bf70d86c6bda 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKey.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKey.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKeyGroup.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKeyGroup.java
index 85106fb8571c..f0326c19fb3d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKeyGroup.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JiraKeyGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java
index 3433012b754b..c01217e1f2d5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Logger.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Logger.java
index fa8c714bed3e..ff07c2ecb672 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Logger.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Logger.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspections.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspections.java
index 95b469cac483..acdcefee87a3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspections.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspections.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsExtension.java
index 711ed7c6982f..0b122a335935 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScope.java
index 3ab2390754fb..b2cf26d26514 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScope.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScope.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScopeResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScopeResolver.java
index f7a473e91567..02bfeea6743d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScopeResolver.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/LoggingInspectionsScopeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspection.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspection.java
index 80220e93a1f7..5567e8074929 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspection.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspectionExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspectionExtension.java
index 1ae6aade4877..71d8d9eb9390 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspectionExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyInspectionExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcher.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcher.java
index 68e08b62aa0d..b827776c2b45 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcher.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherImpl.java
index a5e4f12c41d7..96c829eee987 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherResolver.java
index 3c07332e268d..d1996cb02f90 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherResolver.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/MessageKeyWatcherResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYet.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYet.java
index d30f6540957b..a9dc6c943d62 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYet.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetException.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetException.java
index de19ccdf3a53..271ca5c9bb86 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetException.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java
index 82367d4ae839..067bd30470fd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialect.java
index 9608c8e50f30..c0af3a53b95e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialect.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeature.java
index a437214175f0..67f8ccc8040f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeature.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeature.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeatureGroup.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeatureGroup.java
index 77341e7ffa05..d077e7d33590 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeatureGroup.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialectFeatureGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialects.java
index aee5be80a0a3..be11510ce48c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialects.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/RequiresDialects.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
@@ -25,4 +23,3 @@
 public @interface RequiresDialects {
 	RequiresDialect[] value();
 }
-
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
index 8d62639c2cf6..e94cd366acb0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
index e56cb9258720..a4cb86890cf7 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
@@ -17,7 +15,6 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Environment;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy;
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy;
@@ -27,7 +24,6 @@
 import org.hibernate.testing.boot.ExtraJavaServicesClassLoaderService;
 import org.hibernate.testing.boot.ExtraJavaServicesClassLoaderService.JavaServiceDescriptor;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
-import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryFunctionalTesting.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryFunctionalTesting.java
index 2483805941c4..c9b5f9771676 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryFunctionalTesting.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryFunctionalTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryParameterResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryParameterResolver.java
index 9a833928c5d7..14f9e3fe6f32 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryParameterResolver.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryParameterResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryProducer.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryProducer.java
index ff835136f7c8..7e3428fc3e65 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryProducer.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScope.java
index 0379a170a237..f2b1659e0437 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScope.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScope.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScopeAware.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScopeAware.java
index a0ae2ec4c707..c924b465a5d0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScopeAware.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryScopeAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactory.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactory.java
index 76b9e3a584c4..749e2fd64d25 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactory.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
index d9f0f1a6dd5a..c6cc74150ecd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryFunctionalTesting.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryFunctionalTesting.java
index 44ba4604ac39..5c90e7623bcd 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryFunctionalTesting.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryFunctionalTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryParameterResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryParameterResolver.java
index 6ee64636610d..820338fe4cbb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryParameterResolver.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryParameterResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryProducer.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryProducer.java
index 9a6d16c8cf7e..dd9890917ce0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryProducer.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryProducer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScope.java
index 272d799bf5e9..c3f437518665 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScope.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScope.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeAware.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeAware.java
index 6ac1dad4a372..dcdf673427f0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeAware.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeAware.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeParameterResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeParameterResolver.java
index a770ed34d57e..f056e9ea1145 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeParameterResolver.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScopeParameterResolver.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
-import java.util.Optional;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Setting.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Setting.java
index 76f5f0482234..d399218cba6d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Setting.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Setting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SettingProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SettingProvider.java
index 9e4ac9c658a2..bd8521ce82de 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SettingProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SettingProvider.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialect.java
index 3082ae5e43a7..1e333feec13c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialect.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialect.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialectGroup.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialectGroup.java
index 9de623d1bfa4..d41c358473c5 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialectGroup.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SkipForDialectGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/TestingUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/TestingUtil.java
index 60a1b431fb8d..3503a7336a32 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/TestingUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/TestingUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.junit;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java
index b27aa9e28641..958dee34c72e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.logger;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
index f5c7f04d8379..9d4c88449893 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.orm.transaction;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java
index 82cd048eae16..c191531bbe7a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.schema;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaCreateHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaCreateHelper.java
index 0795bbc8d2ff..96d56e666f24 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaCreateHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaCreateHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.schema;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaDropHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaDropHelper.java
index 569e76e3d18b..248662373302 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaDropHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaDropHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.schema;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaUpdateHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaUpdateHelper.java
index a482da10543e..493901ccb64c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaUpdateHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaUpdateHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.schema;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaValidateHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaValidateHelper.java
index c465debd376b..9e621baa122c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaValidateHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/SchemaValidateHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.schema;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java
index 1ce3ddc873d3..c58f57df410e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.transaction;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java
index 8f0c967944ee..a5629bc64b95 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.transaction;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java
index bf7bc2612c85..88e2d309ff77 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ReflectionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ReflectionUtil.java
index c75fb8270fc9..07434a468806 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ReflectionUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ReflectionUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java
index 878a8e48d6c2..68eb3d1ceb12 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java
index 5b4e6bceceae..5bcade8887ac 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java
index 5864303c4a5b..1f2e1fe6454b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java
index c2d5bdd81ca7..9e8be2200569 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java
index 7b05388a1aed..680b49e89e81 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java
@@ -1,32 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.jpa;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/IdGeneratorCreationContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/IdGeneratorCreationContext.java
index e3e16e342240..de9f576b144a 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/IdGeneratorCreationContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/IdGeneratorCreationContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.uuid;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGenerator.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGenerator.java
index dc70af21906c..a2ab4f54eacf 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGenerator.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGenerator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.uuid;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java
index 9c89b481411a..0ba200f1694d 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnotherEntity.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnotherEntity.java
index 114eda762328..54fbc6f5f090 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnotherEntity.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnotherEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations;
 
@@ -40,4 +38,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicEntityManagerFactoryScopeTests.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicEntityManagerFactoryScopeTests.java
index b212ed02b4ab..1193e9813b98 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicEntityManagerFactoryScopeTests.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicEntityManagerFactoryScopeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations;
 
@@ -33,4 +31,4 @@ public void testBasicUsage(EntityManagerFactoryScope scope) {
 		);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicSessionFactoryScopeTests.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicSessionFactoryScopeTests.java
index ac59bbb943be..b323160f2265 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicSessionFactoryScopeTests.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/BasicSessionFactoryScopeTests.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/DomainModelTesting.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/DomainModelTesting.java
index 3bba1a330eb4..8914b2733e45 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/DomainModelTesting.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/DomainModelTesting.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations.methods;
 
-import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.engine.config.spi.ConfigurationService;
 
 import org.hibernate.testing.annotations.AnEntity;
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/EntityManagerFactoryScopeTesting.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/EntityManagerFactoryScopeTesting.java
index 987daf33bd26..c9438c14ce64 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/EntityManagerFactoryScopeTesting.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/EntityManagerFactoryScopeTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations.methods;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/MoreEntityManagerFactoryScopeTesting.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/MoreEntityManagerFactoryScopeTesting.java
index cff21c9596cc..4abaaa8910c2 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/MoreEntityManagerFactoryScopeTesting.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/MoreEntityManagerFactoryScopeTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations.methods;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/ServiceRegistryTesting.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/ServiceRegistryTesting.java
index 200fbc04fe00..d7c41022c4e9 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/ServiceRegistryTesting.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/ServiceRegistryTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations.methods;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/SessionFactoryTesting.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/SessionFactoryTesting.java
index ad3e7f0aa49b..1f2fb4af2461 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/SessionFactoryTesting.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/SessionFactoryTesting.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.annotations.methods;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/package-info.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/package-info.java
index 87c697024506..9b63f0301086 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/package-info.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/methods/package-info.java
@@ -12,4 +12,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.testing.annotations.methods;
\ No newline at end of file
+package org.hibernate.testing.annotations.methods;
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
index 85c1569c92d7..e457fc29e74e 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
index e10507eaeb84..bf866c22fcfc 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.logger;
 
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGeneratorTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGeneratorTest.java
index 254482b0e474..eaa7df38a37a 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGeneratorTest.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/util/uuid/SafeRandomUUIDGeneratorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.testing.util.uuid;
 
diff --git a/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/StrategyRegistrationProviderImpl.java b/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/StrategyRegistrationProviderImpl.java
index ec7dbc64d941..cbac650b60b4 100644
--- a/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/StrategyRegistrationProviderImpl.java
+++ b/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/StrategyRegistrationProviderImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.oracleucp.internal;
 
@@ -17,7 +15,7 @@
 /**
  * Provides the {@link UCPConnectionProvider} to the
  * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
- * 
+ *
  */
 public class StrategyRegistrationProviderImpl implements StrategyRegistrationProvider {
 	private static final List REGISTRATIONS = Collections.singletonList(
@@ -37,4 +35,3 @@ public Iterable getStrategyRegistrations() {
 		return REGISTRATIONS;
 	}
 }
-
diff --git a/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/UCPConnectionProvider.java b/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/UCPConnectionProvider.java
index 00ef37d38156..def0fcecfe7e 100644
--- a/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/UCPConnectionProvider.java
+++ b/hibernate-ucp/src/main/java/org/hibernate/oracleucp/internal/UCPConnectionProvider.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.oracleucp.internal;
 
 import java.lang.reflect.Method;
@@ -67,20 +64,20 @@ public void configure(Map props) throws HibernateException {
 			throw new HibernateException( e );
 		}
 	}
-	
+
 	private void configureDataSource(PoolDataSource ucpDS, Properties ucpProps) {
-		
+
 		List methods = Arrays.asList(PoolDataSource.class.getDeclaredMethods());
-		
+
 		for(String propName : ucpProps.stringPropertyNames()) {
 			String value = ucpProps.getProperty(propName);
-	
+
 			final String methodName = "set" + propName.substring(0, 1).toUpperCase(Locale.ENGLISH) + propName.substring(1);
 			Method writeMethod = methods.stream().filter(m -> m.getName().equals(methodName) && m.getParameterCount() == 1).findFirst().orElse(null);
 			if (writeMethod == null) {
 				throw new RuntimeException("Property " + propName + " does not exist on target " + PoolDataSource.class);
 			}
-	
+
 			try {
 				Class paramClass = writeMethod.getParameterTypes()[0];
 				if (paramClass == int.class) {
@@ -96,7 +93,7 @@ else if (paramClass == String.class) {
 					writeMethod.invoke(ucpDS, value.toString());
 				}
 				else {
-					if(propName.equals("connectionProperties") || 
+					if(propName.equals("connectionProperties") ||
 						propName.equals("connectionFactoryProperties")) {
 							if (value != null) {
 								Properties connProps = new Properties();
@@ -126,11 +123,11 @@ else if (paramClass == String.class) {
 
 	private Properties getConfiguration(Map props) {
 		Properties ucpProps = new Properties();
-		
+
 		copyProperty( AvailableSettings.URL, props, "URL", ucpProps );
 		copyProperty( AvailableSettings.USER, props, "user", ucpProps );
 		copyProperty( AvailableSettings.PASS, props, "password", ucpProps );
-		
+
 		for ( Object keyo : props.keySet() ) {
 			if ( !(keyo instanceof String) ) {
 				continue;
@@ -140,10 +137,10 @@ private Properties getConfiguration(Map props) {
 				ucpProps.setProperty( key.substring( CONFIG_PREFIX.length() ), (String) props.get( key ) );
 			}
 		}
-		
+
 		return ucpProps;
 	}
-	
+
 	@SuppressWarnings("rawtypes")
 	private static void copyProperty(String srcKey, Map src, String dstKey, Properties dst) {
 		if ( src.containsKey( srcKey ) ) {
@@ -232,6 +229,5 @@ public void stop() {
 			}
 		}
 	}
-	
-}
 
+}
diff --git a/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPConnectionProviderTest.java b/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPConnectionProviderTest.java
index 0b3f2c91f018..33af5ce0de42 100644
--- a/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPConnectionProviderTest.java
+++ b/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPConnectionProviderTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.test.ucp;
 
 /*
diff --git a/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPTransactionIsolationConfigTest.java b/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPTransactionIsolationConfigTest.java
index a99c8baffba2..dc1d42d15177 100644
--- a/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPTransactionIsolationConfigTest.java
+++ b/hibernate-ucp/src/test/java/org/hibernate/test/ucp/UCPTransactionIsolationConfigTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.test.ucp;
 
 import org.hibernate.community.dialect.AltibaseDialect;
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/AbstractOracleVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/AbstractOracleVectorJdbcType.java
index f73cb049dd87..a6c3962448df 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/AbstractOracleVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/AbstractOracleVectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleByteVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleByteVectorJdbcType.java
index ed11b4dd2d5f..53037a66abfe 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleByteVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleByteVectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleDoubleVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleDoubleVectorJdbcType.java
index d32aa596dd83..e1a87dc97c77 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleDoubleVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleDoubleVectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleFloatVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleFloatVectorJdbcType.java
index 17e81b596715..93e70605366a 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleFloatVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleFloatVectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorFunctionContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorFunctionContributor.java
index 0b8aa0d3156b..99de4d8434ab 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorFunctionContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorFunctionContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorJdbcType.java
index 649626ee991d..deb70ecb4dc7 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorTypeContributor.java
index 37d4f8447207..3f8e8b8e98ad 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/OracleVectorTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorFunctionContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorFunctionContributor.java
index d6a294c3f8f3..1b15b01161eb 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorFunctionContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorFunctionContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorTypeContributor.java
index e09cb29de682..d18287cf8de5 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/PGVectorTypeContributor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java b/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java
index 9dd8d2874bb5..c183dd807c2f 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentTypeResolver.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentValidator.java b/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentValidator.java
index bf33ea46d1f4..ee3bc81d01d2 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentValidator.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/VectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/VectorJdbcType.java
index 4b3636c139ff..ac200ba51c26 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/VectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/VectorJdbcType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/OracleByteVectorTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/OracleByteVectorTest.java
index e26cc56f668d..f8765e1d258a 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/OracleByteVectorTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/OracleByteVectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/OracleDoubleVectorTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/OracleDoubleVectorTest.java
index ef482deac140..b97b7148ac8f 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/OracleDoubleVectorTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/OracleDoubleVectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/OracleFloatVectorTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/OracleFloatVectorTest.java
index c813479bd8a4..b454fa494d3d 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/OracleFloatVectorTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/OracleFloatVectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/OracleGenericVectorTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/OracleGenericVectorTest.java
index 3641398c4886..a014c97918ee 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/OracleGenericVectorTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/OracleGenericVectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/PGVectorTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/PGVectorTest.java
index 902c90b19431..67de8ea6b099 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/PGVectorTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/PGVectorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.vector;
 
diff --git a/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/StrategyRegistrationProviderImpl.java b/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/StrategyRegistrationProviderImpl.java
index afe4b31e97c8..fa81b948c44b 100644
--- a/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/StrategyRegistrationProviderImpl.java
+++ b/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/StrategyRegistrationProviderImpl.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.vibur.internal;
 
 import java.util.Collections;
@@ -17,7 +14,7 @@
 /**
  * Provides the {@link ViburDBCPConnectionProvider} to the
  * {@link org.hibernate.boot.registry.selector.spi.StrategySelector} service.
- * 
+ *
  * @author Simeon Malchev
  */
 public final class StrategyRegistrationProviderImpl implements StrategyRegistrationProvider {
diff --git a/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/ViburDBCPConnectionProvider.java b/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/ViburDBCPConnectionProvider.java
index e2aad4b54b42..6c88cdd7af39 100644
--- a/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/ViburDBCPConnectionProvider.java
+++ b/hibernate-vibur/src/main/java/org/hibernate/vibur/internal/ViburDBCPConnectionProvider.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.vibur.internal;
 
 import java.sql.Connection;
diff --git a/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java b/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java
index 4ac0db8853b9..168ad62970c1 100644
--- a/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java
+++ b/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java
@@ -1,10 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
 package org.hibernate.test.vibur;
 
 import org.hibernate.Session;
@@ -24,7 +21,6 @@
 import org.vibur.dbcp.stcache.StatementMethod;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import java.util.*;
 import java.util.concurrent.ConcurrentMap;
@@ -46,133 +42,133 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ViburDBCPConnectionProviderTest extends BaseCoreFunctionalTestCase {
 
-    private int poolMaxSize;
-    private int statementCacheMaxSize;
-
-    @Override
-    protected void configure(Configuration configuration) {
-        Properties properties = configuration.getProperties();
-        properties.put(CONNECTION_PROVIDER, ViburDBCPConnectionProvider.class);
-        properties.put(SHOW_SQL, Boolean.TRUE);
-        properties.put(FORMAT_SQL, Boolean.TRUE);
-
-        properties.put("hibernate.vibur.poolInitialSize", "1");
-        properties.put("hibernate.vibur.poolMaxSize", Integer.toString(poolMaxSize));
-        properties.put("hibernate.vibur.logQueryExecutionLongerThanMs", "100");
-        properties.put("hibernate.vibur.statementCacheMaxSize", Integer.toString(statementCacheMaxSize));
-    }
-
-    @Override
-    protected Class[] getAnnotatedClasses() {
-        return new Class[] { Actor.class };
-    }
-
-    public void setUpPoolAndDatabase(int poolMaxSize, int statementCacheMaxSize) {
-        this.poolMaxSize = poolMaxSize;
-        this.statementCacheMaxSize = statementCacheMaxSize;
-        buildSessionFactory();
-
-        doInHibernate(this::sessionFactory, session -> {
-            addDbRecord(session, 1L, "CHRISTIAN", "GABLE");
-            addDbRecord(session, 2L, "CHRISTIAN", "AKROYD");
-            addDbRecord(session, 3L, "CHRISTIAN", "NEESON");
-            addDbRecord(session, 4L, "CAMERON", "NEESON");
-            addDbRecord(session, 5L, "RAY", "JOHANSSON");
-        });
-    }
-
-    private static void addDbRecord(Session session, Long id, String firstName, String lastName) {
-        Actor actor = new Actor();
-        actor.setId( id );
-        actor.setFirstName(firstName);
-        actor.setLastName(lastName);
-        session.persist(actor);
-    }
-
-    @After
-    public void tearDown() {
-        releaseSessionFactory();
-    }
-
-    @Captor
-    private ArgumentCaptor key1, key2;
-    @Captor
-    private ArgumentCaptor val1;
-
-    @Test
-    public void testSelectStatementNoStatementsCache() {
-        setUpPoolAndDatabase(2, 0 /* disables the statements cache */ );
-
-        doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
-    }
-
-    @Test
-    public void testSelectStatementWithStatementsCache() {
-        setUpPoolAndDatabase(1, 10 /* statement cache is enabled */ );
-
-        ConnectionProvider cp = sessionFactory().getServiceRegistry().getService(ConnectionProvider.class);
-        ViburDBCPDataSource ds = ((ViburDBCPConnectionProvider) cp).getDataSource();
-
-        ConcurrentMap mockedStatementCache = mockStatementCache(ds);
-
-        doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
-
-        // We set above the poolMaxSize = 1, that's why the second session will get and use the same underlying connection.
-        doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
-
-        InOrder inOrder = inOrder(mockedStatementCache);
-        inOrder.verify(mockedStatementCache).get(key1.capture());
-        inOrder.verify(mockedStatementCache).putIfAbsent(same(key1.getValue()), val1.capture());
-        inOrder.verify(mockedStatementCache).get(key2.capture());
-
-        assertEquals(1, mockedStatementCache.size());
-        assertTrue(mockedStatementCache.containsKey(key1.getValue()));
-        assertEquals(key1.getValue(), key2.getValue());
-        assertEquals(AVAILABLE, val1.getValue().state().get());
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void executeAndVerifySelect(Session session) {
-        List list = session.createQuery("from Actor where firstName = ?1")
-                .setParameter(1, "CHRISTIAN").list();
-
-        Set expectedLastNames = new HashSet<>(Arrays.asList("GABLE", "AKROYD", "NEESON"));
-        assertEquals(expectedLastNames.size(), list.size());
-        for (Actor actor : list) {
-            assertTrue(expectedLastNames.remove(actor.getLastName()));
-        }
-    }
-
-    @Entity(name="Actor")
-    public static class Actor {
-        @Id
-        private Long id;
-
-        private String firstName;
-        private String lastName;
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getFirstName() {
-            return firstName;
-        }
-
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-
-        public String getLastName() {
-            return lastName;
-        }
-
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-    }
+	private int poolMaxSize;
+	private int statementCacheMaxSize;
+
+	@Override
+	protected void configure(Configuration configuration) {
+		Properties properties = configuration.getProperties();
+		properties.put(CONNECTION_PROVIDER, ViburDBCPConnectionProvider.class);
+		properties.put(SHOW_SQL, Boolean.TRUE);
+		properties.put(FORMAT_SQL, Boolean.TRUE);
+
+		properties.put("hibernate.vibur.poolInitialSize", "1");
+		properties.put("hibernate.vibur.poolMaxSize", Integer.toString(poolMaxSize));
+		properties.put("hibernate.vibur.logQueryExecutionLongerThanMs", "100");
+		properties.put("hibernate.vibur.statementCacheMaxSize", Integer.toString(statementCacheMaxSize));
+	}
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Actor.class };
+	}
+
+	public void setUpPoolAndDatabase(int poolMaxSize, int statementCacheMaxSize) {
+		this.poolMaxSize = poolMaxSize;
+		this.statementCacheMaxSize = statementCacheMaxSize;
+		buildSessionFactory();
+
+		doInHibernate(this::sessionFactory, session -> {
+			addDbRecord(session, 1L, "CHRISTIAN", "GABLE");
+			addDbRecord(session, 2L, "CHRISTIAN", "AKROYD");
+			addDbRecord(session, 3L, "CHRISTIAN", "NEESON");
+			addDbRecord(session, 4L, "CAMERON", "NEESON");
+			addDbRecord(session, 5L, "RAY", "JOHANSSON");
+		});
+	}
+
+	private static void addDbRecord(Session session, Long id, String firstName, String lastName) {
+		Actor actor = new Actor();
+		actor.setId( id );
+		actor.setFirstName(firstName);
+		actor.setLastName(lastName);
+		session.persist(actor);
+	}
+
+	@After
+	public void tearDown() {
+		releaseSessionFactory();
+	}
+
+	@Captor
+	private ArgumentCaptor key1, key2;
+	@Captor
+	private ArgumentCaptor val1;
+
+	@Test
+	public void testSelectStatementNoStatementsCache() {
+		setUpPoolAndDatabase(2, 0 /* disables the statements cache */ );
+
+		doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
+	}
+
+	@Test
+	public void testSelectStatementWithStatementsCache() {
+		setUpPoolAndDatabase(1, 10 /* statement cache is enabled */ );
+
+		ConnectionProvider cp = sessionFactory().getServiceRegistry().getService(ConnectionProvider.class);
+		ViburDBCPDataSource ds = ((ViburDBCPConnectionProvider) cp).getDataSource();
+
+		ConcurrentMap mockedStatementCache = mockStatementCache(ds);
+
+		doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
+
+		// We set above the poolMaxSize = 1, that's why the second session will get and use the same underlying connection.
+		doInHibernate(this::sessionFactory, ViburDBCPConnectionProviderTest::executeAndVerifySelect);
+
+		InOrder inOrder = inOrder(mockedStatementCache);
+		inOrder.verify(mockedStatementCache).get(key1.capture());
+		inOrder.verify(mockedStatementCache).putIfAbsent(same(key1.getValue()), val1.capture());
+		inOrder.verify(mockedStatementCache).get(key2.capture());
+
+		assertEquals(1, mockedStatementCache.size());
+		assertTrue(mockedStatementCache.containsKey(key1.getValue()));
+		assertEquals(key1.getValue(), key2.getValue());
+		assertEquals(AVAILABLE, val1.getValue().state().get());
+	}
+
+	@SuppressWarnings("unchecked")
+	private static void executeAndVerifySelect(Session session) {
+		List list = session.createQuery("from Actor where firstName = ?1")
+				.setParameter(1, "CHRISTIAN").list();
+
+		Set expectedLastNames = new HashSet<>(Arrays.asList("GABLE", "AKROYD", "NEESON"));
+		assertEquals(expectedLastNames.size(), list.size());
+		for (Actor actor : list) {
+			assertTrue(expectedLastNames.remove(actor.getLastName()));
+		}
+	}
+
+	@Entity(name="Actor")
+	public static class Actor {
+		@Id
+		private Long id;
+
+		private String firstName;
+		private String lastName;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+	}
 }
diff --git a/shared/config/checkstyle/checkstyle.xml b/shared/config/checkstyle/checkstyle.xml
index 0d52c8cde336..fba81710c8f2 100644
--- a/shared/config/checkstyle/checkstyle.xml
+++ b/shared/config/checkstyle/checkstyle.xml
@@ -11,8 +11,8 @@
     
 
     
-        
-        
+        
+        
     
 
     
diff --git a/spotless.license.java b/spotless.license.java
new file mode 100644
index 000000000000..31e0d64ef998
--- /dev/null
+++ b/spotless.license.java
@@ -0,0 +1,4 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java
index be405face839..295bd026ff80 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.enhance;
 
@@ -16,9 +14,7 @@
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 import org.hibernate.bytecode.enhance.spi.UnloadedClass;
 import org.hibernate.bytecode.enhance.spi.UnloadedField;
-import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.bytecode.spi.BytecodeProvider;
-import org.hibernate.cfg.Environment;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ColumnMetadata.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ColumnMetadata.java
index 244b90eedd40..9b610a91b45b 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ColumnMetadata.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ColumnMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 import java.sql.ResultSet;
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ConnectionHelper.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ConnectionHelper.java
index 86d18394f0ac..f4949043c7a7 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ConnectionHelper.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ConnectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 import java.sql.Connection;
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java
index 6e30a716b3a6..4705c1c86274 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java
index ca1822222775..a7ab291332b6 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java
index 656bac7bfbbf..ddb4e4af0f17 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadata.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadata.java
index 19b2b8e9b6da..a5a06bfcb798 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadata.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 import org.hibernate.mapping.Column;
@@ -69,7 +67,7 @@ public boolean matches(ForeignKey fk) {
 		}
 		return false;
 	}
-	
+
 	public String toString() {
 		return "ForeignKeyMetadata(" + name + ')';
 	}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportScriptException.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportScriptException.java
index 194cc8529caa..203338dfb6f1 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportScriptException.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportScriptException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.java
index 568892ddab74..3dbd3d4aa73f 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java
index c90aac24290f..8d0cc304f436 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/IndexMetadata.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/IndexMetadata.java
index aeb90384db67..a88e61927216 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/IndexMetadata.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/IndexMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 import java.sql.ResultSet;
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
index 2be139e93556..8d5e2d8b0b95 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java
index 51bee281716c..90026aa02d82 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
@@ -11,7 +9,7 @@
 /**
  * Class responsible for extracting SQL statements from import script. Supports instructions/comments and quoted
  * strings spread over multiple lines. Each statement must end with semicolon.
- * 
+ *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  *
  * @deprecated Use {@link MultiLineSqlScriptExtractor} instead
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
index a9dadbb38526..cc51d5e613a2 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java
index 6c1cae935c8b..aefe2aa774d7 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
index 18b482e6edb1..198144de9b2d 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommand.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommand.java
index 9b0ed995944c..e64a1a330749 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommand.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommand.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
index e1174829f60c..e1ec88c059ae 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
@@ -217,7 +215,7 @@ private void configure(StandardServiceRegistryBuilder registryBuilder) throws IO
 		else {
 			try (FileInputStream fip = new FileInputStream( propertiesFile )){
 				properties.load( fip );
-			} 
+			}
 		}
 
 		registryBuilder.applySettings( properties );
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
index 2a2caf89ee6c..a77f6a9ac151 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java
index ec5f66dd1425..5d1558d08d30 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java
index 1bcadba584c5..23e719a6059f 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java
index 243ccac08e9b..2205ff474dce 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java
index 0a9f9d38b96a..b2c2abfc7eaa 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
index b0d4e121dd5a..723c128c080b 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
index f8301ba87b12..98fd8fbfb3c6 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
index 311b4d79be54..918ef9faa9d1 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
index 8ebf54d81e13..1a3153ca6f5b 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.tool.hbm2ddl;
 
diff --git a/tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java b/tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java
index 2becb41c8aed..04c26425cf70 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.tooling.maven;
 
@@ -24,7 +22,6 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java
index a2b878a0c76b..185eb5d7a95e 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.tooling.maven;
 
 import jakarta.persistence.MappedSuperclass;
diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
index e5528229f9e6..6e2cd4940700 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.tooling.maven;
 
@@ -27,54 +25,54 @@
  */
 public class MavenEnhancePluginTest {
 
-    @Test
-    public void testEnhancePlugin() throws Exception {
-        File baseDir = new File("target/classes/java/test");
-        URL[] baseURLs = { baseDir.toURI().toURL() };
+	@Test
+	public void testEnhancePlugin() throws Exception {
+		File baseDir = new File("target/classes/java/test");
+		URL[] baseURLs = { baseDir.toURI().toURL() };
 
-        MavenEnhancePlugin plugin = new MavenEnhancePlugin();
+		MavenEnhancePlugin plugin = new MavenEnhancePlugin();
 
-        Map pluginContext = new HashMap<>();
-        pluginContext.put( "project", new MavenProject() );
+		Map pluginContext = new HashMap<>();
+		pluginContext.put( "project", new MavenProject() );
 
-        setVariableValueToObject( plugin, "pluginContext", pluginContext );
-        setVariableValueToObject( plugin, "buildContext", new DefaultBuildContext() );
+		setVariableValueToObject( plugin, "pluginContext", pluginContext );
+		setVariableValueToObject( plugin, "buildContext", new DefaultBuildContext() );
 
-        setVariableValueToObject( plugin, "base", baseDir.getAbsolutePath() );
-        setVariableValueToObject( plugin, "dir", baseDir.getAbsolutePath() );
-        setVariableValueToObject( plugin, "classNames", "" );
+		setVariableValueToObject( plugin, "base", baseDir.getAbsolutePath() );
+		setVariableValueToObject( plugin, "dir", baseDir.getAbsolutePath() );
+		setVariableValueToObject( plugin, "classNames", "" );
 
-        setVariableValueToObject( plugin, "failOnError", true );
-        setVariableValueToObject( plugin, "enableLazyInitialization", true );
-        setVariableValueToObject( plugin, "enableDirtyTracking", true );
-        setVariableValueToObject( plugin, "enableAssociationManagement", true );
-        setVariableValueToObject( plugin, "enableExtendedEnhancement", false );
+		setVariableValueToObject( plugin, "failOnError", true );
+		setVariableValueToObject( plugin, "enableLazyInitialization", true );
+		setVariableValueToObject( plugin, "enableDirtyTracking", true );
+		setVariableValueToObject( plugin, "enableAssociationManagement", true );
+		setVariableValueToObject( plugin, "enableExtendedEnhancement", false );
 
-        plugin.execute();
+		plugin.execute();
 
-        try ( URLClassLoader classLoader = new URLClassLoader( baseURLs , getClass().getClassLoader() ) ) {
+		try ( URLClassLoader classLoader = new URLClassLoader( baseURLs , getClass().getClassLoader() ) ) {
 
-            Assert.assertTrue( declaresManaged( classLoader.loadClass( ParentEntity.class.getName() ) ) );
-            Assert.assertTrue( declaresManaged( classLoader.loadClass( ChildEntity.class.getName() ) ) );
-            Assert.assertTrue( declaresManaged( classLoader.loadClass( TestEntity.class.getName() ) ) );
+			Assert.assertTrue( declaresManaged( classLoader.loadClass( ParentEntity.class.getName() ) ) );
+			Assert.assertTrue( declaresManaged( classLoader.loadClass( ChildEntity.class.getName() ) ) );
+			Assert.assertTrue( declaresManaged( classLoader.loadClass( TestEntity.class.getName() ) ) );
 
-        }
+		}
 
-    }
+	}
 
-    private void setVariableValueToObject( Object object, String variable, Object value ) throws IllegalAccessException {
-        Field field = ReflectionUtils.getFieldByNameIncludingSuperclasses( variable, object.getClass() );
-        field.setAccessible( true );
-        field.set( object, value );
-    }
+	private void setVariableValueToObject( Object object, String variable, Object value ) throws IllegalAccessException {
+		Field field = ReflectionUtils.getFieldByNameIncludingSuperclasses( variable, object.getClass() );
+		field.setAccessible( true );
+		field.set( object, value );
+	}
 
-    private boolean declaresManaged(Class clazz) {
-        for ( Class interfaceClazz : clazz.getInterfaces() ) {
-            if ( Managed.class.isAssignableFrom( interfaceClazz ) ) {
-                return true;
-            }
-        }
-        return false;
-    }
+	private boolean declaresManaged(Class clazz) {
+		for ( Class interfaceClazz : clazz.getInterfaces() ) {
+			if ( Managed.class.isAssignableFrom( interfaceClazz ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 }
diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java
index e5e3b830d33c..3027f694b058 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.tooling.maven;
 
 import jakarta.persistence.MappedSuperclass;
diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java
index 2d25cbc2b21c..e39e83be2195 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.tooling.maven;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/io/quarkus/hibernate/orm/panache/_PanacheEntity.java b/tooling/metamodel-generator/src/jakartaData/java/io/quarkus/hibernate/orm/panache/_PanacheEntity.java
index a589e30e2794..8f74b355e7e2 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/io/quarkus/hibernate/orm/panache/_PanacheEntity.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/io/quarkus/hibernate/orm/panache/_PanacheEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package io.quarkus.hibernate.orm.panache;
 
 // workaround until Quarkus is published with this class
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Author.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Author.java
index f7c4320bc9ed..39e612899c23 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Author.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.basic;
 
 import jakarta.persistence.Entity;
@@ -8,14 +12,13 @@
 
 @Entity
 public class Author {
-    @Id
-    String ssn;
-    String name;
+	@Id
+	String ssn;
+	String name;
 
 //    @Embedded
 //    Address address;
 
-    @ManyToMany
-    Set books;
+	@ManyToMany
+	Set books;
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Book.java
index f42428dc23b6..6b7c299ace38 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.basic;
 
 import jakarta.persistence.*;
@@ -10,30 +14,30 @@
 @Entity
 @Table(name = "books")
 public class Book {
-    @Id
-    String isbn;
+	@Id
+	String isbn;
 
-    @NaturalId
-    @Basic(optional = false)
-    String title;
+	@NaturalId
+	@Basic(optional = false)
+	String title;
 
-    @Basic(optional = false)
-    String text;
+	@Basic(optional = false)
+	String text;
 
-    @NaturalId
-    LocalDate publicationDate;
+	@NaturalId
+	LocalDate publicationDate;
 
-    @ManyToMany(mappedBy = "books")
-    Set authors;
+	@ManyToMany(mappedBy = "books")
+	Set authors;
 
-    BigDecimal price;
+	BigDecimal price;
 
-    int pages;
+	int pages;
 
-    public Book(String isbn, String title, String text) {
-        this.isbn = isbn;
-        this.title = title;
-        this.text = text;
-    }
-    Book() {}
-}
\ No newline at end of file
+	public Book(String isbn, String title, String text) {
+		this.isbn = isbn;
+		this.title = title;
+		this.text = text;
+	}
+	Book() {}
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
index 6b1a165e43d7..ce5123095ec3 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.basic;
 
 import jakarta.annotation.Nullable;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Concrete.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Concrete.java
index af416bc08fb0..f7152df41e7b 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Concrete.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Concrete.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.basic;
 
 import jakarta.data.repository.Repository;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java
index 5637f5977e5e..b627b99fc9ef 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/DataTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.basic;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/IdOperations.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/IdOperations.java
index 0525ad8632a7..df6383d074bf 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/IdOperations.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/IdOperations.java
@@ -1,17 +1,6 @@
-/**
- * Copyright (c) 2023,2024 Contributors to the Eclipse Foundation
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.basic;
 
@@ -24,17 +13,17 @@
 import jakarta.data.repository.Query;
 
 public interface IdOperations {
-    @Query("where id(this) between ?1 and ?2")
-    Stream findByIdBetween(long minimum, long maximum, Sort sort);
+	@Query("where id(this) between ?1 and ?2")
+	Stream findByIdBetween(long minimum, long maximum, Sort sort);
 
-    @Query("where id(this) >= ?1")
-    List findByIdGreaterThanEqual(long minimum,
-                                           Limit limit,
-                                           Order sorts);
+	@Query("where id(this) >= ?1")
+	List findByIdGreaterThanEqual(long minimum,
+										Limit limit,
+										Order sorts);
 
-    @Query("where id(this) > ?1")
-    T[] findByIdLessThan(long exclusiveMax, Sort primarySort, Sort secondarySort);
+	@Query("where id(this) > ?1")
+	T[] findByIdLessThan(long exclusiveMax, Sort primarySort, Sort secondarySort);
 
-    @Query("where id(this) <= ?1")
-    List findByIdLessThanEqual(long maximum, Order sorts);
-}
\ No newline at end of file
+	@Query("where id(this) <= ?1")
+	List findByIdLessThanEqual(long maximum, Order sorts);
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Thing.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Thing.java
index 5181e9babd35..5d97260d8420 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Thing.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/Thing.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.basic;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Address.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Address.java
index 3d251b593edf..260be9d2febf 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Address.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Author.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Author.java
index 36ec4eec320d..595c687e3bab 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Author.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.persistence.Basic;
@@ -9,15 +13,14 @@
 
 @Entity
 public class Author {
-    @Id
-    String ssn;
+	@Id
+	String ssn;
 
-    @Basic(optional = false)
-    String name;
+	@Basic(optional = false)
+	String name;
 
-    Address address;
+	Address address;
 
-    @ManyToMany
-    Set books;
+	@ManyToMany
+	Set books;
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Book.java
index e176e834f194..16144e9b220d 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.persistence.Basic;
@@ -16,44 +20,43 @@
 
 @Entity
 public class Book {
-    @Id
-    String isbn;
+	@Id
+	String isbn;
 
-    @NaturalId
-    String title;
+	@NaturalId
+	String title;
 
-    @NaturalId
-    LocalDate publicationDate;
+	@NaturalId
+	LocalDate publicationDate;
 
-    String text;
+	String text;
 
-    @Enumerated(EnumType.STRING)
-    @Basic(optional = false)
-    Type type = Type.Book;
+	@Enumerated(EnumType.STRING)
+	@Basic(optional = false)
+	Type type = Type.Book;
 
-    @ManyToOne(optional = false)
-    Publisher publisher;
+	@ManyToOne(optional = false)
+	Publisher publisher;
 
-    @ManyToMany(mappedBy = "books")
-    Set authors;
+	@ManyToMany(mappedBy = "books")
+	Set authors;
 
-    @Basic(optional = false)
-    int pages ;
+	@Basic(optional = false)
+	int pages ;
 
-    BigDecimal price;
-    BigInteger quantitySold;
+	BigDecimal price;
+	BigInteger quantitySold;
 
-    public Book(String isbn, String title, String text) {
-        this.isbn = isbn;
-        this.title = title;
-        this.text = text;
-    }
+	public Book(String isbn, String title, String text) {
+		this.isbn = isbn;
+		this.title = title;
+		this.text = text;
+	}
 
-    protected Book() {}
+	protected Book() {}
 
-    @Override
-    public String toString() {
-        return isbn + " : " + title + " [" + type + "]";
-    }
+	@Override
+	public String toString() {
+		return isbn + " : " + title + " [" + type + "]";
+	}
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Bookshop.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Bookshop.java
index e57f661dd380..3a9a56b321d1 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Bookshop.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Bookshop.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.data.repository.CrudRepository;
@@ -12,28 +16,28 @@
 
 @Repository
 public interface Bookshop extends CrudRepository {
-    @Find
-    @Transactional
-    List byPublisher(String publisher_name);
+	@Find
+	@Transactional
+	List byPublisher(String publisher_name);
 
-    @Query("select isbn where title like ?1 order by isbn")
-    String[] ssns(@NotBlank String title);
+	@Query("select isbn where title like ?1 order by isbn")
+	String[] ssns(@NotBlank String title);
 
-    @Query("select count(this) where title like ?1 order by isbn")
-    long count1(@NotNull String title);
+	@Query("select count(this) where title like ?1 order by isbn")
+	long count1(@NotNull String title);
 
-    @Query("select count(this) where this.title like ?1 order by this.isbn")
-    long count2(String title);
+	@Query("select count(this) where this.title like ?1 order by this.isbn")
+	long count2(String title);
 
-    @Query("select count(this)")
-    long countAll();
+	@Query("select count(this)")
+	long countAll();
 
-    @Query("where isbn in :isbns and type = Book")
-    List books(List isbns);
+	@Query("where isbn in :isbns and type = Book")
+	List books(List isbns);
 
-    @Query("delete from Book where type = org.hibernate.processor.test.data.eg.Type.Book")
-    long deleteAllBooks();
+	@Query("delete from Book where type = org.hibernate.processor.test.data.eg.Type.Book")
+	long deleteAllBooks();
 
-    @Query("delete from Book where type = Book and isbn in ?1")
-    int deleteBooks(List isbns);
+	@Query("delete from Book where type = Book and isbn in ?1")
+	int deleteBooks(List isbns);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java
index e5fb855b2773..a7b1373ddc9a 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/EgTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.eg;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Library.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Library.java
index 31664d723647..0f4c4d8f3be3 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Library.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Library.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.data.Limit;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publisher.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publisher.java
index 605abb4657e2..6b496706cad1 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publisher.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publisher.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.persistence.Basic;
@@ -9,11 +13,11 @@
 
 @Entity
 public class Publisher {
-    @Id long id;
+	@Id long id;
 
-    @Basic(optional = false)
-    String name;
+	@Basic(optional = false)
+	String name;
 
-    @OneToMany(mappedBy = "publisher")
-    Set books;
+	@OneToMany(mappedBy = "publisher")
+	Set books;
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publishers.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publishers.java
index 7b1e1548ce92..afd31990c001 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publishers.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Publishers.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 import jakarta.data.repository.BasicRepository;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Type.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Type.java
index 8f7dc2df8396..6cf44b409f82 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Type.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Type.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.eg;
 
 public enum Type { Book, Magazine, Journal }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Author.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Author.java
index f68d6fba6776..6ab887cb233b 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Author.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.namedquery;
 
 import jakarta.persistence.Entity;
@@ -8,14 +12,13 @@
 
 @Entity
 public class Author {
-    @Id
-    String ssn;
-    String name;
+	@Id
+	String ssn;
+	String name;
 
 //    @Embedded
 //    Address address;
 
-    @ManyToMany
-    Set books;
+	@ManyToMany
+	Set books;
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Book.java
index 660f9cf63064..538454d91c81 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.namedquery;
 
 import jakarta.persistence.Basic;
@@ -14,34 +18,34 @@
 @Entity
 @Table(name = "books")
 public class Book {
-    public enum Type { Book, Magazine, Journal }
+	public enum Type { Book, Magazine, Journal }
 
-    @Id
-    String isbn;
+	@Id
+	String isbn;
 
-    @NaturalId
-    @Basic(optional = false)
-    String title;
+	@NaturalId
+	@Basic(optional = false)
+	String title;
 
-    @Basic(optional = false)
-    String text;
+	@Basic(optional = false)
+	String text;
 
-    @NaturalId
-    LocalDate publicationDate;
+	@NaturalId
+	LocalDate publicationDate;
 
-    @ManyToMany(mappedBy = "books")
-    Set authors;
+	@ManyToMany(mappedBy = "books")
+	Set authors;
 
-    BigDecimal price;
+	BigDecimal price;
 
-    int pages;
+	int pages;
 
-    Type type;
+	Type type;
 
-    public Book(String isbn, String title, String text) {
-        this.isbn = isbn;
-        this.title = title;
-        this.text = text;
-    }
-    Book() {}
-}
\ No newline at end of file
+	public Book(String isbn, String title, String text) {
+		this.isbn = isbn;
+		this.title = title;
+		this.text = text;
+	}
+	Book() {}
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository$.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository$.java
index 6808a2e53e7b..1f49b891c607 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository$.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository$.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.namedquery;
 
 import jakarta.data.repository.Query;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository.java
index 0b231191c62a..c2fbbe9e2c31 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/BookAuthorRepository.java
@@ -1,30 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.namedquery;
 
-import jakarta.data.Limit;
-import jakarta.data.Order;
-import jakarta.data.Sort;
-import jakarta.data.page.CursoredPage;
-import jakarta.data.page.Page;
-import jakarta.data.page.PageRequest;
-import jakarta.data.repository.By;
-import jakarta.data.repository.Delete;
-import jakarta.data.repository.Find;
-import jakarta.data.repository.Insert;
-import jakarta.data.repository.OrderBy;
-import jakarta.data.repository.Param;
-import jakarta.data.repository.Query;
 import jakarta.data.repository.Repository;
-import jakarta.data.repository.Save;
-import jakarta.data.repository.Update;
-import org.hibernate.StatelessSession;
 import org.hibernate.processor.test.data.namedquery.Book.Type;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Stream;
 
 @Repository(dataStore = "myds")
 public interface BookAuthorRepository {
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java
index 4b3469917feb..4b5635a9a6a5 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/namedquery/NamedQueryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.namedquery;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/JakartaDataBookRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/JakartaDataBookRepository.java
index f88b3f527758..eff310699778 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/JakartaDataBookRepository.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/JakartaDataBookRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.quarkus;
 
 import java.util.List;
@@ -10,9 +14,9 @@
 
 @Repository
 public interface JakartaDataBookRepository extends CrudRepository {
-    @Find
-    public List findBook(String isbn);
+	@Find
+	public List findBook(String isbn);
 
-    @Query("WHERE isbn = :isbn")
-    public List hqlBook(String isbn);
+	@Query("WHERE isbn = :isbn")
+	public List hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/PanacheBook.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/PanacheBook.java
index 250e3ea732c6..9ec322a811f7 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/PanacheBook.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/PanacheBook.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.quarkus;
 
 import java.util.List;
@@ -12,14 +16,14 @@
 @Entity
 public class PanacheBook extends PanacheEntity {
 	public @NaturalId String isbn;
-    public @NaturalId String title;
-    public @NaturalId String author;
-    public String text;
-    public int pages;
-    
-    @Find
-    public static native List findBook(String isbn);
+	public @NaturalId String title;
+	public @NaturalId String author;
+	public String text;
+	public int pages;
 
-    @HQL("WHERE isbn = :isbn")
-    public static native List hqlBook(String isbn);
+	@Find
+	public static native List findBook(String isbn);
+
+	@HQL("WHERE isbn = :isbn")
+	public static native List hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java
index 6d46abddb6df..85f26d345a65 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/quarkus/QuarkusOrmPanacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.quarkus;
 
@@ -14,7 +12,6 @@
 import org.junit.jupiter.api.Assertions;
 
 import jakarta.inject.Inject;
-import jakarta.persistence.EntityManager;
 
 import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor;
 
@@ -34,7 +31,7 @@ public void testJakartaDataRepositoryMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( JakartaDataBookRepository.class ) );
 		Class repositoryClass = getMetamodelClassFor( JakartaDataBookRepository.class );
 		Assertions.assertNotNull( repositoryClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = repositoryClass.getSuperclass();
 		if ( superclass != null ) {
@@ -43,7 +40,7 @@ public void testJakartaDataRepositoryMetamodel() throws Exception {
 		Class[] interfaces = repositoryClass.getInterfaces();
 		Assertions.assertEquals( 1, interfaces.length );
 		Assertions.assertEquals( JakartaDataBookRepository.class.getName(), interfaces[0].getName() );
-		
+
 		// Annotated method generates an instance method
 		Method method = repositoryClass.getDeclaredMethod( "hqlBook", String.class );
 		Assertions.assertNotNull( method );
@@ -53,7 +50,7 @@ public void testJakartaDataRepositoryMetamodel() throws Exception {
 		method = repositoryClass.getDeclaredMethod( "findBook", String.class );
 		Assertions.assertNotNull( method );
 		Assertions.assertFalse( Modifier.isStatic( method.getModifiers() ) );
-		
+
 		// Make sure we have the proper constructor
 		Constructor constructor = repositoryClass.getDeclaredConstructor( StatelessSession.class );
 		Assertions.assertNotNull( constructor );
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Address.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Address.java
index 2a87457e66ac..42f1ab47dbbf 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Address.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Author.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Author.java
index 885f309bded9..e7d6b5aacbfa 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Author.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import jakarta.persistence.Basic;
@@ -9,15 +13,14 @@
 
 @Entity
 public class Author {
-    @Id
-    String ssn;
+	@Id
+	String ssn;
 
-    @Basic(optional = false)
-    String name;
+	@Basic(optional = false)
+	String name;
 
-    Address address;
+	Address address;
 
-    @ManyToMany
-    Set books;
+	@ManyToMany
+	Set books;
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Book.java
index 601e30ff625a..586c29781378 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import jakarta.persistence.Basic;
@@ -16,44 +20,43 @@
 
 @Entity
 public class Book {
-    @Id
-    String isbn;
+	@Id
+	String isbn;
 
-    @NaturalId
-    String title;
+	@NaturalId
+	String title;
 
-    @NaturalId
-    LocalDate publicationDate;
+	@NaturalId
+	LocalDate publicationDate;
 
-    String text;
+	String text;
 
-    @Enumerated(EnumType.STRING)
-    @Basic(optional = false)
+	@Enumerated(EnumType.STRING)
+	@Basic(optional = false)
 	Type type = Type.Book;
 
-    @ManyToOne(optional = false)
+	@ManyToOne(optional = false)
 	Publisher publisher;
 
-    @ManyToMany(mappedBy = "books")
-    Set authors;
+	@ManyToMany(mappedBy = "books")
+	Set authors;
 
-    @Basic(optional = false)
-    int pages ;
+	@Basic(optional = false)
+	int pages ;
 
-    BigDecimal price;
-    BigInteger quantitySold;
+	BigDecimal price;
+	BigInteger quantitySold;
 
-    public Book(String isbn, String title, String text) {
-        this.isbn = isbn;
-        this.title = title;
-        this.text = text;
-    }
+	public Book(String isbn, String title, String text) {
+		this.isbn = isbn;
+		this.title = title;
+		this.text = text;
+	}
 
-    protected Book() {}
+	protected Book() {}
 
-    @Override
-    public String toString() {
-        return isbn + " : " + title + " [" + type + "]";
-    }
+	@Override
+	public String toString() {
+		return isbn + " : " + title + " [" + type + "]";
+	}
 }
-
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library.java
index 9bfa76ce8653..73c3ddd6b4ca 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import io.smallrye.mutiny.Uni;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library2.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library2.java
index 010e28a36a6f..69e5835a9a15 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library2.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import io.smallrye.mutiny.Uni;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Publisher.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Publisher.java
index cadf16beaad9..4b741aca3cd3 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Publisher.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Publisher.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 import jakarta.persistence.Basic;
@@ -9,11 +13,11 @@
 
 @Entity
 public class Publisher {
-    @Id long id;
+	@Id long id;
 
-    @Basic(optional = false)
-    String name;
+	@Basic(optional = false)
+	String name;
 
-    @OneToMany(mappedBy = "publisher")
-    Set books;
+	@OneToMany(mappedBy = "publisher")
+	Set books;
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java
index 4e9e23aac8ab..fc921b682f78 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/ReactiveTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.reactive;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Type.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Type.java
index 1e4393b7675b..444a0e1bd649 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Type.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Type.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.reactive;
 
 public enum Type { Book, Magazine, Journal }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Book.java
index f34cf32c8945..b4315e821427 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao;
 
 import jakarta.persistence.Entity;
@@ -11,13 +15,13 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne
 	Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Repo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Repo.java
index 56dfca2fa8c3..2f9af9097bb1 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Repo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/Repo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao;
 
 import jakarta.data.repository.Repository;
@@ -5,6 +9,6 @@
 
 @Repository
 public interface Repo extends SuperRepo {
-    @Find
+	@Find
 	Book get(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepo.java
index b0b46467e4c2..8cab063a5b23 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao;
 
 import jakarta.data.repository.Repository;
@@ -9,9 +13,9 @@
 
 @Repository
 public interface SuperRepo {
-    @Find
-    List books1(@Pattern String title);
+	@Find
+	List books1(@Pattern String title);
 
-    @HQL("where title like :title")
-    List books2(String title);
+	@HQL("where title like :title")
+	List books2(String title);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java
index 26e7304ea00d..0b6b69255058 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/SuperRepoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.superdao;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Book.java
index d4fe275c97b3..80cb4a97520f 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Book.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao.generic;
 
 import jakarta.persistence.Entity;
@@ -11,13 +15,13 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne
 	Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Repo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Repo.java
index a034c373b750..ef4189f91570 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Repo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/Repo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao.generic;
 
 import jakarta.data.repository.Repository;
@@ -5,6 +9,6 @@
 
 @Repository
 public interface Repo extends SuperRepo {
-    @Find
+	@Find
 	Book get(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepo.java
index ade944a7ae0f..2616858b4dfe 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.superdao.generic;
 
 import jakarta.data.Order;
@@ -15,30 +19,30 @@
 
 public interface SuperRepo {
 
-    @Save
-     S save(S entity);
+	@Save
+	 S save(S entity);
 
-    @Save
-     List saveAll(List entities);
+	@Save
+	 List saveAll(List entities);
 
-    @Find
-    Optional findById(@By("#id") K id);
+	@Find
+	Optional findById(@By("#id") K id);
 
-    @Find
-    Optional findById2(@By("id(this)") K id);
+	@Find
+	Optional findById2(@By("id(this)") K id);
 
-    @Find
-    Stream findAll();
+	@Find
+	Stream findAll();
 
-    @Find
-    Page findAll(PageRequest pageRequest, Order order);
+	@Find
+	Page findAll(PageRequest pageRequest, Order order);
 
 //    @Delete
 //    void deleteById(@By("#id") K id);
 
-    @Delete
-    void delete(T entity);
+	@Delete
+	void delete(T entity);
 
-    @Delete
-    void deleteAll(List entities);
+	@Delete
+	void deleteAll(List entities);
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java
index 2d76c2676be1..019cbf49759e 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/superdao/generic/SuperRepoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.superdao.generic;
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersioned.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersioned.java
index 610c7efb6d6d..64f2449b557b 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersioned.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersioned.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.versioned;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersionedRepo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersionedRepo.java
index 11fb3fdddb68..558ba210a873 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersionedRepo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/SpecialVersionedRepo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.versioned;
 
 import jakarta.data.repository.Query;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/Versioned.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/Versioned.java
index 61405f61edab..53acb64e3e85 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/Versioned.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/Versioned.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.versioned;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedRepo.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedRepo.java
index df312b541573..53424b4da32b 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedRepo.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedRepo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.data.versioned;
 
 import jakarta.data.repository.Query;
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java
index fbfc622cc3ee..d5ff99c0dace 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/versioned/VersionedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.data.versioned;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
index 68560a5f3908..8cee67fb0cbc 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.jpamodelgen;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
index fc24d625f027..eba11c574cda 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ContainsAttributeTypeVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ContainsAttributeTypeVisitor.java
index 5f346bd8310b..02ab189b87cd 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ContainsAttributeTypeVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ContainsAttributeTypeVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
index 8e07e96c8948..645aad847523 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
index 0dc7b23fdd45..eb95f6b36273 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
index 8fa7353ac28a..ef37e18dd3b6 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/MetaModelGenerationException.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/MetaModelGenerationException.java
index c41f660a0c77..7c99c6a075a4 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/MetaModelGenerationException.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/MetaModelGenerationException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ProcessLaterException.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ProcessLaterException.java
index 65a795d0ada0..4ea4cec6f4e1 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ProcessLaterException.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ProcessLaterException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Version.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Version.java
index 5a437c75af5e..747f39df6ca9 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Version.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Version.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
index 2d201cadbb05..05a1421e338d 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
index ceca811d4091..0a3ff3b9808b 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
index 4cba640def13..5a5d8c94cc7d 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
index c98e4fd6e0ca..9801484403da 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
index 276af407c7d8..4de91ab5b021 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaAttribute.java
index 6d73ac4d6b64..de1f00c2d834 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaCollection.java
index 48c1c402ec47..ccdb5a9234df 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaCollection.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
index 4b2349e69c20..2cdd8f003ca8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
@@ -738,7 +736,7 @@ private String setupQuarkusDaoConstructor() {
 							name,
 							sessionType,
 							getSessionVariableName( sessionType ),
-							dataStore(), 
+							dataStore(),
 							context.addInjectAnnotation(),
 							context.addNonnullAnnotation(),
 							false,
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaMap.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaMap.java
index a9ef58c8944e..2995eda1b4d0 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaMap.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaPackage.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaPackage.java
index 07a2da3b27bd..2ea02569cbb8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaPackage.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaPackage.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaSingleAttribute.java
index 10f7d2f44cf2..c51ff79f5b1a 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaSingleAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaSingleAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaType.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaType.java
index be46b5fd7732..4c6b61ff954e 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaType.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
index a47c29d82537..dbaaa03dcbf3 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaFinderMethod.java
index 5749f4be4cf6..3e83f3fde1a0 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaFinderMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaFinderMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataAnnotationMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataAnnotationMetaAttribute.java
index bb40148b3cc1..894dea8e464b 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataAnnotationMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataAnnotationMetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataMetaAttributeGenerationVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataMetaAttributeGenerationVisitor.java
index c28cf87ae85f..ec27636eb0ee 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataMetaAttributeGenerationVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataMetaAttributeGenerationVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
@@ -95,4 +93,3 @@ else if ( isBasicAttribute( element, returnedElement, context ) ) {
 				: null;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
index c41b5c574186..9e512a0759eb 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
index e4e354f9f96c..f305974e5735 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/IdFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/IdFinderMethod.java
index c31978e0e466..328ed90cc842 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/IdFinderMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/IdFinderMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
index 12a867fc68a1..b49ba852800c 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/MetaAttributeGenerationVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/MetaAttributeGenerationVisitor.java
index a541d29ab2ad..37617abdb5fe 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/MetaAttributeGenerationVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/MetaAttributeGenerationVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
@@ -194,4 +192,3 @@ private String getElementType(DeclaredType declaredType, @Nullable String target
 	}
 
 }
-
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java
index b2aa1872f46e..9d687e614af7 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NamedQueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NamedQueryMethod.java
index 3997d80a9cb9..10f3bb7b4871 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NamedQueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NamedQueryMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NaturalIdFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NaturalIdFinderMethod.java
index 368340c4e9da..ed3371c34eab 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NaturalIdFinderMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NaturalIdFinderMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/OrderBy.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/OrderBy.java
index c2fb19a764d2..934ef971aaeb 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/OrderBy.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/OrderBy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
index 139bcdfd61e6..9f51406fdf92 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
index cf285b697d5b..c49a7e2e33f1 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.annotation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/ImportContext.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/ImportContext.java
index 9499656e6137..6e652ea63403 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/ImportContext.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/ImportContext.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.model;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaAttribute.java
index 2fb1ee5d9083..f5002da40154 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.model;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaCollection.java
index d57424a89eaa..4d86354d3cc5 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaCollection.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.model;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaSingleAttribute.java
index 56c072524276..7889ca0518a8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaSingleAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/MetaSingleAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.model;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/Metamodel.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/Metamodel.java
index 31c04f6f9898..2b4273c586ce 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/Metamodel.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/model/Metamodel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.model;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/AccessTypeInformation.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/AccessTypeInformation.java
index 54409b692ebe..33af89ba0d06 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/AccessTypeInformation.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/AccessTypeInformation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/BasicAttributeVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/BasicAttributeVisitor.java
index c6b026986425..7878e7208157 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/BasicAttributeVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/BasicAttributeVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/Constants.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/Constants.java
index 1fa6632df54c..2a4bd1ade2aa 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/Constants.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/Constants.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
index 96a67be01a74..659ddce6acd7 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/NullnessUtil.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/NullnessUtil.java
index 9326494431e3..016a8659dcfd 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/NullnessUtil.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/NullnessUtil.java
@@ -1,26 +1,6 @@
 /*
- * Checker Framework utilities
- * Copyright 2004-present by the Checker Framework developers
- *
- * MIT License:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/StringUtil.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/StringUtil.java
index 1d6160635bbe..8240c8ce0e0a 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/StringUtil.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/StringUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeRenderingVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeRenderingVisitor.java
index ff4327350066..5654d3c53147 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeRenderingVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeRenderingVisitor.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
index fdc79bc42450..598813de934d 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/ContextProvidingValidationEventHandler.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/ContextProvidingValidationEventHandler.java
index 9c7404502cba..235a33aeb0b6 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/ContextProvidingValidationEventHandler.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/ContextProvidingValidationEventHandler.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/JpaNamespaceTransformingEventReader.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/JpaNamespaceTransformingEventReader.java
index de73454e63c6..7535bfc9e6f2 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/JpaNamespaceTransformingEventReader.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/JpaNamespaceTransformingEventReader.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParserHelper.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParserHelper.java
index e0dceb9bc8e3..84726dc265c9 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParserHelper.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParserHelper.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParsingException.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParsingException.java
index a2e1f4e17e23..ade786a59911 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParsingException.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/xml/XmlParsingException.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.util.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java
index d5cbe135c747..da55e98266c8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java
index a533eb72c714..15156a900219 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockJdbcServicesInitiator.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockJdbcServicesInitiator.java
index b4ecca169add..b66487cbc103 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockJdbcServicesInitiator.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockJdbcServicesInitiator.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
index 54e93ba116e1..9dd39a1ecf5b 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
@@ -66,7 +64,6 @@
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
-import org.hibernate.metamodel.model.domain.SimpleDomainType;
 import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
 import org.hibernate.metamodel.model.domain.internal.AbstractAttribute;
 import org.hibernate.metamodel.model.domain.internal.AbstractPluralAttribute;
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Mocker.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Mocker.java
index 37e29bf78f1f..b218f7ed5d68 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Mocker.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Mocker.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
index a48356b82ed9..42aa53ee1404 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
index e7950308d085..ee67b2ee8949 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.validation;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/package-info.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/package-info.java
index e4943106a88f..2e109fb9a5c8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/package-info.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/package-info.java
@@ -6,7 +6,7 @@
  */
 /**
  * Validation for HQL queries.
- * 
+ *
  * @see org.hibernate.processor.validation.Validation#validate
  */
 package org.hibernate.processor.validation;
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
index db930c1372ee..3e19e8a56318 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/ResourceStreamLocatorImpl.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/ResourceStreamLocatorImpl.java
index 94d51dd1f2fb..a5559903f31f 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/ResourceStreamLocatorImpl.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/ResourceStreamLocatorImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaAttribute.java
index 8b6f4871ae0b..460ba1e5ef55 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaCollection.java
index fa7d18c0d872..4dd34fc8c1c5 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaCollection.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaCollection.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaEntity.java
index 2893c686e335..c1e58085620b 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaEntity.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaMap.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaMap.java
index 382db2f57f21..b4699a5d5a60 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaMap.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaMap.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaSingleAttribute.java
index 5d402b911646..56978ede1051 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaSingleAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/XmlMetaSingleAttribute.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.xml;
 
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/io/quarkus/hibernate/reactive/panache/_PanacheEntity.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/io/quarkus/hibernate/reactive/panache/_PanacheEntity.java
index acb70db54720..4a527e48b331 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/io/quarkus/hibernate/reactive/panache/_PanacheEntity.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/io/quarkus/hibernate/reactive/panache/_PanacheEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package io.quarkus.hibernate.reactive.panache;
 
 // workaround until Quarkus is published with this class
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/BookRepositoryWithSession.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/BookRepositoryWithSession.java
index 35cfe093222e..affc428cb341 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/BookRepositoryWithSession.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/BookRepositoryWithSession.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hrPanache;
 
 import java.util.List;
@@ -9,11 +13,11 @@
 import io.smallrye.mutiny.Uni;
 
 public interface BookRepositoryWithSession {
-	
+
 	public default Uni mySession() {
 		return SessionOperations.getSession();
 	}
-	
-    @Find
-    public Uni> findBook(String isbn);
+
+	@Find
+	public Uni> findBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/JakartaDataBookRepository.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/JakartaDataBookRepository.java
deleted file mode 100644
index bf7cb858b2c5..000000000000
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/JakartaDataBookRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Not supported yet: https://hibernate.atlassian.net/browse/HHH-17960
-//package org.hibernate.processor.test.hrPanache;
-//
-//import java.util.List;
-//
-//import org.hibernate.reactive.mutiny.Mutiny;
-//
-//import io.smallrye.mutiny.Uni;
-//import jakarta.data.repository.CrudRepository;
-//import jakarta.data.repository.Find;
-//import jakarta.data.repository.Query;
-//import jakarta.data.repository.Repository;
-//
-//@Repository
-//public interface JakartaDataBookRepository extends CrudRepository {
-//	
-//	public Uni session();
-//	
-//    @Find
-//    public Uni> findBook(String isbn);
-//
-//    @Query("WHERE isbn = :isbn")
-//    public Uni> hqlBook(String isbn);
-//}
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBook.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBook.java
index 76de6af797ca..d52df243ce37 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBook.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBook.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hrPanache;
 
 import java.util.List;
@@ -13,14 +17,14 @@
 @Entity
 public class PanacheBook extends PanacheEntity {
 	public @NaturalId String isbn;
-    public @NaturalId String title;
-    public @NaturalId String author;
-    public String text;
-    public int pages;
-    
-    @Find
-    public static native Uni> findBook(String isbn);
+	public @NaturalId String title;
+	public @NaturalId String author;
+	public String text;
+	public int pages;
 
-    @HQL("WHERE isbn = :isbn")
-    public static native Uni> hqlBook(String isbn);
+	@Find
+	public static native Uni> findBook(String isbn);
+
+	@HQL("WHERE isbn = :isbn")
+	public static native Uni> hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBookRepository.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBookRepository.java
index cb0f3658c562..0b338cbb7e23 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBookRepository.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/PanacheBookRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hrPanache;
 
 import java.util.List;
@@ -11,9 +15,9 @@
 
 @ApplicationScoped
 public class PanacheBookRepository implements PanacheRepository {
-    @Find
-    public native Uni> findBook(String isbn);
+	@Find
+	public native Uni> findBook(String isbn);
 
-    @HQL("WHERE isbn = :isbn")
-    public native Uni> hqlBook(String isbn);
+	@HQL("WHERE isbn = :isbn")
+	public native Uni> hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusBookRepository.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusBookRepository.java
index 175d07b796ea..c45653ccd11e 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusBookRepository.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusBookRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hrPanache;
 
 import java.util.List;
@@ -8,15 +12,15 @@
 import io.smallrye.mutiny.Uni;
 
 public interface QuarkusBookRepository {
-    @Find
-    public Uni> findBook(String isbn);
+	@Find
+	public Uni> findBook(String isbn);
 
-    @HQL("WHERE isbn = :isbn")
-    public Uni> hqlBook(String isbn);
+	@HQL("WHERE isbn = :isbn")
+	public Uni> hqlBook(String isbn);
 
-    @HQL("DELETE FROM PanacheBook")
-    public Uni deleteAllBooksVoid();
+	@HQL("DELETE FROM PanacheBook")
+	public Uni deleteAllBooksVoid();
 
-    @HQL("DELETE FROM PanacheBook")
-    public Uni deleteAllBooksInt();
+	@HQL("DELETE FROM PanacheBook")
+	public Uni deleteAllBooksInt();
 }
diff --git a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java
index 2686a84a1fa2..fe43085f9a94 100644
--- a/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java
+++ b/tooling/metamodel-generator/src/quarkusHrPanache/java/org/hibernate/processor/test/hrPanache/QuarkusHrPanacheTest.java
@@ -1,12 +1,9 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.hrPanache;
 
-import org.hibernate.StatelessSession;
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.TestUtil;
 import org.hibernate.processor.test.util.WithClasses;
@@ -14,7 +11,6 @@
 import org.junit.jupiter.api.Assertions;
 
 import io.smallrye.mutiny.Uni;
-import jakarta.inject.Inject;
 
 import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor;
 
@@ -33,13 +29,13 @@ public void testPanacheEntityMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBook.class ) );
 		Class entityClass = getMetamodelClassFor( PanacheBook.class );
 		Assertions.assertNotNull( entityClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = entityClass.getSuperclass();
 		if ( superclass != null ) {
 			Assertions.assertEquals( "io.quarkus.hibernate.reactive.panache.PanacheEntity_", superclass.getName() );
 		}
-		
+
 		// Panache static native method generates a static method
 		Method method = entityClass.getDeclaredMethod( "hqlBook", Uni.class, String.class );
 		Assertions.assertNotNull( method );
@@ -60,13 +56,13 @@ public void testPanacheRepositoryMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBookRepository.class ) );
 		Class repositoryClass = getMetamodelClassFor( PanacheBookRepository.class );
 		Assertions.assertNotNull( repositoryClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = repositoryClass.getSuperclass();
 		if ( superclass != null ) {
 			Assertions.assertEquals( "java.lang.Object", superclass.getName() );
 		}
-		
+
 		// Panache native method generates a static method
 		Method method = repositoryClass.getDeclaredMethod( "hqlBook", Uni.class, String.class );
 		Assertions.assertNotNull( method );
@@ -91,7 +87,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( QuarkusBookRepository.class ) );
 		Class repositoryClass = getMetamodelClassFor( QuarkusBookRepository.class );
 		Assertions.assertNotNull( repositoryClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = repositoryClass.getSuperclass();
 		if ( superclass != null ) {
@@ -100,7 +96,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		Class[] interfaces = repositoryClass.getInterfaces();
 		Assertions.assertEquals( 1, interfaces.length );
 		Assertions.assertEquals( QuarkusBookRepository.class.getName(), interfaces[0].getName() );
-		
+
 		// Annotated method generates an instance method
 		Method method = repositoryClass.getDeclaredMethod( "hqlBook", String.class );
 		Assertions.assertNotNull( method );
@@ -110,7 +106,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		method = repositoryClass.getDeclaredMethod( "findBook", String.class );
 		Assertions.assertNotNull( method );
 		Assertions.assertFalse( Modifier.isStatic( method.getModifiers() ) );
-		
+
 		// Make sure we have only the default constructor
 		Constructor[] constructors = repositoryClass.getDeclaredConstructors();
 		Assertions.assertNotNull( constructors );
@@ -143,7 +139,7 @@ public void testBookRepositoryWithSessionMetamodel() throws Exception {
 		Assertions.assertNotNull( constructors );
 		Assertions.assertEquals( 1, constructors.length );
 		Assertions.assertNotNull( repositoryClass.getDeclaredConstructor() );
-		
+
 		// Make sure we do not override the default session method
 		Assertions.assertThrows( NoSuchMethodException.class, () -> repositoryClass.getDeclaredMethod( "mySession" ) );
 	}
@@ -156,7 +152,7 @@ public void testBookRepositoryWithSessionMetamodel() throws Exception {
 //		System.out.println( TestUtil.getMetaModelSourceAsString( JakartaDataBookRepository.class ) );
 //		Class repositoryClass = getMetamodelClassFor( JakartaDataBookRepository.class );
 //		Assertions.assertNotNull( repositoryClass );
-//		
+//
 //		// Make sure it has the proper supertype
 //		Class superclass = repositoryClass.getSuperclass();
 //		if ( superclass != null ) {
@@ -165,7 +161,7 @@ public void testBookRepositoryWithSessionMetamodel() throws Exception {
 //		Class[] interfaces = repositoryClass.getInterfaces();
 //		Assertions.assertEquals( 1, interfaces.length );
 //		Assertions.assertEquals( JakartaDataBookRepository.class.getName(), interfaces[0].getName() );
-//		
+//
 //		// Annotated method generates an instance method
 //		Method method = repositoryClass.getDeclaredMethod( "hqlBook", String.class );
 //		Assertions.assertNotNull( method );
@@ -175,11 +171,10 @@ public void testBookRepositoryWithSessionMetamodel() throws Exception {
 //		method = repositoryClass.getDeclaredMethod( "findBook", String.class );
 //		Assertions.assertNotNull( method );
 //		Assertions.assertFalse( Modifier.isStatic( method.getModifiers() ) );
-//		
+//
 //		// Make sure we have the proper constructor
 //		Constructor constructor = repositoryClass.getDeclaredConstructor( StatelessSession.class );
 //		Assertions.assertNotNull( constructor );
 //		Assertions.assertTrue( constructor.isAnnotationPresent( Inject.class ) );
 //	}
 }
-
diff --git a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBook.java b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBook.java
index e31ba7dae83c..8da8d37ac9a8 100644
--- a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBook.java
+++ b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBook.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.ormPanache;
 
 import java.util.List;
@@ -12,14 +16,14 @@
 @Entity
 public class PanacheBook extends PanacheEntity {
 	public @NaturalId String isbn;
-    public @NaturalId String title;
-    public @NaturalId String author;
-    public String text;
-    public int pages;
-    
-    @Find
-    public static native List findBook(String isbn);
+	public @NaturalId String title;
+	public @NaturalId String author;
+	public String text;
+	public int pages;
 
-    @HQL("WHERE isbn = :isbn")
-    public static native List hqlBook(String isbn);
+	@Find
+	public static native List findBook(String isbn);
+
+	@HQL("WHERE isbn = :isbn")
+	public static native List hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBookRepository.java b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBookRepository.java
index 85e332daa4cc..4dd58d983613 100644
--- a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBookRepository.java
+++ b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/PanacheBookRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.ormPanache;
 
 import java.util.List;
@@ -10,9 +14,9 @@
 
 @ApplicationScoped
 public class PanacheBookRepository implements PanacheRepository {
-    @Find
-    public native List findBook(String isbn);
+	@Find
+	public native List findBook(String isbn);
 
-    @HQL("WHERE isbn = :isbn")
-    public native List hqlBook(String isbn);
+	@HQL("WHERE isbn = :isbn")
+	public native List hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusBookRepository.java b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusBookRepository.java
index 8787c8cad52e..306ecbe24710 100644
--- a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusBookRepository.java
+++ b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusBookRepository.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.ormPanache;
 
 import java.util.List;
@@ -6,9 +10,9 @@
 import org.hibernate.annotations.processing.HQL;
 
 public interface QuarkusBookRepository {
-    @Find
-    public List findBook(String isbn);
+	@Find
+	public List findBook(String isbn);
 
-    @HQL("WHERE isbn = :isbn")
-    public List hqlBook(String isbn);
+	@HQL("WHERE isbn = :isbn")
+	public List hqlBook(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java
index 5afa73dc29b0..726827076406 100644
--- a/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java
+++ b/tooling/metamodel-generator/src/quarkusOrmPanache/java/org/hibernate/processor/test/ormPanache/QuarkusOrmPanacheTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.ormPanache;
 
@@ -30,13 +28,13 @@ public void testPanacheEntityMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBook.class ) );
 		Class entityClass = getMetamodelClassFor( PanacheBook.class );
 		Assertions.assertNotNull( entityClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = entityClass.getSuperclass();
 		if ( superclass != null ) {
 			Assertions.assertEquals( "io.quarkus.hibernate.orm.panache.PanacheEntity_", superclass.getName() );
 		}
-		
+
 		// Panache static native method generates a static method
 		Method method = entityClass.getDeclaredMethod( "hqlBook", EntityManager.class, String.class );
 		Assertions.assertNotNull( method );
@@ -55,13 +53,13 @@ public void testPanacheRepositoryMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( PanacheBookRepository.class ) );
 		Class repositoryClass = getMetamodelClassFor( PanacheBookRepository.class );
 		Assertions.assertNotNull( repositoryClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = repositoryClass.getSuperclass();
 		if ( superclass != null ) {
 			Assertions.assertEquals( "java.lang.Object", superclass.getName() );
 		}
-		
+
 		// Panache native method generates a static method
 		Method method = repositoryClass.getDeclaredMethod( "hqlBook", EntityManager.class, String.class );
 		Assertions.assertNotNull( method );
@@ -80,7 +78,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		System.out.println( TestUtil.getMetaModelSourceAsString( QuarkusBookRepository.class ) );
 		Class repositoryClass = getMetamodelClassFor( QuarkusBookRepository.class );
 		Assertions.assertNotNull( repositoryClass );
-		
+
 		// Make sure it has the proper supertype
 		Class superclass = repositoryClass.getSuperclass();
 		if ( superclass != null ) {
@@ -89,7 +87,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		Class[] interfaces = repositoryClass.getInterfaces();
 		Assertions.assertEquals( 1, interfaces.length );
 		Assertions.assertEquals( QuarkusBookRepository.class.getName(), interfaces[0].getName() );
-		
+
 		// Annotated method generates an instance method
 		Method method = repositoryClass.getDeclaredMethod( "hqlBook", String.class );
 		Assertions.assertNotNull( method );
@@ -99,7 +97,7 @@ public void testQuarkusRepositoryMetamodel() throws Exception {
 		method = repositoryClass.getDeclaredMethod( "findBook", String.class );
 		Assertions.assertNotNull( method );
 		Assertions.assertFalse( Modifier.isStatic( method.getModifiers() ) );
-		
+
 		// Make sure we have the proper constructor
 		Constructor constructor = repositoryClass.getDeclaredConstructor( EntityManager.class );
 		Assertions.assertNotNull( constructor );
diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java
index f75f3b86f704..d30a16a870d5 100644
--- a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java
+++ b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java
@@ -1,11 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -17,5 +13,3 @@ public class DefaultPackageEntity {
 	@Id
 	private long id;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java
index 034d94b5600f..0c8f022da6ee 100644
--- a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java
+++ b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java
@@ -1,12 +1,7 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
-
-
-
 import org.hibernate.processor.test.util.CompilationTest;
 import org.hibernate.processor.test.util.TestForIssue;
 import org.hibernate.processor.test.util.WithClasses;
@@ -25,5 +20,3 @@ public void testMetaModelGeneratedForEntitiesInDefaultPackage() {
 		assertMetamodelClassGeneratedFor( DefaultPackageEntity.class );
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java
index 56e7d6f2a7ce..ddd4cff35a36 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/StringUtilTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java
index 528b4ccd29c0..90bb0f2a09ea 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/AccessTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Address.java
index 0d2b0c61d92b..b194a186f376 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Area.java
index 33a62464f92b..00b2f05a801b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Area.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Area.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Building.java
index 2f0e92c0ca37..4315b08f6127 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Building.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Building.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Country.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Country.java
index 03954950eb73..37edcca08bc4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Country.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Customer.java
index 90f98d5e6e4f..b9115a76fa6d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Customer.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Detail.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Detail.java
index f005014d9457..f953d50142fb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Detail.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Detail.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hominidae.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hominidae.java
index 12be289befde..0a2eb9eca548 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hominidae.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hominidae.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hotel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hotel.java
index bee97f373e0b..bc6401fc59d8 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hotel.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Hotel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/HotelRoom.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/HotelRoom.java
index aa4b042a5544..5a17cdecc0b4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/HotelRoom.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/HotelRoom.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
@@ -14,7 +12,7 @@
  */
 @Entity
 public class HotelRoom extends Room {
-	
+
 	@Embedded
 	private Hotel hotel;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/House.java
index 064576e889b6..358edb7dc26c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/House.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Human.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Human.java
index aeb35e95a46e..12f39c2f3837 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Human.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Human.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Inhabitant.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Inhabitant.java
index d6d5bd87651d..5855560f1c5b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Inhabitant.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Inhabitant.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Item.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Item.java
index 900b8f8c6b1f..16ad4979f9ca 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Item.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
@@ -19,15 +17,15 @@
  * @author Hardy Ferentschik
  * @author Emmanuel Bernard
  */
-@Entity  
+@Entity
 public class Item {
-	
+
 	long id;
-	
+
 	int quantity;
-	
+
 	Product product;
-	
+
 	Order order;
 
 	Detail detail;
@@ -66,7 +64,7 @@ public Order getOrder() {
 	public void setOrder(Order order) {
 		this.order = order;
 	}
-	
+
 	@OneToMany
 	public Map getNamedOrders() {
 		return null;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/LivingBeing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/LivingBeing.java
index 53f3e6adce9e..6f0c5a957ca4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/LivingBeing.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/LivingBeing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Mammals.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Mammals.java
index 65eaa117f519..7410e6db72a3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Mammals.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Mammals.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Order.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Order.java
index cb183881c62d..4711a987113c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Order.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
@@ -17,19 +15,19 @@
  */
 //@Entity
 public class Order {
-	
+
 	//@Id
 	long id;
-	
+
 	//@OneToMany
 	Set items;
-	
+
 	boolean filled;
 	Date date;
-	
+
 	//@OneToMany
 	List notes;
-	
+
 	//@ManyToOne
 	Shop shop;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Pet.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Pet.java
index d92669bac698..079e202fb67b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Pet.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Pet.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Product.java
index d568f3690e05..4842ed30012e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Product.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Room.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Room.java
index ef46535587f3..73d3d9e48e31 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Room.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Room.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Shop.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Shop.java
index 6f91a15ed32e..1438d19a1bce 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Shop.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/Shop.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/User.java
index ca1011349994..fcb01f9052d7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/User.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/accesstype/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.accesstype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java
index c2a04a8823f0..156e9e4bb67d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/AnnotationTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.annotationtype;
 
@@ -19,11 +17,11 @@
 @TestForIssue(jiraKey = "HHH-13145")
 public class AnnotationTypeTest extends CompilationTest {
 
-    @Test
-    @WithClasses({ Entity.class })
-    @WithMappingFiles("orm.xml")
-    public void testXmlConfiguredEntityGenerated() {
-        TestUtil.assertMetamodelClassGeneratedFor( Entity.class );
-    }
+	@Test
+	@WithClasses({ Entity.class })
+	@WithMappingFiles("orm.xml")
+	public void testXmlConfiguredEntityGenerated() {
+		TestUtil.assertMetamodelClassGeneratedFor( Entity.class );
+	}
 
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/Entity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/Entity.java
index 7cd0f3dd44d8..6f3347499ea3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/Entity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/annotationtype/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.annotationtype;
 
@@ -16,32 +14,32 @@
  */
 public class Entity {
 
-    private String id;
+	private String id;
 
-    private String name;
+	private String name;
 
-    public Entity(String id) {
-        this.id = id;
-    }
+	public Entity(String id) {
+		this.id = id;
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(String id) {
-        this.id = id;
-    }
+	public void setId(String id) {
+		this.id = id;
+	}
 
-    public @Custom String getName() {
-        return name;
-    }
+	public @Custom String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.TYPE_USE})
-    @Retention(RetentionPolicy.CLASS)
-    public static @interface Custom {
-    }
+	@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.TYPE_USE})
+	@Retention(RetentionPolicy.CLASS)
+	public static @interface Custom {
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java
index 470352b59fda..46523897300f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.arraytype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java
index be970678b052..e290abef883d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/ArrayTestWithTypeUseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.arraytype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/Image.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/Image.java
index a2956975b94c..a9421da1d2ce 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/Image.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/Image.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.arraytype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TemperatureSamples.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TemperatureSamples.java
index de1123a685a8..f937cfcca934 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TemperatureSamples.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TemperatureSamples.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.arraytype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TestEntity.java
index 431c49eb7fa0..9f4de133664a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TestEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/arraytype/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.arraytype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobEntity.java
index df983842a26b..562aaef52278 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.blob;
 
@@ -24,5 +22,3 @@ public class BlobEntity {
 	@Lob
 	private Blob blob;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java
index c4c791d0a422..273b6658c114 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/blob/BlobTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.blob;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java
index f534c0f64b66..16d4e6ea9f9a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/CircularTypeVariableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.circulartypevariable;
 
@@ -13,16 +11,15 @@
 
 import org.junit.Test;
 
-import jakarta.persistence.metamodel.SetAttribute;
 
 @TestForIssue(jiraKey = "HHH-17253")
 public class CircularTypeVariableTest extends CompilationTest {
 
-    @Test
-    @WithClasses({ RoleAccess.class, User.class })
-    public void testCircularTypeVariable() {
-        TestUtil.assertMetamodelClassGeneratedFor( RoleAccess.class );
-        TestUtil.assertMetamodelClassGeneratedFor( User.class );
-    }
+	@Test
+	@WithClasses({ RoleAccess.class, User.class })
+	public void testCircularTypeVariable() {
+		TestUtil.assertMetamodelClassGeneratedFor( RoleAccess.class );
+		TestUtil.assertMetamodelClassGeneratedFor( User.class );
+	}
 
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/RoleAccess.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/RoleAccess.java
index c52b5da5b64e..cacadecfd93a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/RoleAccess.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/RoleAccess.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.circulartypevariable;
 
 import org.hibernate.annotations.Immutable;
@@ -25,4 +29,4 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/User.java
index 4c45a28c0933..6b197c5ff279 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/User.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/circulartypevariable/User.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.circulartypevariable;
 
 import java.util.Set;
@@ -33,4 +37,4 @@ public Set getRoleAccesses() {
 	public void setRoleAccesses(Set roleAccesses) {
 		this.roleAccesses = roleAccesses;
 	}
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CollectionAsBasicTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CollectionAsBasicTypeTest.java
index ceecd5ea900e..5bdd7bdf149f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CollectionAsBasicTypeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CollectionAsBasicTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringMapJavaType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringMapJavaType.java
index 9a51a91c92d3..82d987391d76 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringMapJavaType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringMapJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsJavaType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsJavaType.java
index 2867f1d9efa7..75c0418c1405 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsJavaType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsJavaType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -20,39 +18,39 @@
  */
 public class CommaDelimitedStringsJavaType extends AbstractClassJavaType {
 
-    public static final String DELIMITER = ",";
-
-    public CommaDelimitedStringsJavaType() {
-        super(
-            List.class,
-            new MutableMutabilityPlan() {
-                @Override
-                protected List deepCopyNotNull(List value) {
-                    return new ArrayList( value );
-                }
-            }
-        );
-    }
-
-    @Override
-    public String toString(List value) {
-        return ( (List) value ).stream().collect( Collectors.joining( DELIMITER ) );
-    }
-
-    @Override
-    public List fromString(CharSequence string) {
-        List values = new ArrayList<>();
-        Collections.addAll( values, string.toString().split( DELIMITER ) );
-        return values;
-    }
-
-    @Override
-    public  X unwrap(List value, Class type, WrapperOptions options) {
-        return (X) toString( value );
-    }
-
-    @Override
-    public  List wrap(X value, WrapperOptions options) {
-        return fromString( (String) value );
-    }
+	public static final String DELIMITER = ",";
+
+	public CommaDelimitedStringsJavaType() {
+		super(
+			List.class,
+			new MutableMutabilityPlan() {
+				@Override
+				protected List deepCopyNotNull(List value) {
+					return new ArrayList( value );
+				}
+			}
+		);
+	}
+
+	@Override
+	public String toString(List value) {
+		return ( (List) value ).stream().collect( Collectors.joining( DELIMITER ) );
+	}
+
+	@Override
+	public List fromString(CharSequence string) {
+		List values = new ArrayList<>();
+		Collections.addAll( values, string.toString().split( DELIMITER ) );
+		return values;
+	}
+
+	@Override
+	public  X unwrap(List value, Class type, WrapperOptions options) {
+		return (X) toString( value );
+	}
+
+	@Override
+	public  List wrap(X value, WrapperOptions options) {
+		return fromString( (String) value );
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsMapType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsMapType.java
index 71f8d688683d..a8b3d7de2473 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsMapType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsMapType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -19,33 +17,33 @@
  * @author Vlad Mihalcea
  */
 public class CommaDelimitedStringsMapType extends StaticUserTypeSupport> {
-    public CommaDelimitedStringsMapType() {
-        super(
-                new CommaDelimitedStringMapJavaType(),
-                VarcharJdbcType.INSTANCE
-        );
-    }
+	public CommaDelimitedStringsMapType() {
+		super(
+				new CommaDelimitedStringMapJavaType(),
+				VarcharJdbcType.INSTANCE
+		);
+	}
 
-    @Override
-    public CommaDelimitedStringMapJavaType getJavaType() {
-        return (CommaDelimitedStringMapJavaType) super.getJavaType();
-    }
+	@Override
+	public CommaDelimitedStringMapJavaType getJavaType() {
+		return (CommaDelimitedStringMapJavaType) super.getJavaType();
+	}
 
-    @Override
-    public Map nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
-            throws SQLException {
-        final Object extracted = getJdbcValueExtractor().extract( rs, position, session );
-        if ( extracted == null ) {
-            return null;
-        }
+	@Override
+	public Map nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session)
+			throws SQLException {
+		final Object extracted = getJdbcValueExtractor().extract( rs, position, session );
+		if ( extracted == null ) {
+			return null;
+		}
 
-        return getJavaType().fromString( (String) extracted );
-    }
+		return getJavaType().fromString( (String) extracted );
+	}
 
-    @Override
-    public void nullSafeSet(PreparedStatement st, Map value, int index, SharedSessionContractImplementor session)
-            throws SQLException {
-        final String stringValue = getJavaType().toString( value );
-        getJdbcValueBinder().bind( st, stringValue, index, session );
-    }
-}
\ No newline at end of file
+	@Override
+	public void nullSafeSet(PreparedStatement st, Map value, int index, SharedSessionContractImplementor session)
+			throws SQLException {
+		final String stringValue = getJavaType().toString( value );
+		getJdbcValueBinder().bind( st, stringValue, index, session );
+	}
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsType.java
index 88c341a74b0a..1ac83a57e106 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/CommaDelimitedStringsType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -15,7 +13,7 @@
  * @author Vlad Mihalcea
  */
 public class CommaDelimitedStringsType extends UserTypeSupport> {
-    public CommaDelimitedStringsType() {
-        super( List.class, Types.VARCHAR );
-    }
-}
\ No newline at end of file
+	public CommaDelimitedStringsType() {
+		super( List.class, Types.VARCHAR );
+	}
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java
index 10bfc079bc32..77b2febe9746 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java
index 2d977cdebf46..823624176755 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ElementCollectionWithConverterTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/EnumHolder.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/EnumHolder.java
index 88f44ccf50a2..e5bea52fc7ba 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/EnumHolder.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/EnumHolder.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Goods.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Goods.java
index 1dd78546075f..817c2cff99e5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Goods.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Goods.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -18,35 +16,35 @@
  */
 @Entity
 public class Goods {
-    private Long id;
-    private List productList;
-    private List tags;
-
-    @Id
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @OneToMany
-    public List getProductList() {
-        return productList;
-    }
-
-    public void setProductList(List productList) {
-        this.productList = productList;
-    }
-
-    @NotNull
-    @Convert(converter = StringToListConverter.class)
-    public List getTags() {
-        return tags;
-    }
-
-    public void setTags(List tags) {
-        this.tags = tags;
-    }
+	private Long id;
+	private List productList;
+	private List tags;
+
+	@Id
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@OneToMany
+	public List getProductList() {
+		return productList;
+	}
+
+	public void setProductList(List productList) {
+		this.productList = productList;
+	}
+
+	@NotNull
+	@Convert(converter = StringToListConverter.class)
+	public List getTags() {
+		return tags;
+	}
+
+	public void setTags(List tags) {
+		this.tags = tags;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Item.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Item.java
index 8e85ad795f24..72e3610675a1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Item.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Item.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ItemRoleConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ItemRoleConverter.java
index 234a462e81f6..e835833abad2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ItemRoleConverter.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ItemRoleConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java
index 600c71203fab..81475506ccd8 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Person.java
index c85f324d5ecb..11cb27016869 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Person.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Person.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import java.util.ArrayList;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PersonPhone.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PersonPhone.java
index 7894cd70b382..4c4078cfe33a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PersonPhone.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PersonPhone.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import java.util.ArrayList;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PhoneBook.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PhoneBook.java
index f58df630572f..75180c348ce5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PhoneBook.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/PhoneBook.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype;
 
 import java.util.HashMap;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Product.java
index 8b41aaf3da63..724af4443218 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Product.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -14,23 +12,23 @@
  */
 @Entity
 public class Product {
-    private int proId;
-    private String proName;
+	private int proId;
+	private String proName;
 
-    @Id
-    public int getProId() {
-        return proId;
-    }
+	@Id
+	public int getProId() {
+		return proId;
+	}
 
-    public void setProId(int proId) {
-        this.proId = proId;
-    }
+	public void setProId(int proId) {
+		this.proId = proId;
+	}
 
-    public String getProName() {
-        return proName;
-    }
+	public String getProName() {
+		return proName;
+	}
 
-    public void setProName(String proName) {
-        this.proName = proName;
-    }
+	public void setProName(String proName) {
+		this.proName = proName;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Role.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Role.java
index e1580eaeeecd..1c6a2163d9dd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Role.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Role.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleExternal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleExternal.java
index 0f2befe053e7..051fb5badbe5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleExternal.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleExternal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleInternal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleInternal.java
index b17b4db4c54f..7b6d6b88bbf1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleInternal.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/RoleInternal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToListConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToListConverter.java
index 0678f241093d..667cf7d465d6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToListConverter.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToListConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
@@ -15,21 +13,21 @@
  * @author helloztt
  */
 public class StringToListConverter implements AttributeConverter, String> {
-    private static final String COMMA = ",";
+	private static final String COMMA = ",";
 
-    @Override
-    public String convertToDatabaseColumn(List attribute) {
-        if (attribute == null || attribute.size() == 0) {
-            return null;
-        }
-        return attribute.stream().collect(Collectors.joining(COMMA));
-    }
+	@Override
+	public String convertToDatabaseColumn(List attribute) {
+		if (attribute == null || attribute.size() == 0) {
+			return null;
+		}
+		return attribute.stream().collect(Collectors.joining(COMMA));
+	}
 
-    @Override
-    public List convertToEntityAttribute(String dbData) {
-        if (dbData == null || dbData.length() == 0) {
-            return null;
-        }
-        return Arrays.asList(dbData.split(COMMA));
-    }
+	@Override
+	public List convertToEntityAttribute(String dbData) {
+		if (dbData == null || dbData.length() == 0) {
+			return null;
+		}
+		return Arrays.asList(dbData.split(COMMA));
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToUppercaseConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToUppercaseConverter.java
index 3352ca9fba0e..243c1b6c82b6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToUppercaseConverter.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/StringToUppercaseConverter.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.collectionbasictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/extras/Phone.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/extras/Phone.java
index e5f5eb01e966..56195a292a74 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/extras/Phone.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/extras/Phone.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.collectionbasictype.extras;
 
 import java.io.Serializable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java
index ee33908216dd..79821401abaf 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BadEnumConstantInNamedQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.constant;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BookType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BookType.java
index a891eaae46c5..d5aade61f21c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BookType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/BookType.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.constant;
 
 public enum BookType {
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java
index e3709d355fb6..a81d22580514 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/ConstantInNamedQueryTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.constant;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBook.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBook.java
index 6cd328002c9e..5287b59dc0d7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBook.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBook.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.constant;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBookWithoutCheck.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBookWithoutCheck.java
index 3e24409e921b..ed788dea6e69 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBookWithoutCheck.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constant/CookBookWithoutCheck.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.constant;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithInstanceGetEntityManager.java
index e852e6ca5de3..db9fff94d91d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithStaticGetEntityManager.java
index a6e06da4834a..db500641cf5c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingEntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
index d67e808f4bc3..482ec8e56829 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
index 2cb82cf8983e..be1454e33746 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithInstanceGetEntityManager.java
index d7955f9228d6..73cccea41044 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithStaticGetEntityManager.java
index 7719655b8c7a..11ab5b0f9c66 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingMapperSuperClassWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithInstanceGetEntityManager.java
index eb69db0db10b..aeab134a57f9 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithStaticGetEntityManager.java
index 2f96b440ca07..96c6915ca1b1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityExtendingNonEntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithInstanceGetEntityManager.java
index c014a08b4b66..dc6ca4f374c4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithStaticGetEntityManager.java
index 0288b664a8b0..b3996be78454 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/EntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
index a893b86ae465..025b2c04ad3b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
index cc7bcc053870..8b4a332b1b41 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassExtendingNonEntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithInstanceGetEntityManager.java
index 99ae87468c70..0c96d705de63 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithStaticGetEntityManager.java
index 5bf2f8abda38..976f24c83831 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/MapperSuperClassWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithInstanceGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithInstanceGetEntityManager.java
index 0536577111f5..2d6ff058924c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithInstanceGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithInstanceGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithStaticGetEntityManager.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithStaticGetEntityManager.java
index 2fad02893fdd..c6417869d214 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithStaticGetEntityManager.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/NonEntityWithStaticGetEntityManager.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java
index 4033c808c30b..cb7f8648a221 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/constructor/SuperClassWithGetEntityManagerTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.constructor;
 
@@ -122,4 +120,3 @@ private void doTest(Class superclass, Class entitySubclass) {
 		);
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Bean.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Bean.java
index 710122ea98a4..57df12ed4819 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Bean.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Bean.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import jakarta.persistence.Entity;
@@ -5,11 +9,11 @@
 
 @Entity
 public class Bean {
-    @Id
-    public Long getKey() {
-        return 69L;
-    }
-    public String getText() {
-        return "Hello World";
-    }
+	@Id
+	public Long getKey() {
+		return 69L;
+	}
+	public String getText() {
+		return "Hello World";
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Book.java
index 7635f4184fef..773b7f602c0c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import jakarta.persistence.Entity;
@@ -6,12 +10,12 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    @NaturalId String author;
-    String text;
-    int pages;
-    Type type;
+	@Id String isbn;
+	@NaturalId String title;
+	@NaturalId String author;
+	String text;
+	int pages;
+	Type type;
 
-    enum Type { Book, Magazine, Journal }
+	enum Type { Book, Magazine, Journal }
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
index 3574492084c7..ce511e239b6a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import jakarta.persistence.EntityManager;
@@ -20,67 +24,67 @@
 
 public interface Dao {
 
-    EntityManager getEntityManager();
+	EntityManager getEntityManager();
 
-    @Find
-    Book getBook(String isbn);
+	@Find
+	Book getBook(String isbn);
 
-    @Find
-    Book[] getBooks(String[] isbn);
+	@Find
+	Book[] getBooks(String[] isbn);
 
-    @Find
-    List getBooks(List isbn);
+	@Find
+	List getBooks(List isbn);
 
-    @Find
-    Optional getBookIfAny(String isbn);
+	@Find
+	Optional getBookIfAny(String isbn);
 
-    @Find(enabledFetchProfiles="Goodbye")
-    Book getBookFetching(String isbn);
+	@Find(enabledFetchProfiles="Goodbye")
+	Book getBookFetching(String isbn);
 
-    @Find
-    Book getBook(@Pattern String title, String author);
+	@Find
+	Book getBook(@Pattern String title, String author);
 
-    @Find(enabledFetchProfiles="Hello")
-    Book getBookFetching(String title, String author);
+	@Find(enabledFetchProfiles="Hello")
+	Book getBookFetching(String title, String author);
 
-    @Find
-    Book getBook(String title, String isbn, String author);
+	@Find
+	Book getBook(String title, String isbn, String author);
 
-    @Find
-    List getBooks(String title);
+	@Find
+	List getBooks(String title);
 
-    @Find(enabledFetchProfiles="Hello")
-    List getBooksFetching(String title);
+	@Find(enabledFetchProfiles="Hello")
+	List getBooksFetching(String title);
 
-    @Find
-    List getBooks(String title, Page page, Order order);
+	@Find
+	List getBooks(String title, Page page, Order order);
 
-    @Find
-    SelectionQuery createBooksSelectionQuery(String title);
+	@Find
+	SelectionQuery createBooksSelectionQuery(String title);
 
-    @HQL("where isbn in ?1")
-    List booksGivenIsbnList(List isbns);
+	@HQL("where isbn in ?1")
+	List booksGivenIsbnList(List isbns);
 
-    @HQL("where isbn in :isbns")
-    List booksGivenIsbnSet(Set isbns);
+	@HQL("where isbn in :isbns")
+	List booksGivenIsbnSet(Set isbns);
 
-    @HQL("where isbn in :isbns")
-    List booksGivenIsbnCollection(Collection isbns);
+	@HQL("where isbn in :isbns")
+	List booksGivenIsbnCollection(Collection isbns);
 
-    @HQL("where title like ?1")
-    List findBooksByTitle(String title);
+	@HQL("where title like ?1")
+	List findBooksByTitle(String title);
 
-    @HQL("where title like ?1")
-    Stream streamBooksByTitle(String title);
+	@HQL("where title like ?1")
+	Stream streamBooksByTitle(String title);
 
-    @HQL("from Book where title like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where title like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1")
-    SelectionQuery findByTitleSelectionQuery(String title);
+	@HQL("from Book where title like ?1")
+	SelectionQuery findByTitleSelectionQuery(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 //
 //    @HQL("from Book where title like :title")
 //    List findByTitleWithPagination(String title, Order order, Page page);
@@ -91,63 +95,63 @@ public interface Dao {
 //    @HQL("from Book where title like :title")
 //    SelectionQuery findByTitleWithOrderingByVarargs(String title, Order... order);
 
-    @HQL("select count(*) from Book")
-    long countBooks();
+	@HQL("select count(*) from Book")
+	long countBooks();
 
-    @HQL("select count(*)>1 from Book")
-    boolean booksExist();
+	@HQL("select count(*)>1 from Book")
+	boolean booksExist();
 
-    @HQL("delete from Book")
-    int deleteBooks();
+	@HQL("delete from Book")
+	int deleteBooks();
 
-    @HQL("delete from Book book where book.isbn=:isbn")
-    boolean deleteBook(String isbn);
+	@HQL("delete from Book book where book.isbn=:isbn")
+	boolean deleteBook(String isbn);
 
-    @HQL("select count(*), count(*)>1 from Book")
-    Object[] funnyQueryReturningArray();
+	@HQL("select count(*), count(*)>1 from Book")
+	Object[] funnyQueryReturningArray();
 
-    class Record {
-        Record(Long count, Boolean exists) {}
-    }
-    @HQL("select count(*), count(*)>1 from Book")
-    Record funnyQueryReturningRecord();
+	class Record {
+		Record(Long count, Boolean exists) {}
+	}
+	@HQL("select count(*), count(*)>1 from Book")
+	Record funnyQueryReturningRecord();
 
-    @HQL("from Book where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @HQL("from Book where isbn = :isbn")
-    Optional findByIsbnIfExists(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Optional findByIsbnIfExists(String isbn);
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 
-    @Find
-    Bean beanByIdProperty(Long key);
+	@Find
+	Bean beanByIdProperty(Long key);
 
-    @Find
-    List beansForText(String text);
+	@Find
+	List beansForText(String text);
 
-    @Find
-    Bean[] beansAsArray(String text);
+	@Find
+	Bean[] beansAsArray(String text);
 
-    @HQL("where isbn = ?1")
-    List sortedBooksForIsbn(String isbn, Order... order);
+	@HQL("where isbn = ?1")
+	List sortedBooksForIsbn(String isbn, Order... order);
 
-    @Find
-    List sortedBooks(String isbn, Order... order);
+	@Find
+	List sortedBooks(String isbn, Order... order);
 
-    @HQL("select local date")
-    LocalDate localDate();
+	@HQL("select local date")
+	LocalDate localDate();
 
-    @HQL("select local datetime")
-    LocalDateTime localDatetime();
+	@HQL("select local datetime")
+	LocalDateTime localDatetime();
 
-    @HQL("select avg(pages) from Book")
-    double averagePageCount();
+	@HQL("select avg(pages) from Book")
+	double averagePageCount();
 
-    @HQL("select b\nfrom Book b\nwhere b.isbn = :isbn")
-    Book findByIsbnMultiline(String isbn);
+	@HQL("select b\nfrom Book b\nwhere b.isbn = :isbn")
+	Book findByIsbnMultiline(String isbn);
 
-    @HQL("from Book b where b.type = Magazine")
-    List findMagazines();
+	@HQL("from Book b where b.type = Magazine")
+	List findMagazines();
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao2.java
index bb4d18001147..ce5603a96fa5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao2.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import java.util.List;
@@ -8,21 +12,21 @@
 
 public interface Dao2 {
 
-    EntityManager getEntityManager();
+	EntityManager getEntityManager();
 
-    // Simple name
-    @HQL("from Book b where b.type = Magazine")
-    List findMagazines1();
+	// Simple name
+	@HQL("from Book b where b.type = Magazine")
+	List findMagazines1();
 
-    // Simple qualified name
-    @HQL("from Book b where b.type = Type.Magazine")
-    List findMagazines2();
+	// Simple qualified name
+	@HQL("from Book b where b.type = Type.Magazine")
+	List findMagazines2();
 
-    // Canonical FQN
-    @HQL("from Book b where b.type = org.hibernate.processor.test.dao.Book.Type.Magazine")
-    List findMagazines3();
+	// Canonical FQN
+	@HQL("from Book b where b.type = org.hibernate.processor.test.dao.Book.Type.Magazine")
+	List findMagazines3();
 
-    // Binary FQN
-    @HQL("from Book b where b.type = org.hibernate.processor.test.dao.Book$Type.Magazine")
-    List findMagazines4();
+	// Binary FQN
+	@HQL("from Book b where b.type = org.hibernate.processor.test.dao.Book$Type.Magazine")
+	List findMagazines4();
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java
index 93b0520fee0a..4afd613eda40 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.dao;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java
index 4e048e02cdb5..65e12f2bc8a1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/DaoTest2.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.dao;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatefulDao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatefulDao.java
index 583b4be09028..185c80339c7e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatefulDao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatefulDao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import jakarta.annotation.Nullable;
@@ -13,49 +17,49 @@
 
 public interface StatefulDao {
 
-    Session getSession();
+	Session getSession();
 
-    @Find
-    Book getBook(String isbn);
+	@Find
+	Book getBook(String isbn);
 
-    @Find @Nullable
-    Book getBookOrNull(String isbn);
+	@Find @Nullable
+	Book getBookOrNull(String isbn);
 
-    @Find
-    Optional getBookMaybe(String isbn);
+	@Find
+	Optional getBookMaybe(String isbn);
 
-    @Find(enabledFetchProfiles="Goodbye")
-    Book getBookFetching(String isbn);
+	@Find(enabledFetchProfiles="Goodbye")
+	Book getBookFetching(String isbn);
 
-    @Find
-    Book getBook(String title, String author);
+	@Find
+	Book getBook(String title, String author);
 
-    @Find
-    Optional getBookMaybe(String title, String author);
+	@Find
+	Optional getBookMaybe(String title, String author);
 
-    @Find(enabledFetchProfiles="Hello")
-    Book getBookFetching(String title, String author);
+	@Find(enabledFetchProfiles="Hello")
+	Book getBookFetching(String title, String author);
 
-    @Find
-    Book getBook(String title, String isbn, String author);
+	@Find
+	Book getBook(String title, String isbn, String author);
 
-    @Find
-    List getBooks(String title);
+	@Find
+	List getBooks(String title);
 
-    @Find(enabledFetchProfiles="Hello")
-    List getBooksFetching(String title);
+	@Find(enabledFetchProfiles="Hello")
+	List getBooksFetching(String title);
 
-    @Find
-    SelectionQuery createBooksSelectionQuery(String title);
+	@Find
+	SelectionQuery createBooksSelectionQuery(String title);
 
-    @HQL("from Book where title like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where title like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1")
-    SelectionQuery findByTitleSelectionQuery(String title);
+	@HQL("from Book where title like ?1")
+	SelectionQuery findByTitleSelectionQuery(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 //
 //    @HQL("from Book where title like :title")
 //    List findByTitleWithPagination(String title, Order order, Page page);
@@ -66,9 +70,9 @@ public interface StatefulDao {
 //    @HQL("from Book where title like :title")
 //    SelectionQuery findByTitleWithOrderingByVarargs(String title, Order... order);
 
-    @HQL("from Book where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatelessDao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatelessDao.java
index fae3b6f50cef..0dd3afe3541d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatelessDao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/StatelessDao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.dao;
 
 import jakarta.annotation.Nullable;
@@ -13,49 +17,49 @@
 
 public interface StatelessDao {
 
-    StatelessSession getSession();
+	StatelessSession getSession();
 
-    @Find
-    Book getBook(String isbn);
+	@Find
+	Book getBook(String isbn);
 
-    @Find
-    Optional getBookMaybe(String isbn);
+	@Find
+	Optional getBookMaybe(String isbn);
 
-    @Find(enabledFetchProfiles="Goodbye")
-    Book getBookFetching(String isbn);
+	@Find(enabledFetchProfiles="Goodbye")
+	Book getBookFetching(String isbn);
 
-    @Find
-    Book getBook(String title, String author);
+	@Find
+	Book getBook(String title, String author);
 
-    @Find @Nullable
-    Book getBookOrNull(String isbn);
+	@Find @Nullable
+	Book getBookOrNull(String isbn);
 
-    @Find
-    Optional getBookMaybe(String title, String author);
+	@Find
+	Optional getBookMaybe(String title, String author);
 
-    @Find(enabledFetchProfiles="Hello")
-    Book getBookFetching(String title, String author);
+	@Find(enabledFetchProfiles="Hello")
+	Book getBookFetching(String title, String author);
 
-    @Find
-    Book getBook(String title, String isbn, String author);
+	@Find
+	Book getBook(String title, String isbn, String author);
 
-    @Find
-    List getBooks(String title);
+	@Find
+	List getBooks(String title);
 
-    @Find(enabledFetchProfiles="Hello")
-    List getBooksFetching(String title);
+	@Find(enabledFetchProfiles="Hello")
+	List getBooksFetching(String title);
 
-    @Find
-    SelectionQuery createBooksSelectionQuery(String title);
+	@Find
+	SelectionQuery createBooksSelectionQuery(String title);
 
-    @HQL("from Book where title like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where title like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1")
-    SelectionQuery findByTitleSelectionQuery(String title);
+	@HQL("from Book where title like ?1")
+	SelectionQuery findByTitleSelectionQuery(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 //
 //    @HQL("from Book where title like :title")
 //    List findByTitleWithPagination(String title, Order order, Page page);
@@ -66,9 +70,9 @@ public interface StatelessDao {
 //    @HQL("from Book where title like :title")
 //    SelectionQuery findByTitleWithOrderingByVarargs(String title, Order... order);
 
-    @HQL("from Book where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Cleaner.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Cleaner.java
index 881ed2063515..3b3b1e3820c4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Cleaner.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Cleaner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java
index 08a0cdb817ea..f2c7341d8d6a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java
index 990bc2f0f869..d40f69de25cb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/ElementCollectionTypeUseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Homework.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Homework.java
index e5f8b190b76c..5ede4344eabb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Homework.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Homework.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
@@ -20,45 +18,45 @@
 @Entity
 public class Homework {
 
-    private long id;
-    private List paths;
-
-    @Id
-    public long getId() {
-        return id;
-    }
-
-    @ElementCollection
-    public List getPaths() {
-        return paths;
-    }
-
-    public Set getPaths(String startPath) {
-        TreeSet result = new TreeSet<>();
-
-        if ( paths == null ) {
-            return result;
-        }
-
-        for ( String path : paths ) {
-            if ( path.startsWith( startPath ) ) {
-                result.add( path );
-            }
-        }
-        return result;
-    }
-
-    public void setPaths(List paths) {
-        this.paths = paths;
-    }
-
-    public Homework setPaths(List paths, boolean append) {
-        if ( append ) {
-            this.paths.addAll( paths );
-        }
-        else {
-            this.paths = paths;
-        }
-        return this;
-    }
+	private long id;
+	private List paths;
+
+	@Id
+	public long getId() {
+		return id;
+	}
+
+	@ElementCollection
+	public List getPaths() {
+		return paths;
+	}
+
+	public Set getPaths(String startPath) {
+		TreeSet result = new TreeSet<>();
+
+		if ( paths == null ) {
+			return result;
+		}
+
+		for ( String path : paths ) {
+			if ( path.startsWith( startPath ) ) {
+				result.add( path );
+			}
+		}
+		return result;
+	}
+
+	public void setPaths(List paths) {
+		this.paths = paths;
+	}
+
+	public Homework setPaths(List paths, boolean append) {
+		if ( append ) {
+			this.paths.addAll( paths );
+		}
+		else {
+			this.paths = paths;
+		}
+		return this;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hostel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hostel.java
index 2229a0b4c534..68af96271ede 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hostel.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hostel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hotel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hotel.java
index ee1e3f6a9143..9cb873cb2e81 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hotel.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Hotel.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/House.java
index 7534438b15a0..2126d2e81eb5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/House.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
@@ -28,5 +26,3 @@ public void setRoomsByName(Map roomsByName) {
 		this.roomsByName = roomsByName;
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuilding.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuilding.java
index 166a68ad49ac..d7a25bdda14e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuilding.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuilding.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuildingValidated.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuildingValidated.java
index 58cb73de8a73..df984656b223 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuildingValidated.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/OfficeBuildingValidated.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Room.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Room.java
index 650957dcecbf..0fb28b7ead15 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Room.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/elementcollection/Room.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.elementcollection;
 
@@ -33,5 +31,3 @@ public void setWidth(BigDecimal width) {
 		this.width = width;
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Base.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Base.java
index db155f7be87d..d78ef72cb453 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Base.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Base.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java
index 8e73ab07316c..d8352270fefa 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableAccessTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableEntity.java
index 2f6a4fd9e6b2..1ae1c0a40b49 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java
index 49418763162d..1a439ad7717d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/EmbeddableTypeUseTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/IStuff.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/IStuff.java
index 4f0cdab2fbc3..d8b5f29596c0 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/IStuff.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/IStuff.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/MyEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/MyEntity.java
index 1e406d9eb977..85ac51141b6b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/MyEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/MyEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEmbeddable.java
index 315785a5cc48..e5a25f80d2eb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEmbeddable.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEntity.java
index edc6ed5ef2eb..464d47a58aac 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/SimpleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Stuff.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Stuff.java
index e423fcfde37d..2d9d1102cc71 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Stuff.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/Stuff.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ChildEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ChildEmbeddable.java
index d9b486701cec..cdfc2b72b8b5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ChildEmbeddable.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ChildEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java
index a669e9b59b1b..8075d54df94c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/EmbeddableGenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java
index 2abb8b44d6e8..bce800823847 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java
index b9183730179a..cf42d22f3dfd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java
index 12db121ec7ac..fcadbe0b7414 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java
index b28d5463d571..4c84a4567ef7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/EmbeddableGenericsAndInterfaceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.genericsinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEmbedded.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEmbedded.java
index b40c12e8b172..2b8b63e3d846 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEmbedded.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.genericsinheritance;
 
@@ -10,4 +8,4 @@
 
 @Embeddable
 public class ExampleEmbedded extends ExampleSuperClassEmbedded {
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEntity.java
index 4ec387a21fc0..fc8347e2b0fe 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.genericsinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleSuperClassEmbedded.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleSuperClassEmbedded.java
index f2fea1de2ed6..35bdc8ee692d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleSuperClassEmbedded.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/ExampleSuperClassEmbedded.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.genericsinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/UserEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/UserEntity.java
index d5bc8dbde804..e2952e6b24a6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/UserEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/genericsinheritance/UserEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.genericsinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Address.java
index 4c40f644c038..8f6ceadeca1e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.field;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Author.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Author.java
index 42ccfe881056..b64edc4987da 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Author.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.field;
 
 import jakarta.persistence.Basic;
@@ -6,14 +10,13 @@
 
 @Entity
 public class Author {
-    @Id
-    String ssn;
+	@Id
+	String ssn;
 
-    @Basic(optional = false)
-    String name;
+	@Basic(optional = false)
+	String name;
 
-    Address address;
+	Address address;
 
-    Boolean deceased;
+	Boolean deceased;
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java
index 861e02d0ca8d..c386297357c7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/NestedEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.nested.field;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Postcode.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Postcode.java
index 545e4ed0428d..1121a2aea16d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Postcode.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/field/Postcode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.field;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Address.java
index 68b242a3a811..e4a9353ce085 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.property;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Author.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Author.java
index 0eacd630da9f..882d9890a4a5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Author.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.property;
 
 import jakarta.persistence.Basic;
@@ -6,46 +10,45 @@
 
 @Entity
 public class Author {
-    String ssn;
+	String ssn;
 
-    String name;
+	String name;
 
-    Address address;
+	Address address;
 
-    Boolean deceased;
+	Boolean deceased;
 
-    @Id
-    public String getSsn() {
-        return ssn;
-    }
+	@Id
+	public String getSsn() {
+		return ssn;
+	}
 
-    public void setSsn(String ssn) {
-        this.ssn = ssn;
-    }
+	public void setSsn(String ssn) {
+		this.ssn = ssn;
+	}
 
-    @Basic(optional = false)
-    public String getName() {
-        return name;
-    }
+	@Basic(optional = false)
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public Address getAddress() {
-        return address;
-    }
+	public Address getAddress() {
+		return address;
+	}
 
-    public void setAddress(Address address) {
-        this.address = address;
-    }
+	public void setAddress(Address address) {
+		this.address = address;
+	}
 
-    public Boolean getDeceased() {
-        return deceased;
-    }
+	public Boolean getDeceased() {
+		return deceased;
+	}
 
-    public void setDeceased(Boolean deceased) {
-        this.deceased = deceased;
-    }
+	public void setDeceased(Boolean deceased) {
+		this.deceased = deceased;
+	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java
index b53d39cbe033..4669e0c2d9cd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/NestedEmbeddableTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddable.nested.property;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Postcode.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Postcode.java
index 3f04decdc47e..6d3ac180c15a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Postcode.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/nested/property/Postcode.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.embeddable.nested.property;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/AbstractRef.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/AbstractRef.java
index ec28e0705a30..d5791aae6126 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/AbstractRef.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/AbstractRef.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withinheritance;
 
@@ -27,6 +25,3 @@ public int getId() {
 		return id;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java
index f9e31f695913..22a852e88290 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/EmbeddedIdWithInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/Ref.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/Ref.java
index 960244aa1002..8ec6c785a2ff 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/Ref.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/Ref.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withinheritance;
 
@@ -17,5 +15,3 @@ public Ref(int id) {
 		super( id );
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/TestEntity.java
index dbba53d1da23..a39eb03a21da 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/TestEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withinheritance/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withinheritance;
 
@@ -27,5 +25,3 @@ public class TestEntity implements Serializable {
 	@Column(name = "NAME", insertable = false, updatable = false, unique = true)
 	private String name;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java
index d951e77f7326..8b39f06a86d7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/EmbeddedIdNoInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withoutinheritance;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/Person.java
index 2730c6ac436c..981204c749eb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/Person.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withoutinheritance;
 
@@ -19,5 +17,3 @@ public class Person {
 
 	private String address;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/PersonId.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/PersonId.java
index 7c261fd884dd..71ca3e7a8dd2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/PersonId.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withoutinheritance;
 
@@ -32,5 +30,3 @@ public void setSnn(String snn) {
 		this.snn = snn;
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/XmlPerson.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/XmlPerson.java
index cad2f2256a58..390a4b76e36e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/XmlPerson.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddedid/withoutinheritance/XmlPerson.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.embeddedid.withoutinheritance;
 
@@ -13,5 +11,3 @@ public class XmlPerson {
 	private PersonId id;
 	private String address;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Address.java
index 7bc8c6a8662d..d7337ae49cc3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Alias.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Alias.java
index 3f424b0d0d5d..16a9e05ac44e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Alias.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Alias.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Article.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Article.java
index 479a47616540..dcac799e0884 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Article.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Article.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/BaseEmbeddedEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/BaseEmbeddedEntity.java
index 81caa71fd78d..163a72fbe911 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/BaseEmbeddedEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/BaseEmbeddedEntity.java
@@ -1,9 +1,6 @@
-
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -17,47 +14,47 @@
  */
 @MappedSuperclass
 public abstract class BaseEmbeddedEntity implements Serializable {
-    
-    private I id;
-
-    public BaseEmbeddedEntity() {
-    }
-
-    public BaseEmbeddedEntity(I id) {
-        this.id = id;
-    }
-
-    @EmbeddedId
-    public I getId() {
-        return id;
-    }
-
-    public void setId(I id) {
-        this.id = id;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 47 * hash + (this.id != null ? this.id.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final BaseEmbeddedEntity other = (BaseEmbeddedEntity) obj;
-        if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) {
-            return false;
-        }
-        return true;
-    }
+
+	private I id;
+
+	public BaseEmbeddedEntity() {
+	}
+
+	public BaseEmbeddedEntity(I id) {
+		this.id = id;
+	}
+
+	@EmbeddedId
+	public I getId() {
+		return id;
+	}
+
+	public void setId(I id) {
+		this.id = id;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 3;
+		hash = 47 * hash + (this.id != null ? this.id.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final BaseEmbeddedEntity other = (BaseEmbeddedEntity) obj;
+		if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java
index 227cad105359..fbe5f1b3f0d1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CoreTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Country.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Country.java
index d782f1b55367..1c793d90abaa 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Country.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Country.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 import jakarta.persistence.Basic;
@@ -44,4 +42,3 @@ public void setCode(String v) {
 		code = v;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CreditCard.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CreditCard.java
index c35874e4e0e5..d4f2ffe319a4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CreditCard.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/CreditCard.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Customer.java
index 87d585ea4663..dd67e5797f38 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Customer.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity1.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity1.java
index 5531e5bf5f57..8f95b6421f56 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity1.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity1.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity2.java
index b177a244759a..86845d06c31a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity2.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity2.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity3.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity3.java
index 8bc24182e09b..04caf4fd61a0 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity3.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Entity3.java
@@ -1,25 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Info.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Info.java
index 0c8d7aaa1e50..3bdec90fe4a1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Info.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Info.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/LineItem.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/LineItem.java
index 5c3fdf51596f..d6eb2273f4c3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/LineItem.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/LineItem.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntity.java
index ebf5707717bb..800765e04596 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -17,16 +15,16 @@ public class MapEntity {
 	@Id
 	@Column(name="key_")
 	private String key;
-	
+
 	@ElementCollection(fetch=FetchType.LAZY)
 	@CollectionTable(name="MAP_ENTITY_NAME", joinColumns=@JoinColumn(name="key_"))
 	@MapKeyColumn(name="lang_")
 	private Map localized;
-	
+
 	public String getKey() {
 		return key;
 	}
-	
+
 	public void setKey(String key) {
 		this.key = key;
 	}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntityLocal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntityLocal.java
index e97c64709e79..cc6bc6763e7d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntityLocal.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/MapEntityLocal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -11,14 +9,14 @@
 
 @Embeddable
 public class MapEntityLocal {
-	
-	@Column(name="short_name") 
+
+	@Column(name="short_name")
 	private String shortName;
-	
+
 	public String getShortName() {
 		return shortName;
 	}
-	
+
 	public void setShortName(String shortName) {
 		this.shortName = shortName;
 	}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Order.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Order.java
index c79ca34206b9..4406d4698787 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Order.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Order.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Person.java
index 0d5a87010333..d8636eac6545 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Person.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -14,31 +12,31 @@
 @Entity
 public class Person extends BaseEmbeddedEntity {
 
-    private String firstName;
-    private String lastName;
+	private String firstName;
+	private String lastName;
 
-    public Person() {
-    }
+	public Person() {
+	}
 
-    public Person(PersonId id, String firstName, String lastName) {
-        super(id);
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
+	public Person(PersonId id, String firstName, String lastName) {
+		super(id);
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
 
-    public String getFirstName() {
-        return firstName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/PersonId.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/PersonId.java
index 65692e7fd6f5..e3f6369c61c2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/PersonId.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/PersonId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -16,59 +14,59 @@
 @Embeddable
 public class PersonId implements Serializable {
 
-    private String ssn;
-    private String name;
+	private String ssn;
+	private String name;
 
-    public PersonId() {
-    }
+	public PersonId() {
+	}
 
-    public PersonId(String ssn, String name) {
-        this.ssn = ssn;
-        this.name = name;
-    }
+	public PersonId(String ssn, String name) {
+		this.ssn = ssn;
+		this.name = name;
+	}
 
-    public String getSsn() {
-        return ssn;
-    }
+	public String getSsn() {
+		return ssn;
+	}
 
-    public void setSsn(String ssn) {
-        this.ssn = ssn;
-    }
+	public void setSsn(String ssn) {
+		this.ssn = ssn;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 67 * hash + (this.ssn != null ? this.ssn.hashCode() : 0);
-        hash = 67 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
+	@Override
+	public int hashCode() {
+		int hash = 7;
+		hash = 67 * hash + (this.ssn != null ? this.ssn.hashCode() : 0);
+		hash = 67 * hash + (this.name != null ? this.name.hashCode() : 0);
+		return hash;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonId other = (PersonId) obj;
-        if ((this.ssn == null) ? (other.ssn != null) : !this.ssn.equals(other.ssn)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final PersonId other = (PersonId) obj;
+		if ((this.ssn == null) ? (other.ssn != null) : !this.ssn.equals(other.ssn)) {
+			return false;
+		}
+		if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+			return false;
+		}
+		return true;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Phone.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Phone.java
index 499fcafbed77..d0f21984433c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Phone.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Phone.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Product.java
index 5931d54a83ad..f5a4b8dd38a6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Product.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ShelfLife.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ShelfLife.java
index 21d22f213c50..97df28321fc4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ShelfLife.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ShelfLife.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
@@ -13,8 +11,8 @@
 
 @Embeddable
 public class ShelfLife implements java.io.Serializable {
-    private Date inceptionDate;
-    private Date soldDate;
+	private Date inceptionDate;
+	private Date soldDate;
 
 	public ShelfLife() {
 	}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclass.java
index 2bbe03e1c8f9..71dda5cce56e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclass.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclassSubclass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclassSubclass.java
index 085cc9a4d088..dbe7d48030cf 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclassSubclass.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/SomeMappedSuperclassSubclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Spouse.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Spouse.java
index ef4e2b9e2b6e..604f81af8558 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Spouse.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Spouse.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Thing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Thing.java
index 7e49c907c37b..c5e73afc4d49 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Thing.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Thing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ThingWithQuantity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ThingWithQuantity.java
index 99c5a1f83e63..ce97750ed319 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ThingWithQuantity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/ThingWithQuantity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Translation.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Translation.java
index ea9b2c89b55a..a2e20c5b48cc 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Translation.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/Translation.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/VersionedEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/VersionedEntity.java
index f9319a1afee6..1947be1881e0 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/VersionedEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/fromcore/VersionedEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.fromcore;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java
index 643ef698f07c..6ae341365c5e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GeneratedAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generatedannotation;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java
index 5ccfccb93b1c..a49e41016a20 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/GenerationDateTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generatedannotation;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java
index 0f28abe24371..c2798297234e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/SkipGeneratedAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generatedannotation;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/TestEntity.java
index d2f6498ca37d..2d575561812d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/TestEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generatedannotation/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generatedannotation;
 
@@ -17,6 +15,3 @@ public class TestEntity {
 	@Id
 	private long id;
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Child.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Child.java
index 0e7a6becb146..9d4aea1369ac 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Child.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Child.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generics;
 
@@ -38,4 +36,3 @@ public void setName(String name) {
 		this.name = name;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java
index 9de189d9459f..ebadd534707a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/GenericsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Parent.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Parent.java
index ad2f7b552af3..99239a17afd7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Parent.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generics/Parent.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generics;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/Generic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/Generic.java
index 86376b54864c..c5ff42e109fb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/Generic.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/Generic.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.generictype;
 
 import jakarta.persistence.*;
@@ -9,10 +13,10 @@
 
 @Entity
 public class Generic {
-    @Id Long id;
-    @ManyToOne Generic parent;
-    @OneToMany Set> children;
-    @ElementCollection List list;
-    @ElementCollection Map map;
-    @ManyToAny Set set;
+	@Id Long id;
+	@ManyToOne Generic parent;
+	@OneToMany Set> children;
+	@ElementCollection List list;
+	@ElementCollection Map map;
+	@ManyToAny Set set;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java
index a7a621fe2476..b2bc82ff8377 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/generictype/GenericEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.generictype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java
index ec692966a98f..3c08320123e3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashCodeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.hashcode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashEntity.java
index 8c0c90a56e21..216c3669cb18 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hashcode/HashEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.hashcode;
 
@@ -52,5 +50,3 @@ public int hashCode() {
 		return (int) ( id ^ ( id >>> 32 ) );
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/ChildB.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/ChildB.java
index d20bfd8b36a9..ee50ea073b9b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/ChildB.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/ChildB.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17613;
 
 import jakarta.persistence.MappedSuperclass;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java
index b91f1c931688..616917eba5e2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/HHH17613Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17613;
 
 import org.hibernate.processor.test.hhh17613.a.ChildA;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/Parent.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/Parent.java
index ae1a65e4e274..b160f2f2fd04 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/Parent.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/Parent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17613;
 
 import jakarta.persistence.Id;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/a/ChildA.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/a/ChildA.java
index 08a2880dcfd0..1f4adbb4304e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/a/ChildA.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17613/a/ChildA.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17613.a;
 
 import java.util.HashSet;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Entity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Entity.java
index 5f9dff9c27d5..1870a1814f9d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Entity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Entity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17661;
 
 import jakarta.persistence.Id;
@@ -8,7 +12,7 @@
 @MappedSuperclass
 public abstract class Entity implements Serializable {
 
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java
index 1f86e9903a44..8bcfbf368087 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/HHH17661Test.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17661;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Tree.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Tree.java
index a17b5aed716e..161482ac6d7a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Tree.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/Tree.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17661;
 
 import jakarta.persistence.CascadeType;
@@ -12,12 +16,12 @@
 @MappedSuperclass
 public abstract class Tree, TR extends TreeRelation> extends Entity {
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    private T parent;
+	@ManyToOne(fetch = FetchType.LAZY)
+	private T parent;
 
-    @OneToMany(mappedBy = "parent")
-    private Set childRelation = new HashSet<>();
+	@OneToMany(mappedBy = "parent")
+	private Set childRelation = new HashSet<>();
 
-    @OneToMany(mappedBy = "child", cascade = {CascadeType.ALL}, orphanRemoval = true)
-    private Set parentRelation = new HashSet<>();
-}
\ No newline at end of file
+	@OneToMany(mappedBy = "child", cascade = {CascadeType.ALL}, orphanRemoval = true)
+	private Set parentRelation = new HashSet<>();
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/TreeRelation.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/TreeRelation.java
index 949c20bf4e91..95d47f623fd6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/TreeRelation.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh17661/TreeRelation.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hhh17661;
 
 import jakarta.persistence.ManyToOne;
@@ -6,9 +10,9 @@
 @MappedSuperclass
 public abstract class TreeRelation>> extends Entity {
 
-    @ManyToOne(optional = false)
-    private T parent;
+	@ManyToOne(optional = false)
+	private T parent;
 
-    @ManyToOne(optional = false)
-    private T child;
-}
\ No newline at end of file
+	@ManyToOne(optional = false)
+	private T child;
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Address.java
index 4867ffd3fe8d..5c52047afe5b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import jakarta.persistence.Embeddable;
@@ -6,50 +10,50 @@
 
 @Embeddable
 public final class Address {
-    private String street;
-    private String city;
-    private String zip;
-
-    public Address(String street, String city, String zip) {
-        this.street = street;
-        this.city = city;
-        this.zip = zip;
-    }
-
-    Address() {}
-
-    public String street() {
-        return street;
-    }
-
-    public String city() {
-        return city;
-    }
-
-    public String zip() {
-        return zip;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
-        var that = (Address) obj;
-        return Objects.equals(this.street, that.street) &&
-                Objects.equals(this.city, that.city) &&
-                Objects.equals(this.zip, that.zip);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(street, city, zip);
-    }
-
-    @Override
-    public String toString() {
-        return "Address[" +
-                "street=" + street + ", " +
-                "city=" + city + ", " +
-                "zip=" + zip + ']';
-    }
+	private String street;
+	private String city;
+	private String zip;
+
+	public Address(String street, String city, String zip) {
+		this.street = street;
+		this.city = city;
+		this.zip = zip;
+	}
+
+	Address() {}
+
+	public String street() {
+		return street;
+	}
+
+	public String city() {
+		return city;
+	}
+
+	public String zip() {
+		return zip;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (obj == null || obj.getClass() != this.getClass()) return false;
+		var that = (Address) obj;
+		return Objects.equals(this.street, that.street) &&
+				Objects.equals(this.city, that.city) &&
+				Objects.equals(this.zip, that.zip);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(street, city, zip);
+	}
+
+	@Override
+	public String toString() {
+		return "Address[" +
+				"street=" + street + ", " +
+				"city=" + city + ", " +
+				"zip=" + zip + ']';
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Book.java
index c0b5f92c3fb3..f697910abe56 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import jakarta.persistence.Entity;
@@ -10,12 +14,12 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne Publisher publisher;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Books.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Books.java
index ce8607128d77..01dddd7e1e9b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Books.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Books.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import jakarta.persistence.EntityManager;
@@ -11,26 +15,26 @@
 import java.util.List;
 
 public abstract class Books {
-    @Find
-    abstract Book getBook(EntityManager entityManager, String isbn);
+	@Find
+	abstract Book getBook(EntityManager entityManager, String isbn);
 
-    @Find
-    abstract Book getBook(StatelessSession session, String title, String isbn);
+	@Find
+	abstract Book getBook(StatelessSession session, String title, String isbn);
 
-    @Find
-    abstract Book getBookByNaturalKey(Session session, String authorName, String title);
+	@Find
+	abstract Book getBookByNaturalKey(Session session, String authorName, String title);
 
-    @HQL("from Book where title is not null")
-    abstract List allbooks(StatelessSession ss);
+	@HQL("from Book where title is not null")
+	abstract List allbooks(StatelessSession ss);
 
-    @HQL("from Book where title like ?2")
-    abstract TypedQuery findByTitle(EntityManager entityManager, String title);
+	@HQL("from Book where title like ?2")
+	abstract TypedQuery findByTitle(EntityManager entityManager, String title);
 
-    @HQL("from Book where title like ?2 order by title fetch first ?3 rows only")
-    abstract List findFirstNByTitle(Session session, String title, int N);
+	@HQL("from Book where title like ?2 order by title fetch first ?3 rows only")
+	abstract List findFirstNByTitle(Session session, String title, int N);
 
-    static class Summary { Summary(String title, String publisher, String isbn) {} }
+	static class Summary { Summary(String title, String publisher, String isbn) {} }
 
-    @HQL("select title, publisher.name, isbn from Book")
-    abstract List summarize(Session session, Order order);
+	@HQL("select title, publisher.name, isbn from Book")
+	abstract List summarize(Session session, Order order);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dao.java
index 300a0375a098..160fbc6d6643 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import jakarta.persistence.TypedQuery;
@@ -13,66 +17,66 @@
 
 public interface Dao {
 
-    @Find
-    Book getBook(String isbn);
+	@Find
+	Book getBook(String isbn);
 
-    @Find
-    Book getBook(String title, String isbn);
+	@Find
+	Book getBook(String title, String isbn);
 
-    @Find
-    Book getBookByNaturalKey(String authorName, String title);
+	@Find
+	Book getBookByNaturalKey(String authorName, String title);
 
-    @HQL("from Book where title like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where title like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 
-    @HQL("from Book where title like :title")
-    List findByTitleWithPagination(String title, Order order, Page page);
+	@HQL("from Book where title like :title")
+	List findByTitleWithPagination(String title, Order order, Page page);
 
-    @HQL("from Book where title like :title")
-    SelectionQuery findByTitleWithOrdering(String title, List> order);
+	@HQL("from Book where title like :title")
+	SelectionQuery findByTitleWithOrdering(String title, List> order);
 
-    @HQL("from Book where title like :title")
-    SelectionQuery findByTitleWithOrderingByVarargs(String title, Order... order);
+	@HQL("from Book where title like :title")
+	SelectionQuery findByTitleWithOrderingByVarargs(String title, Order... order);
 
-    @HQL("from Book where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @HQL("order by isbn asc, publicationDate desc")
-    List allBooks();
+	@HQL("order by isbn asc, publicationDate desc")
+	List allBooks();
 
-    @HQL("order by isbn asc, publicationDate desc")
-    Book[] allBooksAsArray();
+	@HQL("order by isbn asc, publicationDate desc")
+	Book[] allBooksAsArray();
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 
-    @Find
-    List publishedBooks(String publisher$name);
+	@Find
+	List publishedBooks(String publisher$name);
 
-    @HQL("from Book book join fetch book.publisher where book.title like :titlePattern")
-    List booksWithPublisherByTitle(String titlePattern, Page page, Order order);
+	@HQL("from Book book join fetch book.publisher where book.title like :titlePattern")
+	List booksWithPublisherByTitle(String titlePattern, Page page, Order order);
 
-    @HQL("select title, pages from Book")
-    List dtoQuery();
+	@HQL("select title, pages from Book")
+	List dtoQuery();
 
-    @HQL("select new org.hibernate.processor.test.hqlsql.Dto(title, pages) from Book")
-    List dtoQuery1();
+	@HQL("select new org.hibernate.processor.test.hqlsql.Dto(title, pages) from Book")
+	List dtoQuery1();
 
-    @HQL("select new Dto(title, pages) from Book")
-    List dtoQuery2();
+	@HQL("select new Dto(title, pages) from Book")
+	List dtoQuery2();
 
-    @HQL("select new map(title as title, pages as pages) from Book")
-    List dtoQuery3();
+	@HQL("select new map(title as title, pages as pages) from Book")
+	List dtoQuery3();
 
-    @HQL("select new list(title, pages) from Book")
-    List dtoQuery4();
+	@HQL("select new list(title, pages) from Book")
+	List dtoQuery4();
 
-    @HQL("from Publisher where address = :address")
-    List publisherAt(Address address);
+	@HQL("from Publisher where address = :address")
+	List publisherAt(Address address);
 
-    @HQL("where array_contains(:isbns, isbn) is true")
-    List forIsbnIn(String[] isbns);
+	@HQL("where array_contains(:isbns, isbn) is true")
+	List forIsbnIn(String[] isbns);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java
index ce4aeea387e0..be4c12385e95 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java
@@ -1,43 +1,47 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import java.util.Objects;
 
 public final class Dto {
-    private final String title;
-    private final int pages;
-
-    public Dto(String title, int pages) {
-        this.title = title;
-        this.pages = pages;
-    }
-
-    public String title() {
-        return title;
-    }
-
-    public int pages() {
-        return pages;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
-        var that = (Dto) obj;
-        return Objects.equals(this.title, that.title) &&
-                this.pages == that.pages;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(title, pages);
-    }
-
-    @Override
-    public String toString() {
-        return "Dto[" +
-                "title=" + title + ", " +
-                "pages=" + pages + ']';
-    }
+	private final String title;
+	private final int pages;
+
+	public Dto(String title, int pages) {
+		this.title = title;
+		this.pages = pages;
+	}
+
+	public String title() {
+		return title;
+	}
+
+	public int pages() {
+		return pages;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (obj == null || obj.getClass() != this.getClass()) return false;
+		var that = (Dto) obj;
+		return Objects.equals(this.title, that.title) &&
+				this.pages == that.pages;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(title, pages);
+	}
+
+	@Override
+	public String toString() {
+		return "Dto[" +
+				"title=" + title + ", " +
+				"pages=" + pages + ']';
+	}
 
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Publisher.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Publisher.java
index 25271928df3f..504de9b56833 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Publisher.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Publisher.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlsql;
 
 import jakarta.persistence.Entity;
@@ -5,7 +9,7 @@
 
 @Entity
 public class Publisher {
-    @Id Long id;
-    String name;
-    Address address;
-}
\ No newline at end of file
+	@Id Long id;
+	String name;
+	Address address;
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java
index fbddc11ed0dc..2c703ad1c25e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/QueryMethodTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.hqlsql;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
index 82e3be9de57d..efed6af029b3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlvalidation;
 
 import jakarta.persistence.Entity;
@@ -5,7 +9,7 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    String title;
-    String text;
+	@Id String isbn;
+	String title;
+	String text;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao1.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao1.java
index d112f1542321..ea8047e30cbc 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao1.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao1.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlvalidation;
 
 import jakarta.persistence.TypedQuery;
@@ -7,15 +11,15 @@
 import java.util.List;
 
 public interface Dao1 {
-    @HQL("from Book where title like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where title like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 
-    @HQL("from Boook where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Boook where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao2.java
index 4afb0426dce2..1ea594a6bbed 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao2.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Dao2.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.hqlvalidation;
 
 import jakarta.persistence.TypedQuery;
@@ -7,15 +11,15 @@
 import java.util.List;
 
 public interface Dao2 {
-    @HQL("from Book where tile like ?1")
-    TypedQuery findByTitle(String title);
+	@HQL("from Book where tile like ?1")
+	TypedQuery findByTitle(String title);
 
-    @HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
-    List findFirstNByTitle(String title, int N);
+	@HQL("from Book where title like ?1 order by title fetch first ?2 rows only")
+	List findFirstNByTitle(String title, int N);
 
-    @HQL("from Book where isbn = :isbn")
-    Book findByIsbn(String isbn);
+	@HQL("from Book where isbn = :isbn")
+	Book findByIsbn(String isbn);
 
-    @SQL("select * from Book where isbn = :isbn")
-    Book findByIsbnNative(String isbn);
+	@SQL("select * from Book where isbn = :isbn")
+	Book findByIsbnNative(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java
index 3473c90180a8..9fc78422d449 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/ValidationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.hqlvalidation;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Bar.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Bar.java
index 8106be9a47aa..b874d41078e1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Bar.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Bar.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.includeexclude;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Baz.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Baz.java
index c150bb4a115b..9a32e0ebb4cb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Baz.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Baz.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.includeexclude;
 
 import jakarta.persistence.Entity;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Foo.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Foo.java
index b28a5e9e6c38..42f8ece17e2f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Foo.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/Foo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.includeexclude;
 
 import jakarta.persistence.Entity;
@@ -7,4 +11,3 @@
 public class Foo {
 	@Id long id;
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java
index 654fd54d84b4..2252d665beb2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/includeexclude/IncludeExcludeTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.includeexclude;
 
 import org.hibernate.processor.HibernateProcessor;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/AbstractEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/AbstractEntity.java
index 20ed76607b47..026f7ca57ee9 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/AbstractEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/AbstractEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Area.java
index e3f8b7b34aa0..d58a6b1cae00 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Area.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Area.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Building.java
index f722ca9161c2..cd41392e26d2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Building.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Building.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Customer.java
index 9c2073e58e71..2f04737f114c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Customer.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Customer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/House.java
index 91c5a162e7af..cf3c585ad39b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/House.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java
index 8c8d2ff0d45a..b301436800cd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/InheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
@@ -53,4 +51,3 @@ public void testInheritance() throws Exception {
 		assertPresenceOfFieldInMetamodelFor( Person.class, "name", "Property 'name' should exist" );
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Person.java
index a97ccbc3cf55..0a2a72c63d95 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Person.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/User.java
index 77bcd0ee23d5..b658750d97d2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/User.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/basic/User.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.basic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java
index 9df8bf2e4c33..a863241136d6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/DeepInheritanceTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.deep;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/JetPlane.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/JetPlane.java
index 4439343f4698..5ac5ac2fd3e4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/JetPlane.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/JetPlane.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.deep;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/PersistenceBase.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/PersistenceBase.java
index 54f27b755fab..f95fc3a71d24 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/PersistenceBase.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/PersistenceBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.deep;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/Plane.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/Plane.java
index 16197214c5a2..7b8b655d88d0 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/Plane.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/deep/Plane.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.deep;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/BaseEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/BaseEntity.java
index f85c14962227..904a6a46d6d1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/BaseEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/BaseEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/MappedBase.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/MappedBase.java
index 5e6b09f01dbc..20cb7cf5d2aa 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/MappedBase.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/MappedBase.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsEntity.java
index 0dd86a9db0d7..72387a527dfd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsMapped.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsMapped.java
index 27f90a197b4c..34685fdd5557 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsMapped.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/NormalExtendsMapped.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubA.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubA.java
index aab2d6289e99..413ff42d306b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubA.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubA.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubB.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubB.java
index a4fd6bce8413..7197e32d9287 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubB.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/SubB.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java
index a929e2b29823..b7a94e5c8b2d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/inheritance/unmappedclassinhierarchy/UnmappedClassInHierarchyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.inheritance.unmappedclassinhierarchy;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Book.java
index 9ccc4594ddfd..8250c54423f6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.keypage;
 
 import jakarta.persistence.Entity;
@@ -11,13 +15,13 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne
 	Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Dao.java
index 33edf711061a..efc18276ab12 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Dao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.keypage;
 
 import jakarta.persistence.EntityManager;
@@ -8,11 +12,11 @@
 
 public interface Dao {
 
-    EntityManager em();
+	EntityManager em();
 
-    @Find
-    KeyedResultList books1(String title, KeyedPage page);
+	@Find
+	KeyedResultList books1(String title, KeyedPage page);
 
-    @HQL("where title like :title")
-    KeyedResultList books2(String title, KeyedPage page);
+	@HQL("where title like :title")
+	KeyedResultList books2(String title, KeyedPage page);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java
index c8ac2114d1b7..be31810f44b5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/KeyBasedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.keypage;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Queries.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Queries.java
index cc976551a12e..af89d2dd1370 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Queries.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/keypage/Queries.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.keypage;
 
 import org.hibernate.annotations.processing.Find;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MapOfMapEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MapOfMapEntity.java
index e52d858e6195..392f136cfb8e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MapOfMapEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MapOfMapEntity.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.map;
 
 import java.util.Map;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java
index d00bb4c2da43..393bb2991680 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/map/MetamodelGeneratedTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.map;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Child.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Child.java
index b7cc50d8c6ed..0b31a9ec67df 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Child.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Child.java
@@ -1,7 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.mappedsuperclass.dao;
 
 import jakarta.persistence.Entity;
 
 @Entity
 public class Child extends Parent {
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java
index 0e687105e181..f7b76e140d57 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.dao;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Parent.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Parent.java
index 09bca15be6a4..942f4b55baf4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Parent.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Parent.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.mappedsuperclass.dao;
 
 import jakarta.persistence.Id;
@@ -15,4 +19,4 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Queries.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Queries.java
index c939b9777d9b..62d5f4b3b567 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Queries.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Queries.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.mappedsuperclass.dao;
 
 import org.hibernate.annotations.processing.Find;
@@ -5,4 +9,4 @@
 public interface Queries {
 	@Find
 	Child getChild(Long id);
-}
\ No newline at end of file
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java
index 9e685004808e..19ec1176a1a9 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.embeddablemappedsuperclass;
 
@@ -16,6 +14,3 @@
 @MappedSuperclass
 public class EmbeddableAndMappedSuperClass {
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java
index 526a7cd650a4..c3ee7302cffa 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.embeddablemappedsuperclass;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java
index 9bdec57bc598..a6c3ac214f0b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.mappedsuperclasswithoutid;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java
index 3cf87a1bbfaa..fd425b3797a6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/MappedSuperclassWithoutExplicitIdTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.mappedsuperclasswithoutid;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java
index 5c8cacac93c0..2f87d82eefc4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.mappedsuperclasswithoutid;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java
index ff87f4ff6262..785b843507ce 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.mappedsuperclasswithoutid;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java
index 5d00ae3bab6f..8189ceedc21e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
@@ -19,4 +17,3 @@ public abstract class AttachmentGroup.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java
index 6377eb87e16c..34ed5c6ab7ca 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
@@ -13,4 +11,3 @@
 public abstract class AttachmentGroupPost
 		extends Post {
 }
-	
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java
index 17dfed9499b0..3d7849d43140 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/Post.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/Post.java
index dd9b75e942fc..cbe5cfb8c17b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/Post.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/Post.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
@@ -11,4 +9,3 @@
 @MappedSuperclass
 public abstract class Post {
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java
index 4b474850c166..b04d74f947a3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/TypesMappedSuperclassTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/UserRole.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/UserRole.java
index 42127eaa4caf..92320de0100a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/UserRole.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/typedmappedsuperclass/UserRole.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mappedsuperclass.typedmappedsuperclass;
 
@@ -11,4 +9,3 @@
 @Entity
 public class UserRole {
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Car.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Car.java
index f51d9aaee733..32d52f0a5816 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Car.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
@@ -27,6 +25,3 @@ public void setMake(String make) {
 		this.make = make;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Coordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Coordinates.java
index f41ad714a23b..4be9bc0e1818 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Coordinates.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Coordinates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
@@ -16,6 +14,3 @@ public class Coordinates {
 	public float longitude;
 	public float latitude;
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Insurance.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Insurance.java
index 9d7f707bf73d..9629558ed9fd 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Insurance.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Insurance.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
@@ -32,6 +30,3 @@ public void setNumber(String number) {
 		this.number = number;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Location.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Location.java
index 76cdaa85835b..44cbe60bd931 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Location.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Location.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
@@ -56,8 +54,5 @@ public ZeroCoordinates getZeroCoordinates() {
 
 	public void setZeroCoordinates(ZeroCoordinates zeroCoordinates) {
 		this.zeroCoordinates = zeroCoordinates;
-	}	
+	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java
index deae7edc04eb..3e82e80f3ae2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/MixedConfigurationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Person.java
index 6e3979b68895..44b40d7bcfee 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Person.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Person.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCar.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCar.java
index 02bf90bd97fd..fdb67b62baa1 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCar.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCar.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCompany.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCompany.java
index 16ca9a96b792..547614f5e5ec 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCompany.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/RentalCompany.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Truck.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Truck.java
index 45e4b395b2a3..899413e692d2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Truck.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Truck.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Vehicle.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Vehicle.java
index 370b2358ff9c..639155c9da9f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Vehicle.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/Vehicle.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
@@ -28,6 +26,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java
index 26f4aa82e820..b5c0715c3a63 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/XmlMetaCompleteTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/ZeroCoordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/ZeroCoordinates.java
index 7c7ec5135b91..cae1b08f47c7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/ZeroCoordinates.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mixedmode/ZeroCoordinates.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.mixedmode;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
index a69fb8412d99..ea91569d153e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.namedquery;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
index d5ed7726952c..2b6861eba9d0 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.namedquery;
 
 import jakarta.persistence.Entity;
@@ -8,20 +12,20 @@
 @Entity
 @NamedEntityGraph(name = "entityGraph")
 @NamedQuery(name = "#findByTitle",
-        query = "from Book where title like :titlePattern")
+		query = "from Book where title like :titlePattern")
 @NamedQuery(name = "#findByTitleAndType",
-        query = "select book from Book book where book.title like :titlePattern and book.type = :type")
+		query = "select book from Book book where book.title like :titlePattern and book.type = :type")
 @NamedQuery(name = "#getTitles",
-        query = "select title from Book")
+		query = "select title from Book")
 @NamedQuery(name = "#getUpperLowerTitles",
-        query = "select upper(title), lower(title), length(title) from Book")
+		query = "select upper(title), lower(title), length(title) from Book")
 @NamedQuery(name = "#typeOfBook",
-        query = "select type from Book where isbn = :isbn")
+		query = "select type from Book where isbn = :isbn")
 @NamedQuery(name = "#crazy",
-        query = "select 1 where :x = :y")
+		query = "select 1 where :x = :y")
 public class Book {
-    @Id String isbn;
-    String title;
-    String text;
-    Type type = Type.Book;
+	@Id String isbn;
+	String title;
+	String text;
+	Type type = Type.Book;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Main.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Main.java
index 2eeac3ae9ff7..438d96b082e9 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Main.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Main.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.namedquery;
 
 import jakarta.persistence.NamedNativeQueries;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Type.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Type.java
index fb7189734477..fe4e3bebbd1b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Type.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Type.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.namedquery;
 
 enum Type {Book, Magazine, Journal}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/Dao.java
index a949bd860c69..ac8dcb34b7dc 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/Dao.java
@@ -1,9 +1,13 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.noentity;
 
 import jakarta.persistence.TypedQuery;
 import org.hibernate.annotations.processing.HQL;
 
 public interface Dao {
-    @HQL("select upper('Hibernate')")
-    TypedQuery getName();
+	@HQL("select upper('Hibernate')")
+	TypedQuery getName();
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java
index cd67590a28d7..239530974275 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/noentity/NoEntityTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.noentity;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java
index b2328b7f96ee..0da964a39a5e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/packageinfo/PackageInfoMetamodelTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.packageinfo;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java
index d9fd5e2802b1..3d4fc2c83eb3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Jpa21DescriptorTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.persistence21;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Snafu.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Snafu.java
index 461b1d9e1002..04f8a3d1fa27 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Snafu.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/persistence21/Snafu.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.persistence21;
 
@@ -20,5 +18,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/DeskWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/DeskWithRawType.java
index b044f7decc2a..45c091a90686 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/DeskWithRawType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/DeskWithRawType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.rawtypes;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/EmployeeWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/EmployeeWithRawType.java
index d9c659998294..e1b597e8e1db 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/EmployeeWithRawType.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/EmployeeWithRawType.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.rawtypes;
 
@@ -57,4 +55,3 @@ public void setDesks(Collection desks) {
 		this.desks = desks;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java
index c5ce28a64ce6..877e11f8398e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/rawtypes/RawTypesTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.rawtypes;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Address.java
index 2562673eed43..932046126b82 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Address.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.records;
 
 import jakarta.persistence.Embeddable;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Author.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Author.java
index 607e8fd47089..bc107f27b8f5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Author.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Author.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.records;
 
 import jakarta.persistence.Embedded;
@@ -8,46 +12,46 @@
 @Entity
 public class Author {
 
-    @Id
-    @GeneratedValue
-    private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-    @Embedded
-    private Address address;
+	@Embedded
+	private Address address;
 
-    private String firstName;
+	private String firstName;
 
-    private String lastName;
+	private String lastName;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Address getAddress() {
-        return address;
-    }
+	public Address getAddress() {
+		return address;
+	}
 
-    public void setAddress(Address address) {
-        this.address = address;
-    }
+	public void setAddress(Address address) {
+		this.address = address;
+	}
 
-    public String getFirstName() {
-        return firstName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java
index 13af47aa5b70..a2d68c5fbe58 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/records/Java14RecordsTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.records;
 
 import jakarta.persistence.metamodel.SingularAttribute;
@@ -21,32 +25,32 @@
 
 public class Java14RecordsTest extends CompilationTest {
 
-    @Test
-    @TestForIssue(jiraKey = "HHH-16261")
-    @WithClasses({Address.class, Author.class})
-    public void testEmbeddableRecordProperty() {
-        assertMetamodelClassGeneratedFor(Address.class);
-        for (final String fieldName : List.of("street", "city", "postalCode")) {
-            assertNotNull("Address must contain '" + fieldName + "' field", getFieldFromMetamodelFor(Address.class, fieldName));
-        }
-        assertMetamodelClassGeneratedFor(Author.class);
+	@Test
+	@TestForIssue(jiraKey = "HHH-16261")
+	@WithClasses({Address.class, Author.class})
+	public void testEmbeddableRecordProperty() {
+		assertMetamodelClassGeneratedFor(Address.class);
+		for (final String fieldName : List.of("street", "city", "postalCode")) {
+			assertNotNull("Address must contain '" + fieldName + "' field", getFieldFromMetamodelFor(Address.class, fieldName));
+		}
+		assertMetamodelClassGeneratedFor(Author.class);
 
-        final Field addressField = getFieldFromMetamodelFor(Author.class, "address");
-        assertNotNull("Author must contain 'address' field", addressField);
-        assertTrue(isStatic(addressField.getModifiers()));
-        if (addressField.getGenericType() instanceof ParameterizedType parameterizedType) {
-            assertEquals(SingularAttribute.class, parameterizedType.getRawType());
-            final Type[] typeArguments = parameterizedType.getActualTypeArguments();
-            assertEquals(2, typeArguments.length);
-            assertEquals(Author.class, typeArguments[0]);
-            assertEquals(Address.class, typeArguments[1]);
-        } else {
-            fail("Address field must be instance of ParameterizedType");
-        }
+		final Field addressField = getFieldFromMetamodelFor(Author.class, "address");
+		assertNotNull("Author must contain 'address' field", addressField);
+		assertTrue(isStatic(addressField.getModifiers()));
+		if (addressField.getGenericType() instanceof ParameterizedType parameterizedType) {
+			assertEquals(SingularAttribute.class, parameterizedType.getRawType());
+			final Type[] typeArguments = parameterizedType.getActualTypeArguments();
+			assertEquals(2, typeArguments.length);
+			assertEquals(Author.class, typeArguments[0]);
+			assertEquals(Address.class, typeArguments[1]);
+		} else {
+			fail("Address field must be instance of ParameterizedType");
+		}
 
-        final Field addressNameField = getFieldFromMetamodelFor(Author.class, "address".toUpperCase());
-        assertNotNull("Author must contain 'ADDRESS' field", addressNameField);
-        assertTrue(isStatic(addressNameField.getModifiers()));
-        assertEquals(String.class, addressNameField.getGenericType());
-    }
+		final Field addressNameField = getFieldFromMetamodelFor(Author.class, "address".toUpperCase());
+		assertNotNull("Author must contain 'ADDRESS' field", addressNameField);
+		assertTrue(isStatic(addressNameField.getModifiers()));
+		assertEquals(String.class, addressNameField.getGenericType());
+	}
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/Entity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/Entity.java
index 400d67c7d957..a7a7675b80e5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/Entity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/Entity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.separatecompilationunits;
 
@@ -15,5 +13,3 @@
 public class Entity extends MappedSuperclass {
 	private String name;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java
index 8a13817c3f65..50645f771bff 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/SeparateCompilationUnitsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.separatecompilationunits;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/superclass/MappedSuperclass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/superclass/MappedSuperclass.java
index 41503d670212..b5f607f07726 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/superclass/MappedSuperclass.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/separatecompilationunits/superclass/MappedSuperclass.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.separatecompilationunits.superclass;
 
@@ -16,5 +14,3 @@ public class MappedSuperclass {
 	@Id
 	private long id;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/PrintJob.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/PrintJob.java
index c39480389442..75fe99f74a02 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/PrintJob.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/PrintJob.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.sortedcollection;
 
@@ -23,5 +21,3 @@ public class PrintJob {
 	@Lob
 	private byte[] data;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/Printer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/Printer.java
index 2aafa062e06d..9e6b52b9ccd7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/Printer.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/Printer.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.sortedcollection;
 
@@ -32,5 +30,3 @@ public class Printer {
 	@SortNatural
 	private SortedMap printedJobs;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java
index 945b60edc1b5..b1b873b979a4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/sortedcollection/SortedCollectionTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.sortedcollection;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Book.java
index 57ae8f63cbcf..1cde918f4653 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao;
 
 import jakarta.persistence.Entity;
@@ -11,13 +15,13 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne
 	Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Dao.java
index 0eebd94288dd..f7ddbc47cecc 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/Dao.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao;
 
 import org.hibernate.annotations.processing.Find;
 
 public interface Dao extends SuperDao {
-    @Find
-    Book get(String isbn);
+	@Find
+	Book get(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDao.java
index a8966f742a61..a38d5284512e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao;
 
 import jakarta.persistence.EntityManager;
@@ -9,12 +13,12 @@
 
 public interface SuperDao {
 
-    EntityManager em();
+	EntityManager em();
 
 
-    @Find
-    List books1(@Pattern String title);
+	@Find
+	List books1(@Pattern String title);
 
-    @HQL("where title like :title")
-    List books2(String title);
+	@HQL("where title like :title")
+	List books2(String title);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java
index 910cf6091a08..54cdb3993eba 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/SuperDaoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.superdao;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Book.java
index e8a339c5ef4f..7d2d2c7ff830 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Book.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao.generic;
 
 import jakarta.persistence.Entity;
@@ -11,13 +15,13 @@
 
 @Entity
 public class Book {
-    @Id String isbn;
-    @NaturalId String title;
-    String text;
-    @NaturalId String authorName;
-    @ManyToOne
+	@Id String isbn;
+	@NaturalId String title;
+	String text;
+	@NaturalId String authorName;
+	@ManyToOne
 	Publisher publisher;
-    BigDecimal price;
-    int pages;
-    LocalDate publicationDate;
+	BigDecimal price;
+	int pages;
+	LocalDate publicationDate;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Dao.java
index 1de369c77596..f893974310ea 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/Dao.java
@@ -1,8 +1,12 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao.generic;
 
 import org.hibernate.annotations.processing.Find;
 
 public interface Dao extends SuperDao {
-    @Find
+	@Find
 	Book getConc(String isbn);
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDao.java
index 86ea4598f382..31ddf19b17a5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDao.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.superdao.generic;
 
 import jakarta.persistence.EntityManager;
@@ -9,15 +13,15 @@
 
 public interface SuperDao {
 
-    EntityManager em();
+	EntityManager em();
 
-    @Find
-    T get(K isbn);
+	@Find
+	T get(K isbn);
 
-    @Find
-    List books1(@Pattern String title);
+	@Find
+	List books1(@Pattern String title);
 
-    @HQL("where title like :title")
-    List books2(String title);
+	@HQL("where title like :title")
+	List books2(String title);
 
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java
index 3ff0ea3846ae..1428cfb60ddb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/superdao/generic/SuperDaoTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.superdao.generic;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java
index aefd3284236e..649c8299fa14 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressExplicitWarningsAnnotationGeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.supresswarnings;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java
index 25b435587412..cc50e7b23a9e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationGeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.supresswarnings;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java
index e64ce0b40f94..59ec15a8699c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/SuppressWarningsAnnotationNotGeneratedTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.supresswarnings;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/TestEntity.java
index f16566cc1fcf..1e2e8dfc5a06 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/TestEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/supresswarnings/TestEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.supresswarnings;
 
@@ -17,6 +15,3 @@ public class TestEntity {
 	@Id
 	private long id;
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/Address.java
index 7f0070a3cbad..35f9d1b01470 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.targetannotation;
 
@@ -14,5 +12,3 @@
 @Embeddable
 public interface Address {
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/AddressImpl.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/AddressImpl.java
index 92464f900201..e01db1578a4d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/AddressImpl.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/AddressImpl.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.targetannotation;
 
@@ -11,5 +9,3 @@
  */
 public class AddressImpl implements Address {
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/House.java
index 3e603cd04435..ce7fe8ed7d9c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/House.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/House.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.targetannotation;
 
@@ -32,4 +30,3 @@ public void setAddress(Address address) {
 		this.address = address;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java
index b0a83a4211e0..a2dbe42da11f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/targetannotation/TargetAnnotationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.targetannotation;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java
index ef6380890142..78d05dbd4fad 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/typeliteral/TypeLiteralTest.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.typeliteral;
 
 import org.hibernate.processor.test.util.CompilationTest;
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/ContactDetails.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/ContactDetails.java
index 834515346cf5..5e1277a1451e 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/ContactDetails.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/ContactDetails.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.usertype;
 
@@ -21,5 +19,3 @@ public class ContactDetails {
 	@Basic
 	private PhoneNumber phoneNumber;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/PhoneNumber.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/PhoneNumber.java
index 11a7609f1023..198114b524b2 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/PhoneNumber.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/PhoneNumber.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.usertype;
 
@@ -11,5 +9,3 @@
  */
 public class PhoneNumber {
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java
index 4e38ad630dca..2b29716ddf44 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/usertype/UserTypeTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.usertype;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java
index 69b271d3b6cf..507e1441c3c8 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationRunner.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
@@ -123,5 +121,3 @@ private boolean annotationProcessorNeedsToRun() {
 		return !testEntities.isEmpty() || !sources.isEmpty() || !mappingFiles.isEmpty();
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
index 087e56cf3b2d..d9cfa8b7db96 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
@@ -23,7 +21,6 @@
 
 import org.jboss.logging.Logger;
 
-import static org.junit.Assert.fail;
 
 /**
  * A custom JUnit statement which will run annotation processor prior to execute the original statement/test.
@@ -95,7 +92,7 @@ private List getCompilationUnits(List> classesToCompile, List options,
 		}
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java
index ed7bc94909de..19dc1d53ba1c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
@@ -25,5 +23,3 @@ public void cleanup() throws Exception {
 		TestUtil.deleteProcessorGeneratedFiles(getClass());
 	}
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/IgnoreCompilationErrors.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/IgnoreCompilationErrors.java
index 77bea724ffd0..4045e7f7f2bf 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/IgnoreCompilationErrors.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/IgnoreCompilationErrors.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestForIssue.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestForIssue.java
index ad8d4eb927fc..004602f8b47c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestForIssue.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestForIssue.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
@@ -26,6 +24,3 @@
 	 */
 	String jiraKey();
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
index ce282c9c5574..39f6559cf09a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
@@ -581,5 +579,3 @@ private static void assertCollectionAttributeTypeInMetaModelFor(
 	}
 
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithClasses.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithClasses.java
index dfc6b6f5fc70..2b57e28a1914 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithClasses.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithClasses.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithMappingFiles.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithMappingFiles.java
index 61c9678ee15e..0487aef07d98 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithMappingFiles.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithMappingFiles.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithProcessorOption.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithProcessorOption.java
index 5c4895c8ec0b..969ff2938f57 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithProcessorOption.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/WithProcessorOption.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.util;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java
index 38dfc4d7b01b..fcfda0e1dac5 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java
@@ -1,15 +1,12 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.wildcard;
 
 public interface Property {
 
-    String getName();
+	String getName();
 
-    T getValue();
+	T getValue();
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/PropertyRepo.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/PropertyRepo.java
index fb9a441b4f5d..da96d784994c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/PropertyRepo.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/PropertyRepo.java
@@ -1,3 +1,7 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.processor.test.wildcard;
 
 import jakarta.persistence.DiscriminatorType;
@@ -11,10 +15,10 @@
 
 @Entity
 public class PropertyRepo {
-    @Id
-    private Long id;
+	@Id
+	private Long id;
 
-    @ManyToAny
-    @AnyDiscriminator(DiscriminatorType.STRING)
-    private List> properties = new ArrayList<>();
+	@ManyToAny
+	@AnyDiscriminator(DiscriminatorType.STRING)
+	private List> properties = new ArrayList<>();
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java
index fbee0d62cb6d..307b83797f35 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/WildcardTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.wildcard;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/BusinessEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/BusinessEntity.java
index 2dacbd442bab..d4f32a2abb05 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/BusinessEntity.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/BusinessEntity.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlembeddable;
 
@@ -18,6 +16,3 @@ public abstract class BusinessEntity implements Serializ
 
 	private BusinessId businessId;
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java
index 624a7de234f9..fbc0761a988c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/EmbeddableConfiguredInXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlembeddable;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/Foo.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/Foo.java
index 91478f716883..e44aa4c4e68c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/Foo.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/Foo.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlembeddable;
 
@@ -17,5 +15,3 @@ public class Foo {
 	@Id
 	long id;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/foo/BusinessId.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/foo/BusinessId.java
index 1b717aec7c80..2b95e8969194 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/foo/BusinessId.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlembeddable/foo/BusinessId.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlembeddable.foo;
 
@@ -14,5 +12,3 @@
 public class BusinessId implements Serializable {
 	private long businessId;
 }
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Address.java
index 99ab32a18f9a..7f6329af3f3d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Address.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Address.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Boy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Boy.java
index 7a7410566afa..c7d41951a330 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Boy.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Boy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
@@ -72,6 +70,3 @@ public void setNickNames(List nickNames) {
 		this.nickNames = nickNames;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Building.java
index 301fff13aa79..2e286330b6d3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Building.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Building.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/FakeHero.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/FakeHero.java
index 7e5c7b39a2d6..b206a3c4671b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/FakeHero.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/FakeHero.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java
index 898a3721262c..9d1ea3dd154d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/IgnoreInvalidXmlTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/LivingBeing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/LivingBeing.java
index d6edf6cdcd35..ed227cd5bf14 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/LivingBeing.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/LivingBeing.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Mammal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Mammal.java
index b0e26731222c..3dd179842aa6 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Mammal.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Mammal.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Superhero.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Superhero.java
index 6b312359b555..ea7f0a58ca7a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Superhero.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/Superhero.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
@@ -47,6 +45,3 @@ public void setSuperPower(String superPower) {
 		this.superPower = superPower;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java
index 5fe7704a0266..d561df6ccd5b 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmapped/XmlMappingTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmapped;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/Dummy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/Dummy.java
index a112edf544ff..01fa3da233eb 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/Dummy.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/Dummy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmetacomplete.multiplepus;
 
@@ -25,4 +23,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java
index e4e312cfc774..d039e16306a4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/multiplepus/XmlMetaDataCompleteMultiplePersistenceUnitsTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmetacomplete.multiplepus;
 
@@ -31,4 +29,3 @@ public void testMetaModelGenerated() {
 		assertMetamodelClassGeneratedFor( Dummy.class );
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/Dummy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/Dummy.java
index dd2e87c131ef..10802956e36d 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/Dummy.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/Dummy.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmetacomplete.singlepu;
 
@@ -25,4 +23,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java
index fdfa8bc81849..cf5767eb62a8 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlmetacomplete/singlepu/XmlMetaDataCompleteSinglePersistenceUnitTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlmetacomplete.singlepu;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Car.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Car.java
index af3a20887bca..547cf4d3e45c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Car.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Car.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -23,4 +21,3 @@ public Set getTires() {
 	public void setTires(Set tires) {
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Course.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Course.java
index 735c578fc130..2e7cae2a557c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Course.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Course.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Option.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Option.java
index 4dae899d94e4..2b232e4ad3d4 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Option.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Option.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -10,4 +8,3 @@ public class Option {
 	private Long id;
 	private Period period;
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Period.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Period.java
index e9c8ef9660aa..aea08435d3e3 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Period.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Period.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -12,4 +10,3 @@ public class Period {
 	private Date start;
 	private Date end;
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Teacher.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Teacher.java
index 4136b2279e96..d54f4d7d1c99 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Teacher.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Teacher.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -12,4 +10,3 @@ public class Teacher {
 	private Long id;
 	private Set qualifiedFor;
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Tire.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Tire.java
index 7eef6c2b4876..042f5e32eb20 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Tire.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/Tire.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -21,4 +19,3 @@ public Car getCar() {
 	public void setCar(Car car) {
 	}
 }
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnly.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnly.java
index 6a26572c16b7..bd27ad22b36c 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnly.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnly.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;
 
@@ -21,6 +19,3 @@ public void setId(long id) {
 		this.id = id;
 	}
 }
-
-
-
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java
index 26ac949033b3..99b5cd699096 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/xmlonly/XmlOnlyTest.java
@@ -1,8 +1,6 @@
 /*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or .
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.processor.test.xmlonly;